Cleanup some functions headers and macro using (#6866)

* Cleanup frisking * Cleanup header format * Cleanup FUNC macro using
acemod · Mar 20, 2019 · d804d3a · d804d3a
1 parent 0a4d3d5
commit d804d3a
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 167 deletions.
diff --git a/addons/arsenal/Display3DEN.hpp b/addons/arsenal/Display3DEN.hpp
@@ -13,20 +13,20 @@ class Display3DEN {
             };
             class aceArsenal: virtualArsenal {
                 text = "ACE Arsenal";
-                action = QUOTE(call FUNC(open3DEN));
+                action = QUOTE(call DFUNC(open3DEN));
             };
         };
     };
     class Controls {
         class MenuStrip: ctrlMenuStrip {
             class Items {
                 class Tools {
-                    items[] += {"ACE_arsenal_portVALoadouts"};
+                    items[] += {QGVAR(portVALoadouts)};
                 };
-                class ACE_arsenal_portVALoadouts {
+                class GVAR(portVALoadouts) {
                     text = CSTRING(portLoadoutsText);
                     picture = QPATHTOEF(common,data\logo_ace3_ca.paa);
-                    action = "call ace_arsenal_fnc_portVALoadouts;";
+                    action = QUOTE(call DFUNC(portVALoadouts););
                 };
             };
         };

diff --git a/addons/captives/XEH_PREP.hpp b/addons/captives/XEH_PREP.hpp
@@ -1,15 +1,13 @@
 PREP(addLoadCaptiveActions);
 PREP(canApplyHandcuffs);
 PREP(canEscortCaptive);
-PREP(canFriskPerson);
 PREP(canLoadCaptive);
 PREP(canRemoveHandcuffs);
 PREP(canStopEscorting);
 PREP(canSurrender);
 PREP(canUnloadCaptive);
 PREP(doApplyHandcuffs);
 PREP(doEscortCaptive);
-PREP(doFriskPerson);
 PREP(doLoadCaptive);
 PREP(doRemoveHandcuffs);
 PREP(doUnloadCaptive);

diff --git a/addons/captives/functions/fnc_canFriskPerson.sqf b/addons/captives/functions/fnc_canFriskPerson.sqf
diff --git a/addons/captives/functions/fnc_doFriskPerson.sqf b/addons/captives/functions/fnc_doFriskPerson.sqf
diff --git a/addons/captives/stringtable.xml b/addons/captives/stringtable.xml
@@ -155,38 +155,6 @@
             <Chinese>束線帶可以綁住俘虜</Chinese>
             <Chinesesimp>束线带可以绑住俘虏</Chinesesimp>
         </Key>
-        <Key ID="STR_ACE_Captives_FriskMenuHeader">
-            <English>Inventory of frisked person</English>
-            <German>Inventar der durchsuchten Person</German>
-            <French>Inventaire de la personne fouillé</French>
-            <Spanish>Inventario de la persona cacheada</Spanish>
-            <Hungarian>Motozott személy felszerelése</Hungarian>
-            <Czech>Inventář prohledávané osoby</Czech>
-            <Polish>Ekwipunek rewidowanej osoby</Polish>
-            <Russian>Инвентарь обысканного человека</Russian>
-            <Portuguese>Inventário da pessoa revistada</Portuguese>
-            <Italian>Inventario della persona perquisita</Italian>
-            <Japanese>捕虜の持ち物を確認する</Japanese>
-            <Korean>검문당한 사람의 소지품</Korean>
-            <Chinese>搜身選單</Chinese>
-            <Chinesesimp>搜身选单</Chinesesimp>
-        </Key>
-        <Key ID="STR_ACE_Captives_FriskPerson">
-            <English>Frisk person</English>
-            <German>Person durchsuchen</German>
-            <French>Fouiller la personne</French>
-            <Spanish>Cachear</Spanish>
-            <Czech>Prohledávaná osoba</Czech>
-            <Polish>Rewiduj osobę</Polish>
-            <Hungarian>Motozás</Hungarian>
-            <Russian>Обыскать человека</Russian>
-            <Portuguese>Revistar</Portuguese>
-            <Italian>Perquisisci la persona</Italian>
-            <Japanese>捕虜の持ち物</Japanese>
-            <Korean>검문당한사람</Korean>
-            <Chinese>搜身</Chinese>
-            <Chinesesimp>搜身</Chinesesimp>
-        </Key>
         <Key ID="STR_ACE_Captives_StartSurrendering">
             <English>Surrender</English>
             <French>Se rendre</French>

diff --git a/addons/interaction/RscTitles.hpp b/addons/interaction/RscTitles.hpp
@@ -67,7 +67,7 @@ class RscACE_SelectAnItem {
             text = "";
         };
         class itemList: RscListBox {
-            onMouseButtonDblClick = "_this call ACE_Interaction_fnc_onSelectMenuDblClick";
+            onMouseButtonDblClick = QUOTE(_this call DFUNC(onSelectMenuDblClick));
             idc = 8866;
             x = X_OFFSET + 0.005;
             w = 0.59;
@@ -106,7 +106,7 @@ class RscACE_SelectAnItem {
             y = 0.605;
             style = 2;
             text = CSTRING(Back);
-            action = "call ACE_Interaction_fnc_hideMenu;";   //'Default' call ACE_Interaction_fnc_openMenu;    'Default' call ACE_Interaction_fnc_openMenuSelf;
+            action = QUOTE(call DFUNC(hideMenu););   //'Default' call DFUNC(openMenu);    'Default' call DFUNC(openMenuSelf);
             colorBackground[] = {0,0,0,0};
             colorBackgroundDisabled[] = {0,0,0,0};
             colorBackgroundActive[] = {1,1,1,0.2};
@@ -120,7 +120,7 @@ class RscACE_SelectAnItem {
             w = 0.15;
             style = 2;
             text = CSTRING(MakeSelection);
-            action = "call ACE_Interaction_fnc_hideMenu;";
+            action = QUOTE(call DFUNC(hideMenu););
             colorBackground[] = {0,0,0,0};
             colorBackgroundDisabled[] = {0,0,0,0};
             colorBackgroundActive[] = {1,1,1,0.2};

diff --git a/addons/medical/ACE_Medical_Treatments.hpp b/addons/medical/ACE_Medical_Treatments.hpp
@@ -123,10 +123,10 @@ class ACE_Medical_Actions {
             requiredMedic = 0;
             treatmentTime = 15;
             items[] = {};
-            condition = QUOTE(!([(_this select 1)] call ace_common_fnc_isAwake) && GVAR(enableRevive)>0);
+            condition = QUOTE(!([(_this select 1)] call DEFUNC(common,isAwake)) && GVAR(enableRevive)>0);
             callbackSuccess = QUOTE(DFUNC(treatmentAdvanced_CPR));
             callbackFailure = "";
-            callbackProgress = "!([((_this select 0) select 1)] call ace_common_fnc_isAwake)";
+            callbackProgress = QUOTE(!([((_this select 0) select 1)] call DEFUNC(common,isAwake)));
             animationPatient = "";
             animationPatientUnconscious = "AinjPpneMstpSnonWrflDnon_rolltoback";
             animationCaller = "AinvPknlMstpSlayWnonDnon_medic";
@@ -371,10 +371,10 @@ class ACE_Medical_Actions {
             requiredMedic = 0;
             treatmentTime = 15;
             items[] = {};
-            condition = "!([(_this select 1)] call ace_common_fnc_isAwake)";
+            condition = QUOTE(!([(_this select 1)] call DEFUNC(common,isAwake)));
             callbackSuccess = QUOTE(DFUNC(treatmentAdvanced_CPR));
             callbackFailure = "";
-            callbackProgress = "!([((_this select 0) select 1)] call ace_common_fnc_isAwake)";
+            callbackProgress = QUOTE(!([((_this select 0) select 1)] call DEFUNC(common,isAwake)));
             animationPatient = "";
             animationPatientUnconscious = "AinjPpneMstpSnonWrflDnon_rolltoback";
             animationCaller = "AinvPknlMstpSlayWnonDnon_medic";

diff --git a/addons/medical/functions/fnc_addDamageToUnit.sqf b/addons/medical/functions/fnc_addDamageToUnit.sqf
@@ -30,7 +30,7 @@ if (_damageToAdd < 0) exitWith {ERROR_1("addDamageToUnit - bad damage %1", _this
 if (!(_selection in GVAR(SELECTIONS))) exitWith {ERROR_1("addDamageToUnit - bad selection %1", _this); -1};
 
 //Get the hitpoint and the index
-private _hitpoint = [_unit, _selection, true] call ace_medical_fnc_translateSelections;
+private _hitpoint = [_unit, _selection, true] call FUNC(translateSelections);
 (getAllHitPointsDamage _unit) params [["_allHitPoints", []]];
 private _hitpointIndex = -1;
 {   //case insensitive find

diff --git a/addons/pylons/functions/fnc_showDialog.sqf b/addons/pylons/functions/fnc_showDialog.sqf
@@ -1,20 +1,20 @@
 #include "script_component.hpp"
 /*
-* Author: 654wak654
-* Shows the aircraft loadout dialog for given aircraft.
-*
-* Arguments:
-* 0: Aircraft <OBJECT>
-* 1: Is curator. Disables time and resource requirements. <BOOL> (default: false)
-*
-* Return Value:
-* None
-*
-* Example:
-* [vehicle ace_player] call ace_pylons_fnc_showDialog
-*
-* Public: Yes
-*/
+ * Author: 654wak654
+ * Shows the aircraft loadout dialog for given aircraft.
+ *
+ * Arguments:
+ * 0: Aircraft <OBJECT>
+ * 1: Is curator. Disables time and resource requirements. <BOOL> (default: false)
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [vehicle ace_player] call ace_pylons_fnc_showDialog
+ *
+ * Public: Yes
+ */
 
 params ["_aircraft", ["_isCurator", false]];
 

diff --git a/addons/rearm/functions/fnc_hasEnoughSupply.sqf b/addons/rearm/functions/fnc_hasEnoughSupply.sqf
@@ -1,20 +1,20 @@
 #include "script_component.hpp"
 /*
-* Author: GitHawk
-* Check whether enough supply is left to take the magazine.
-*
-* Arguments:
-* 0: Ammo Truck <OBJECT>
-* 1: Magazine Classname <STRING>
-*
-* Return Value:
-* Enough supply <BOOL>
-*
-* Example:
-* [ammo_truck, "500Rnd_127x99_mag_Tracer_Red"] call ace_rearm_fnc_hasEnoughSupply
-*
-* Public: No
-*/
+ * Author: GitHawk
+ * Check whether enough supply is left to take the magazine.
+ *
+ * Arguments:
+ * 0: Ammo Truck <OBJECT>
+ * 1: Magazine Classname <STRING>
+ *
+ * Return Value:
+ * Enough supply <BOOL>
+ *
+ * Example:
+ * [ammo_truck, "500Rnd_127x99_mag_Tracer_Red"] call ace_rearm_fnc_hasEnoughSupply
+ *
+ * Public: No
+ */
 
 params ["_truck", "_magazineClass"];