Merge branch 'fixmodules' into release

acemod · Aug 1, 2015 · 07845d5 · 07845d5
2 parents 02cfbed + f6d8625
commit 07845d5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/addons/zeus/CfgVehicles.hpp b/addons/zeus/CfgVehicles.hpp
@@ -79,6 +79,10 @@ class CfgVehicles {
     class GVAR(moduleBase): Module_F {
         author = "SilentSpike";
         category = "ACE";
+        functionPriority = 1;
+        isGlobal = 1;
+        isTriggerActivated = 0;
+        scope = 1;
         scopeCurator = 2;
     };
     class GVAR(moduleCaptive): GVAR(moduleBase) {

diff --git a/addons/zeus/functions/fnc_moduleCaptive.sqf b/addons/zeus/functions/fnc_moduleCaptive.sqf
@@ -18,7 +18,7 @@
 PARAMS_3(_logic,_units,_activated);
 private ["_mouseOver","_unit","_captive"];
 
-if (!_activated) exitWith {};
+if !(_activated && local _logic) exitWith {};
 
 if (isNil QEFUNC(captives,setHandcuffed)) then {
     [LSTRING(RequiresAddon)] call EFUNC(common,displayTextStructured);

diff --git a/addons/zeus/functions/fnc_moduleSurrender.sqf b/addons/zeus/functions/fnc_moduleSurrender.sqf
@@ -18,7 +18,7 @@
 PARAMS_3(_logic,_units,_activated);
 private ["_mouseOver","_unit","_surrendering"];
 
-if (!_activated) exitWith {};
+if !(_activated && local _logic) exitWith {};
 
 if (isNil QEFUNC(captives,setSurrendered)) then {
     [LSTRING(RequiresAddon)] call EFUNC(common,displayTextStructured);

diff --git a/addons/zeus/functions/fnc_moduleUnconscious.sqf b/addons/zeus/functions/fnc_moduleUnconscious.sqf
@@ -18,7 +18,7 @@
 PARAMS_3(_logic,_units,_activated);
 private ["_mouseOver","_unit","_conscious"];
 
-if (!_activated) exitWith {};
+if !(_activated && local _logic) exitWith {};
 
 if (isNil QEFUNC(medical,setUnconscious)) then {
     [LSTRING(RequiresAddon)] call EFUNC(common,displayTextStructured);
@@ -38,7 +38,7 @@ if (isNil QEFUNC(medical,setUnconscious)) then {
             } else {
                 _conscious = GETVAR(_unit,ACE_isUnconscious,false);
                 // Function handles locality for me
-                [_unit, !_conscious, round(random(10)+5), true] call EFUNC(medical,setUnconscious);
+                [_unit, !_conscious, 10e10, true] call EFUNC(medical,setUnconscious);
             };
         };
     };