compileFinal more functions

CBATeam · Aug 20, 2016 · d4cab9a · d4cab9a
1 parent 1021d3b
commit d4cab9a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 20 deletions.
diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf
@@ -8,14 +8,14 @@ ADDON = false;
 
 CBA_logic = objNull;
 
-FUNC(log) = {
+[QFUNC(log), {
     diag_log text _this;
     _this spawn {
         sleep 1;
         systemChat _this;
         hintC _this;
     };
-};
+}] call CBA_fnc_compileFinal;
 
 // FSM
 GVAR(delayless) = QUOTE(PATHTOF(delayless.fsm));

diff --git a/addons/common/init_delayLess.sqf b/addons/common/init_delayLess.sqf
@@ -4,7 +4,7 @@
 // Generic twice-a-second loop instantiator(?)
 GVAR(d) = [];
 
-FUNC(addTriggerHandler) = {
+[QFUNC(addTriggerHandler), {
         private ["_c"];
     // #include "script_component.hpp"
     // #define DEBUG_MODE_FULL
@@ -18,9 +18,8 @@ FUNC(addTriggerHandler) = {
         GVAR(d_trigger) setTriggerStatements ["{ if (count _x == 2) then { (_x select 0) call (_x select 1) } } forEach cba_common_d", "", ""];
     };
     _c; // return index, so can either change array parameter count, or empty?
-};
+}] call CBA_fnc_compileFinal;
 // TODO: Cleanup functions?
 
 // Specific twice-a-second loop
 // TODO: Should be a function that creates a trigger per loop, and uses onAct, onDeact, and removes the trigger on finish?
-
diff --git a/addons/common/init_perFrameHandler.sqf b/addons/common/init_perFrameHandler.sqf
@@ -17,7 +17,7 @@ GVAR(nextFrameBufferB) = [];
 GVAR(waitUntilAndExecArray) = [];
 
 // per frame handler system
-FUNC(onFrame) = {
+[QFUNC(onFrame), {
     private _tickTime = diag_tickTime;
     call FUNC(missionTimePFH);
 
@@ -80,9 +80,7 @@ FUNC(onFrame) = {
     if (_delete) then {
         GVAR(waitUntilAndExecArray) = GVAR(waitUntilAndExecArray) - [objNull];
     };
-
-};
-
+}] call CBA_fnc_compileFinal;
 
 // fix for save games. subtract last tickTime from ETA of all PFHs after mission was loaded
 addMissionEventHandler ["Loaded", {
@@ -103,14 +101,14 @@ if (isMultiplayer) then {
     // multiplayer - no accTime in MP
     if (isServer) then {
         // multiplayer server
-        FUNC(missionTimePFH) = {
+        [QFUNC(missionTimePFH), {
             if (time != GVAR(lastTime)) then {
                 CBA_missionTime = CBA_missionTime + (_tickTime - GVAR(lastTickTime));
                 GVAR(lastTime) = time; // used to detect paused game
             };
 
             GVAR(lastTickTime) = _tickTime;
-        };
+        }] call CBA_fnc_compileFinal;
 
         addMissionEventHandler ["PlayerConnected", {
             (_this select 4) publicVariableClient "CBA_missionTime";
@@ -125,25 +123,25 @@ if (isMultiplayer) then {
 
                 GVAR(lastTickTime) = diag_tickTime; // prevent time skip on clients
 
-                FUNC(missionTimePFH) = {
+                [QFUNC(missionTimePFH), {
                     if (time != GVAR(lastTime)) then {
                         CBA_missionTime = CBA_missionTime + (_tickTime - GVAR(lastTickTime));
                         GVAR(lastTime) = time; // used to detect paused game
                     };
 
                     GVAR(lastTickTime) = _tickTime;
-                };
+                }] call CBA_fnc_compileFinal;
             };
         };
     };
 } else {
     // single player
-    FUNC(missionTimePFH) = {
+    [QFUNC(missionTimePFH), {
         if (time != GVAR(lastTime)) then {
             CBA_missionTime = CBA_missionTime + (_tickTime - GVAR(lastTickTime)) * accTime;
             GVAR(lastTime) = time; // used to detect paused game
         };
 
         GVAR(lastTickTime) = _tickTime;
-    };
+    }] call CBA_fnc_compileFinal;
 };
diff --git a/addons/events/XEH_preInit.sqf b/addons/events/XEH_preInit.sqf
@@ -70,11 +70,11 @@ GVAR(keyUpActiveList) = [];
 
 GVAR(keyHoldTimers) = call CBA_fnc_createNamespace;
 
-FUNC(handleKeyDownUp) = {
+[QFUNC(handleKeyDownUp), {
     private _xUp = _this select (count _this - 1);
 
     GVAR(keyUpActiveList) deleteAt (GVAR(keyUpActiveList) find _xUp);
     GVAR(keyHoldTimers) setVariable [_xUp, nil];
 
     false
-};
+}] call CBA_fnc_compileFinal;
diff --git a/addons/help/XEH_preClientInit.sqf b/addons/help/XEH_preClientInit.sqf
@@ -5,9 +5,9 @@ LOG(MSG_INIT);
 
 ADDON = false;
 
-FUNC(help) = {call BIS_fnc_help};
+[QFUNC(help), {call BIS_fnc_help}] call CBA_fnc_compileFinal;
 
-FUNC(process) = {
+[QFUNC(process), {
     params ["_hash1", "_hash2", "_hash3"];
 
     private _result = [];
@@ -25,7 +25,7 @@ FUNC(process) = {
     } forEach allVariables _hash1;
 
     _result joinString "<br/><br/>";
-};
+}] call CBA_fnc_compileFinal;
 
 // keys
 private _fnc_getKeyName = {