From eefe995a0c5708f067b95031563ad93fbe21b126 Mon Sep 17 00:00:00 2001
From: SilentSpike <silentspike100+Github@gmail.com>
Date: Mon, 18 May 2015 19:58:02 +0100
Subject: [PATCH] Transfer curator functionality from ace_captives

---
 addons/captives/CfgVehicles.hpp               |  4 +-
 .../functions/fnc_moduleSurrender.sqf         | 38 ++++---------------
 2 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/addons/captives/CfgVehicles.hpp b/addons/captives/CfgVehicles.hpp
index 91c47824fd..ec142a533b 100644
--- a/addons/captives/CfgVehicles.hpp
+++ b/addons/captives/CfgVehicles.hpp
@@ -164,8 +164,6 @@ class CfgVehicles {
         displayName = "$STR_ACE_Captives_ModuleSurrender_DisplayName"; //Make Unit Surrender
         function = QUOTE(DFUNC(moduleSurrender));
         scope = 2;  //show in editor
-        scopeCurator = 2; //show in zeus
-        curatorCost = 0;  //???
         isGlobal = 1; //run global
         isTriggerActivated  = 1; //Wait for triggers
         icon = QUOTE(PATHTOF(UI\Icon_Module_Make_Unit_Surrender_ca.paa));
@@ -176,4 +174,4 @@ class CfgVehicles {
             sync[] = {"AnyAI"};
         };
     };
-};
\ No newline at end of file
+};
diff --git a/addons/captives/functions/fnc_moduleSurrender.sqf b/addons/captives/functions/fnc_moduleSurrender.sqf
index bf0e04cd6a..5b40b7663e 100644
--- a/addons/captives/functions/fnc_moduleSurrender.sqf
+++ b/addons/captives/functions/fnc_moduleSurrender.sqf
@@ -23,37 +23,13 @@ private ["_bisMouseOver", "_mouseOverObject"];
 if (!_activated) exitWith {};
 
 if (local _logic) then {
-    if ((!isnull curatorcamera) && {((count curatorMouseOver) == 2) && {(curatorMouseOver select 1) == _logic}}) then {//in zeus interface and we placed the module
-        _bisMouseOver = missionNamespace getVariable ["bis_fnc_curatorObjectPlaced_mouseOver", []];//bis caches the previous curatorMouseOver
-        if ((count _bisMouseOver) == 2) then {//check what mouse was over before the module was placed
-            _mouseOverObject = _bisMouseOver select 1;
-            if ((_mouseOverObject isKindOf "CAManBase") && {(vehicle _mouseOverObject) == _mouseOverObject}) then {
-                TRACE_2("Debug - module surrendering %1",_mouseOverObject,(name _mouseOverObject));
-                if (alive _mouseOverObject) then {
-                    if (!(_mouseOverObject getVariable [QGVAR(isSurrendering), false])) then {
-                        ["SetSurrendered", [_mouseOverObject], [_mouseOverObject, true]] call EFUNC(common,targetEvent);
-                    } else {
-                        ["SetSurrendered", [_mouseOverObject], [_mouseOverObject, false]] call EFUNC(common,targetEvent);
-                    };
-                } else {
-                    ["STR_ACE_Captives_Zeus_OnlyAlive"] call EFUNC(common,displayTextStructured);
-                };
-            } else {
-                ["STR_ACE_Captives_Zeus_OnlyInfantry"] call EFUNC(common,displayTextStructured);
-            };
-        } else {
-            ["STR_ACE_Captives_Zeus_NothingSelected"] call EFUNC(common,displayTextStructured);
-        };
-    } else {
-        //an editor module
-        //Modules run before postInit can instal the event handler, so we need to wait a little bit
-        [{
-            PARAMS_1(_units);
-            {
-                ["SetSurrendered", [_x], [_x, true]] call EFUNC(common,targetEvent);
-            } forEach _units;
-        }, [_units], 0.05, 0.05]call EFUNC(common,waitAndExecute);
-    };
+    //Modules run before postInit can instal the event handler, so we need to wait a little bit
+    [{
+        PARAMS_1(_units);
+        {
+            ["SetSurrendered", [_x], [_x, true]] call EFUNC(common,targetEvent);
+        } forEach _units;
+    }, [_units], 0.05, 0.05]call EFUNC(common,waitAndExecute);
 
     deleteVehicle _logic;
 };