Merge pull request #9 from ugene143/admin_fix

Admin fix
Echo12 · Jun 12, 2015 · 12e76e4 · 12e76e4
2 parents f7f5547 + d0f174e
commit 12e76e4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/Addons/e12_tools/XEH_preInitClient.sqf b/Addons/e12_tools/XEH_preInitClient.sqf
@@ -45,6 +45,7 @@ PREP(actionAdminCreateCrateItems);
 PREP(actionAdminCreateCrateMedic);
 PREP(actionAdminCreateCrateRadio);
 PREP(actionAdminMedicalAssignMedic);
+PREP(actionAdminAssignAdmin);
 PREP(actionAdminMedicalFullHeal);
 PREP(actionAdminPerfMon);
 

diff --git a/Addons/e12_tools/actions/E12_Tools_Actions.hpp b/Addons/e12_tools/actions/E12_Tools_Actions.hpp
@@ -29,7 +29,7 @@ class Tools {
 	    runOnHover = 0;
 	    exceptions[] = {"isNotInside", "notOnMap"};
 	    statement = QUOTE([_target] call FUNC(actionAdminAssignAdmin));
-	    condition = QUOTE(false); //TODO: FIX IT! //QUOTE((isPlayer _target));
+	    condition = QUOTE((isPlayer _target));
 	    icon = PATHTOF(UI\icons\tools_admin.paa);
 	};
 };
diff --git a/Addons/e12_tools/functions/fnc_actionAdminAssignAdmin.sqf b/Addons/e12_tools/functions/fnc_actionAdminAssignAdmin.sqf
@@ -1,8 +1,4 @@
 #include "script_component.hpp"
 PARAMS_1(_target);
 
-[-2, 
-{
-	_this setVariable[QGVAR(isadmin),true];
-},
-_target] call CBA_fnc_globalExecute;  
+_target setVariable[QGVAR(isadmin),true, true];
diff --git a/Addons/e12_tools/functions/fnc_actionAdminCreateCrateACE.sqf b/Addons/e12_tools/functions/fnc_actionAdminCreateCrateACE.sqf
@@ -1,8 +1,6 @@
 #include "script_component.hpp"
 PARAMS_1(_unit);
 
-[ str _pos, "e12_tools", [true, false, true] ] call CBA_fnc_debug;
-
 [0, 
 {
     private["_crate"];