replace timePFH with CBA_missionTime

addons/advanced_ballistics/XEH_postInit.sqf

@@ -5,7 +5,7 @@
 GVAR(currentbulletID) = -1;
 
 GVAR(Protractor) = false;
-GVAR(ProtractorStart) = ACE_time;
+GVAR(ProtractorStart) = CBA_missionTime;
 GVAR(allBullets) = [];
 GVAR(currentGrid) = 0;
 

addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf

@@ -12,7 +12,7 @@
  */
 #include "script_component.hpp"
 
-private _aceTimeSecond = floor ACE_time;
+private _aceTimeSecond = floor CBA_missionTime;
 
 {
     private ["_bulletVelocity", "_bulletPosition", "_bulletSpeed"];
@@ -31,7 +31,7 @@ private _aceTimeSecond = floor ACE_time;
             drop ["\A3\data_f\ParticleEffects\Universal\Refract","","Billboard",1,0.1,getPos _bullet,[0,0,0],0,1.275,1,0,[0.02*_caliber,0.01*_caliber],[[0,0,0,0.65],[0,0,0,0.2]],[1,0],0,0,"","",""];
         };
 
-        call compile ("ace_advanced_ballistics" callExtension format["simulate:%1:%2:%3:%4:%5:%6:%7", _index, _bulletVelocity, _bulletPosition, ACE_wind, ASLToATL(_bulletPosition) select 2, _aceTimeSecond, ACE_time - _aceTimeSecond]);
+        call compile ("ace_advanced_ballistics" callExtension format["simulate:%1:%2:%3:%4:%5:%6:%7", _index, _bulletVelocity, _bulletPosition, ACE_wind, ASLToATL(_bulletPosition) select 2, _aceTimeSecond, CBA_missionTime - _aceTimeSecond]);
     };
     nil
 } count +GVAR(allBullets);

addons/advanced_ballistics/functions/fnc_handleFired.sqf

@@ -110,8 +110,8 @@ if (_caliber > 0 && _bulletLength > 0 && _bulletMass > 0 && _barrelTwist > 0) th
 
 GVAR(currentbulletID) = (GVAR(currentbulletID) + 1) % 10000;
 
-_aceTimeSecond = floor ACE_time;
+_aceTimeSecond = floor CBA_missionTime;
-"ace_advanced_ballistics" callExtension format["new:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:%17:%18", GVAR(currentbulletID), _airFriction, _ballisticCoefficients, _velocityBoundaries, _atmosphereModel, _dragModel, _stabilityFactor, _twistDirection, _muzzleVelocity, _transonicStabilityCoef, getPosASL _projectile, EGVAR(common,mapLatitude), EGVAR(weather,currentTemperature), EGVAR(common,mapAltitude), EGVAR(weather,currentHumidity), overcast, _aceTimeSecond, ACE_time - _aceTimeSecond];
+"ace_advanced_ballistics" callExtension format["new:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:%17:%18", GVAR(currentbulletID), _airFriction, _ballisticCoefficients, _velocityBoundaries, _atmosphereModel, _dragModel, _stabilityFactor, _twistDirection, _muzzleVelocity, _transonicStabilityCoef, getPosASL _projectile, EGVAR(common,mapLatitude), EGVAR(weather,currentTemperature), EGVAR(common,mapAltitude), EGVAR(weather,currentHumidity), overcast, _aceTimeSecond, CBA_missionTime - _aceTimeSecond];
 
 GVAR(allBullets) pushBack [_projectile, _caliber, _bulletTraceVisible, GVAR(currentbulletID)];
 

addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf

@@ -18,7 +18,7 @@ if (!GVAR(extensionAvailable)) exitWith {};
 
 private ["_initStartTime", "_mapSize", "_mapGrids", "_gridCells", "_x", "_y", "_gridCenter", "_gridHeight", "_gridNumObjects", "_gridSurfaceIsWater"];
 
-_initStartTime = ACE_time;
+_initStartTime = CBA_missionTime;
 _mapSize = getNumber (configFile >> "CfgWorlds" >> worldName >> "MapSize");
 
 if (("ace_advanced_ballistics" callExtension format["init:%1:%2", worldName, _mapSize]) == "Terrain already initialized") exitWith {
@@ -38,7 +38,7 @@ GVAR(currentGrid) = 0;
 
     if (GVAR(currentGrid) >= _gridCells) exitWith {
         #ifdef DEBUG_MODE_FULL
-            systemChat format["AdvancedBallistics: Finished terrain initialization in %1 seconds", ceil(ACE_time - _initStartTime)];
+            systemChat format["AdvancedBallistics: Finished terrain initialization in %1 seconds", ceil(CBA_missionTime - _initStartTime)];
         #endif
         [_idPFH] call CBA_fnc_removePerFrameHandler;
     };

addons/atragmx/functions/fnc_target_speed_assist_timer.sqf

@@ -30,7 +30,7 @@ if !(ctrlVisible 9000) then {
         if (!(GVAR(speedAssistTimer))) exitWith {
             GVAR(speedAssistTimer) = true;
             
-            ctrlSetText [8006, Str(Round((ACE_time - _startTime) * 10) / 10)];
+            ctrlSetText [8006, Str(Round((CBA_missionTime - _startTime) * 10) / 10)];
 
             [] call FUNC(calculate_target_speed_assist);
 
@@ -40,7 +40,7 @@ if !(ctrlVisible 9000) then {
             [_this select 1] call CBA_fnc_removePerFrameHandler;
         };
         
-        ctrlSetText [9001, Str(Round((ACE_time - _startTime) * 10) / 10)];
+        ctrlSetText [9001, Str(Round((CBA_missionTime - _startTime) * 10) / 10)];
         
-    }, 0.1, [ACE_time]] call CBA_fnc_addPerFrameHandler;
+    }, 0.1, [CBA_missionTime]] call CBA_fnc_addPerFrameHandler;
 };

addons/captives/functions/fnc_setSurrendered.sqf

@@ -103,7 +103,7 @@ if (_state) then {
             params ["_args", "_pfID"];
             _args params ["_unit", "_maxTime"];
             //If waited long enough or they re-surrendered or they are unconscious, exit loop
-            if ((ACE_time > _maxTime) || {_unit getVariable [QGVAR(isSurrendering), false]} || {_unit getVariable ["ACE_isUnconscious", false]}) exitWith {
+            if ((CBA_missionTime > _maxTime) || {_unit getVariable [QGVAR(isSurrendering), false]} || {_unit getVariable ["ACE_isUnconscious", false]}) exitWith {
                 [_pfID] call CBA_fnc_removePerFrameHandler;
             };
             //Only break animation if they are actualy the "hands up" animation (because we are using switchmove there won't be an transition)
@@ -112,7 +112,7 @@ if (_state) then {
                 //Break out of hands up animation loop
                 [_unit, "ACE_AmovPercMstpSsurWnonDnon_AmovPercMstpSnonWnonDnon", 2] call EFUNC(common,doAnimation);
             };
-        }, 0, [_unit, (ACE_time + 20)]] call CBA_fnc_addPerFrameHandler;
+        }, 0, [_unit, (CBA_missionTime + 20)]] call CBA_fnc_addPerFrameHandler;
     };
 };
 

addons/common/XEH_PREP.hpp

@@ -276,5 +276,3 @@ PREP(hashListCreateHash);
 PREP(hashListSelect);
 PREP(hashListSet);
 PREP(hashListPush);
-
-PREP(timePFH);

addons/common/XEH_postInit.sqf

@@ -13,7 +13,7 @@
     BEGIN_COUNTER(waitAndExec);
 
     //Handle the waitAndExec array:
-    while {!(GVAR(waitAndExecArray) isEqualTo []) && {GVAR(waitAndExecArray) select 0 select 0 <= ACE_Time}} do {
+    while {!(GVAR(waitAndExecArray) isEqualTo []) && {GVAR(waitAndExecArray) select 0 select 0 <= CBA_missionTime}} do {
         private _entry = GVAR(waitAndExecArray) deleteAt 0;
         (_entry select 2) call (_entry select 1);
     };

addons/common/XEH_preInit.sqf

@@ -69,21 +69,6 @@ if (hasInterface) then {
     }, 0, []] call CBA_fnc_addPerFrameHandler;
 };
 
-
-//////////////////////////////////////////////////
-// Time handling
-//////////////////////////////////////////////////
-
-ACE_time = diag_tickTime;
-ACE_realTime = diag_tickTime;
-ACE_virtualTime = diag_tickTime;
-ACE_diagTime = diag_tickTime;
-ACE_gameTime = time;
-ACE_pausedTime = 0;
-ACE_virtualPausedTime = 0;
-
-[FUNC(timePFH), 0, []] call CBA_fnc_addPerFrameHandler;
-
 // Init toHex
 [0] call FUNC(toHex);
 

addons/common/functions/fnc__handleSyncedEvent.sqf

@@ -29,7 +29,7 @@ if (isServer) then {
         _internalData = HASH_GET(GVAR(syncedEvents),_name);
 
         _internalData params ["", "_eventLog"];
-        _eventLog pushBack [ACE_diagTime, _args, _ttl];
+        _eventLog pushBack [diag_tickTime, _args, _ttl];
     };
 };
 

addons/common/functions/fnc_cachedCall.sqf

@@ -19,8 +19,8 @@
 
 params ["_params", "_function", "_namespace", "_uid", "_duration", "_event"];
 
-if ((_namespace getVariable [_uid, [-99999]]) select 0 < ACE_diagTime) then {
+if ((_namespace getVariable [_uid, [-99999]]) select 0 < diag_tickTime) then {
-    _namespace setVariable [_uid, [ACE_diagTime + _duration, _params call _function]];
+    _namespace setVariable [_uid, [diag_tickTime + _duration, _params call _function]];
 
     // Does the cache needs to be cleared on an event?
     if (!isNil "_event") then {

addons/common/functions/fnc_displayIcon.sqf

@@ -89,11 +89,11 @@ private _refresh = {
 
 if (_show) then {
     if ({_x select 0 == _iconId} count _list == 0) then {
-        _list pushBack [_iconId, _icon, _color, ACE_time];
+        _list pushBack [_iconId, _icon, _color, CBA_missionTime];
     } else {
         {
             if (_x select 0 == _iconId) exitWith {
-                _list set [_forEachIndex, [_iconId, _icon, _color, ACE_time]];
+                _list set [_forEachIndex, [_iconId, _icon, _color, CBA_missionTime]];
             };
         } forEach _list;
     };

addons/common/functions/fnc_displayText.sqf

@@ -25,7 +25,7 @@ if !(typeName _text in ["STRING", "TEXT"]) then {_text = str _text};
 
 GVAR(lastHint) params ["_lastHintTime", "_lastHintPriority"];
 
-private _time = ACE_time;
+private _time = CBA_missionTime;
 
 if (_time > _lastHintTime + _delay || {_priority >= _lastHintPriority}) then {
     hintSilent _text;

addons/common/functions/fnc_hashHasKey.sqf

@@ -12,7 +12,7 @@
  */
 #include "script_component.hpp"
 
-// diag_log text format["%1 HASH HAS KEY: %2", ACE_diagTime, _this];
+// diag_log text format["%1 HASH HAS KEY: %2", diag_tickTime, _this];
 
 params ["_hash", "_key"];
 

addons/common/functions/fnc_hashSet.sqf

@@ -12,7 +12,7 @@
  */
 #include "script_component.hpp"
 
-// diag_log text format["%1 HASH SET: %2", ACE_diagTime, _this];
+// diag_log text format["%1 HASH SET: %2", diag_tickTime, _this];
 
 params ["_hash", "_key", "_val"];
 

addons/common/functions/fnc_progressBar.sqf

@@ -46,7 +46,7 @@ _ctrlPos set [1, ((0 + 29 * GVAR(SettingProgressBarLocation)) * ((((safezoneW /
 [{
     (_this select 0) params ["_args", "_onFinish", "_onFail", "_condition", "_player", "_startTime", "_totalTime", "_exceptions"];
 
-    private _elapsedTime = ACE_time - _startTime;
+    private _elapsedTime = CBA_missionTime - _startTime;
     private _errorCode = -1;
 
     // this does not check: target fell unconscious, target died, target moved inside vehicle / left vehicle, target moved outside of players range, target moves at all.
@@ -97,4 +97,4 @@ _ctrlPos set [1, ((0 + 29 * GVAR(SettingProgressBarLocation)) * ((((safezoneW /
         //Update Progress Bar (ratio of elepased:total)
         (uiNamespace getVariable QGVAR(ctrlProgressBar)) progressSetPosition (_elapsedTime / _totalTime);
     };
-}, 0, [_args, _onFinish, _onFail, _condition, _player, ACE_time, _totalTime, _exceptions]] call CBA_fnc_addPerFrameHandler;
+}, 0, [_args, _onFinish, _onFail, _condition, _player, CBA_missionTime, _totalTime, _exceptions]] call CBA_fnc_addPerFrameHandler;

addons/common/functions/fnc_receiveRequest.sqf

@@ -45,7 +45,7 @@ GVAR(RECIEVE_REQUEST_ADD_ACTION_DECLINE) = _target addAction ["Decline", compile
 
 GVAR(RECIEVE_REQUEST_ID_KEY_BINDING) = _requestID;
 
-GVAR(RECIEVE_REQUEST_TIME_OUT_SCRIPT) = [ACE_time, _target, _requestID] spawn { // @todo
+GVAR(RECIEVE_REQUEST_TIME_OUT_SCRIPT) = [CBA_missionTime, _target, _requestID] spawn { // @todo
     params ["_time", "_target", "_requestID"];
 
     _time = _time + 40;
@@ -55,7 +55,7 @@ GVAR(RECIEVE_REQUEST_TIME_OUT_SCRIPT) = [ACE_time, _target, _requestID] spawn {
     waitUntil {
         _id = _target getVariable _requestID;
 
-        (ACE_time > _time || isNil "_id")
+        (CBA_missionTime > _time || isNil "_id")
     };
 
     _target setVariable [_requestID, nil];

addons/common/functions/fnc_syncedEventPFH.sqf

@@ -34,7 +34,7 @@ if (!isServer) exitWith {false};
         if (_globalEventTTL isEqualType {}) then {
             _ttlReturn = [_eventTime, _eventEntry] call _globalEventTTL;
         } else {
-            _ttlReturn = call {_globalEventTTL < 1 || {ACE_diagTime < (_eventEntry select 0) + _globalEventTTL}};
+            _ttlReturn = call {_globalEventTTL < 1 || {diag_tickTime < (_eventEntry select 0) + _globalEventTTL}};
         };
 
         if (_ttlReturn) then {
@@ -44,7 +44,7 @@ if (!isServer) exitWith {false};
             if (_eventTTL isEqualType {}) then {
                 _ttlReturn = [_eventTime, _eventEntry] call _eventTTL;
             } else {
-                _ttlReturn = call {_eventTTL < 1 || {ACE_diagTime < _time + _eventTTL}};
+                _ttlReturn = call {_eventTTL < 1 || {diag_tickTime < _time + _eventTTL}};
             };
         };
 

addons/common/functions/fnc_throttledPublicVariable.sqf

@@ -25,7 +25,7 @@ if (isNil QGVAR(publishSchedId)) then {
     GVAR(publishNextTime) = 1e7;
 
     GVAR(publishSchedId) = [{
-        if (ACE_diagTime > GVAR(publishNextTime)) then {
+        if (diag_tickTime > GVAR(publishNextTime)) then {
             {
                 _x params [_unit, _varName];
                 _unit setVariable [_varName, _unit getVariable _varName, true];
@@ -41,8 +41,8 @@ if (isNil QGVAR(publishSchedId)) then {
 // If the variable is not on the list
 if (GVAR(publishVarNames) find [_unit, _varName] == -1) exitWith {
     GVAR(publishVarNames) pushBack [_unit, _varName];
-    GVAR(publishNextTime) = GVAR(publishNextTime) min (ACE_diagTime + _maxDelay);
+    GVAR(publishNextTime) = GVAR(publishNextTime) min (diag_tickTime + _maxDelay);
 };
 
 // If the variable is on the list
-GVAR(publishNextTime) = GVAR(publishNextTime) min (ACE_diagTime + _maxDelay);
+GVAR(publishNextTime) = GVAR(publishNextTime) min (diag_tickTime + _maxDelay);

addons/common/functions/fnc_timePFH.sqf

@@ -1,40 +0,0 @@
-/*
- * Author: jaynus
- * PFEH to set all Ace Time Variables
- *
- * Arguments:
- * None
- *
- * Return Value:
- * None
- *
- * Public: No
- */
-#include "script_component.hpp"
-
-BEGIN_COUNTER(timePFH);
-
-private _lastTickTime = ACE_diagTime;
-private _lastGameTime = ACE_gameTime;
-
-ACE_gameTime = time;
-ACE_diagTime = diag_tickTime;
-
-private _delta = ACE_diagTime - _lastTickTime;
-
-if (ACE_gameTime <= _lastGameTime) then {
-    TRACE_1("paused",_delta);
-    ACE_paused = true;
-    // Game is paused or not running
-    ACE_pausedTime = ACE_pausedTime + _delta;
-    ACE_virtualPausedTime = ACE_pausedTime + (_delta * accTime);
-} else {
-    TRACE_1("live",_delta);
-    ACE_paused = false;
-    // Time is updating
-    ACE_realTime = ACE_realTime + _delta;
-    ACE_virtualTime = ACE_virtualTime + (_delta * accTime);
-    ACE_time = ACE_virtualTime;
-};
-
-END_COUNTER(timePFH);

addons/common/functions/fnc_waitAndExecute.sqf

@@ -19,5 +19,5 @@
 
 params ["_func", "_params", "_delay"];
 
-GVAR(waitAndExecArray) pushBack [ACE_time + _delay, _func, _params];
+GVAR(waitAndExecArray) pushBack [CBA_missionTime + _delay, _func, _params];
 GVAR(waitAndExecArray) sort true;

addons/dagr/functions/fnc_menuInit.sqf

@@ -134,19 +134,19 @@ GVAR(menuRun) = true;
                         GVAR(vectorConnected) = false;
                         if (!GVAR(busy)) then {
                             GVAR(busy) = true;
-                            GVAR(busyTimer) = ACE_time;
+                            GVAR(busyTimer) = CBA_missionTime;
                         };
                         (__dsp displayCtrl __mainText) ctrlSetText "Acquiring Data.";
-                        if (ACE_time - GVAR(busyTimer) > 0.5) then {
+                        if (CBA_missionTime - GVAR(busyTimer) > 0.5) then {
                             (__dsp displayCtrl __mainText) ctrlSetText "Acquiring Data..";
                         };
-                        if (ACE_time - GVAR(busyTimer) > 1.0) then {
+                        if (CBA_missionTime - GVAR(busyTimer) > 1.0) then {
                             (__dsp displayCtrl __mainText) ctrlSetText "Acquiring Data...";
                         };
-                        if (ACE_time - GVAR(busyTimer) > 1.5) then {
+                        if (CBA_missionTime - GVAR(busyTimer) > 1.5) then {
                             (__dsp displayCtrl __mainText) ctrlSetText "Position Acquired";
                         };
-                        if (ACE_time - GVAR(busyTimer) > 3.0) then {
+                        if (CBA_missionTime - GVAR(busyTimer) > 3.0) then {
                             GVAR(busy) = false;
                         };
                     };
@@ -156,7 +156,7 @@ GVAR(menuRun) = true;
                             if (!GVAR(busy)) then {
                                 GVAR(showNoWaypointsFound) = true;
                                 GVAR(busy) = true;
-                                GVAR(busyTimer) = ACE_time;
+                                GVAR(busyTimer) = CBA_missionTime;
                             };
                         } else {
                             GVAR(menu) = "goto_wp"; GVAR(numSelections) = GVAR(numWaypoints); GVAR(selection) = 0;
@@ -168,7 +168,7 @@ GVAR(menuRun) = true;
                  };
             };
             if (GVAR(busy) && GVAR(showNoWaypointsFound)) then {
-                if (ACE_time - GVAR(busyTimer) > 2) then {
+                if (CBA_missionTime - GVAR(busyTimer) > 2) then {
                     GVAR(showNoWaypointsFound) = false;
                     GVAR(busy) = false;
                 };
@@ -206,21 +206,21 @@ GVAR(menuRun) = true;
                 if (!GVAR(busy)) then {
                     GVAR(showInfoUpdating) = true;
                     GVAR(busy) = true;
-                    GVAR(busyTimer) = ACE_time;
+                    GVAR(busyTimer) = CBA_missionTime;
                 };
             };
             if (GVAR(busy) && GVAR(showInfoUpdating)) then {
                 (__dsp displayCtrl __mainText) ctrlSetText "Info Update.";
-                if (ACE_time - GVAR(busyTimer) > 1) then {
+                if (CBA_missionTime - GVAR(busyTimer) > 1) then {
                     (__dsp displayCtrl __mainText) ctrlSetText "Info Update..";
                 };
-                if (ACE_time - GVAR(busyTimer) > 1.2) then {
+                if (CBA_missionTime - GVAR(busyTimer) > 1.2) then {
                     (__dsp displayCtrl __mainText) ctrlSetText "Info Update...";
                 };
-                if (ACE_time - GVAR(busyTimer) > 1.4) then {
+                if (CBA_missionTime - GVAR(busyTimer) > 1.4) then {
                     (__dsp displayCtrl __mainText) ctrlSetText "Info Updated";
                 };
-                if (ACE_time - GVAR(busyTimer) > 2.9) then {
+                if (CBA_missionTime - GVAR(busyTimer) > 2.9) then {
                     GVAR(showInfoUpdating) = false;
                     GVAR(busy) = false;
                 };
@@ -289,21 +289,21 @@ GVAR(menuRun) = true;
                         GVAR(numSelections) = GVAR(numWaypoints);
                         GVAR(showDeleting) = true;
                         GVAR(busy) = true;
-                        GVAR(busyTimer) = ACE_time;
+                        GVAR(busyTimer) = CBA_missionTime;
                     };
                 };
                 if (GVAR(busy) && GVAR(showDeleting)) then {
                     (__dsp displayCtrl __mainText) ctrlSetText "Deleting.";
-                    if (ACE_time - GVAR(busyTimer) > 1) then {
+                    if (CBA_missionTime - GVAR(busyTimer) > 1) then {
                         (__dsp displayCtrl __mainText) ctrlSetText "Deleting..";
                     };
-                    if (ACE_time - GVAR(busyTimer) > 1.2) then {
+                    if (CBA_missionTime - GVAR(busyTimer) > 1.2) then {
                         (__dsp displayCtrl __mainText) ctrlSetText "Deleting...";
                     };
-                    if (ACE_time - GVAR(busyTimer) > 1.4) then {
+                    if (CBA_missionTime - GVAR(busyTimer) > 1.4) then {
                         (__dsp displayCtrl __mainText) ctrlSetText "Waypoint Deleted";
                     };
-                    if (ACE_time - GVAR(busyTimer) > 2.9) then {
+                    if (CBA_missionTime - GVAR(busyTimer) > 2.9) then {
                         GVAR(showDeleting) = false;
                         GVAR(busy) = false;
                     };
@@ -313,7 +313,7 @@ GVAR(menuRun) = true;
                         if (!GVAR(busy)) then {
                             GVAR(showOutOfSpace) = true;
                             GVAR(busy) = true;
-                            GVAR(busyTimer) = ACE_time;
+                            GVAR(busyTimer) = CBA_missionTime;
                         };
                     } else {
                         GVAR(digit1) = 0;
@@ -330,7 +330,7 @@ GVAR(menuRun) = true;
                 };
                 if (GVAR(busy) && GVAR(showOutOfSpace)) then {
                     (__dsp displayCtrl __mainText) ctrlSetText "Out of Space";
-                    if (ACE_time - GVAR(busyTimer) > 2.5) then {
+                    if (CBA_missionTime - GVAR(busyTimer) > 2.5) then {
                         GVAR(showOutOfSpace) = false;
                         GVAR(busy) = false;
                     };
@@ -425,22 +425,22 @@ GVAR(menuRun) = true;
                             };
                         };
                         GVAR(busy) = true;
-                        GVAR(busyTimer) = ACE_time;
+                        GVAR(busyTimer) = CBA_missionTime;
                     };
                     (__dsp displayCtrl __F1) ctrlSetText "";
                     (__dsp displayCtrl __F2) ctrlSetText "";
                     (__dsp displayCtrl __F3) ctrlSetText "";
                     (__dsp displayCtrl __mainText) ctrlSetText "Saving.";
-                    if (ACE_time - GVAR(busyTimer) > 1) then {
+                    if (CBA_missionTime - GVAR(busyTimer) > 1) then {
                         (__dsp displayCtrl __mainText) ctrlSetText "Saving..";
                     };
-                    if (ACE_time - GVAR(busyTimer) > 1.2) then {
+                    if (CBA_missionTime - GVAR(busyTimer) > 1.2) then {
                         (__dsp displayCtrl __mainText) ctrlSetText "Saving...";
                     };
-                    if (ACE_time - GVAR(busyTimer) > 1.4) then {
+                    if (CBA_missionTime - GVAR(busyTimer) > 1.4) then {
                         (__dsp displayCtrl __mainText) ctrlSetText "Waypoint Saved";
                     };
-                    if (ACE_time - GVAR(busyTimer) > 2.9) then {
+                    if (CBA_missionTime - GVAR(busyTimer) > 2.9) then {
                         GVAR(edit) = false;
                         GVAR(add) = false;
                         GVAR(busy) = false;
@@ -464,7 +464,7 @@ GVAR(menuRun) = true;
                 if (GVAR(F3)) then {
                     if (!GVAR(busy)) then {
                         GVAR(busy) = true;
-                        GVAR(busyTimer) = ACE_time;
+                        GVAR(busyTimer) = CBA_missionTime;
                     } else {
                         (__dsp displayCtrl __F1) ctrlSetText "Save";
                         (__dsp displayCtrl __F2) ctrlSetText "Vector";
@@ -472,7 +472,7 @@ GVAR(menuRun) = true;
                         GVAR(output) = str GVAR(digit1) + str GVAR(digit2) + str GVAR(digit3) + str GVAR(digit4) + str GVAR(digit5) + str GVAR(digit6) + str GVAR(digit7) + str GVAR(digit8);
                         (__dsp displayCtrl __mainText) ctrlSetText GVAR(output);
                     };
-                    if (ACE_time - GVAR(busyTimer) > 0.1) then {
+                    if (CBA_missionTime - GVAR(busyTimer) > 0.1) then {
                         GVAR(add) = false;
                         GVAR(edit) = false;
                         GVAR(busy) = false;
@@ -512,16 +512,16 @@ GVAR(menuRun) = true;
             if (GVAR(SEL)) then {
                 if (!GVAR(busy)) then {
                     GVAR(busy) = true;
-                    GVAR(busyTimer) = ACE_time;
+                    GVAR(busyTimer) = CBA_missionTime;
                 };
                 (__dsp displayCtrl __mainText) ctrlSetText "Connecting.";
-                if (ACE_time - GVAR(busyTimer) > 0.2) then {
+                if (CBA_missionTime - GVAR(busyTimer) > 0.2) then {
                     (__dsp displayCtrl __mainText) ctrlSetText "Connecting..";
                 };
-                if (ACE_time - GVAR(busyTimer) > 0.4) then {
+                if (CBA_missionTime - GVAR(busyTimer) > 0.4) then {
                     (__dsp displayCtrl __mainText) ctrlSetText "Connecting...";
                 };
-                if (ACE_time - GVAR(busyTimer) > 0.6) then {
+                if (CBA_missionTime - GVAR(busyTimer) > 0.6) then {
                     if (ACE_player hasWeapon "ACE_Vector") then {
                         GVAR(displaySelection) = "VECTOR";
                         (__dsp displayCtrl __mainText) ctrlSetText "Vector Connected";
@@ -531,7 +531,7 @@ GVAR(menuRun) = true;
                         GVAR(vectorConnected) = false;
                     };
                 };
-                if (ACE_time - GVAR(busyTimer) > 3.1) then {
+                if (CBA_missionTime - GVAR(busyTimer) > 3.1) then {
                     GVAR(busy) = false;
                     if (GVAR(vectorConnected)) then {
                         GVAR(menu) = "main"; GVAR(numSelections) = 5;
@@ -556,19 +556,19 @@ GVAR(menuRun) = true;
                 GVAR(updateInterval) = GVAR(tmpUpdateRate);
                 if (!GVAR(busy)) then {
                     GVAR(busy) = true;
-                    GVAR(busyTimer) = ACE_time;
+                    GVAR(busyTimer) = CBA_missionTime;
                 };
                 (__dsp displayCtrl __mainText) ctrlSetText "Updating.";
-                if (ACE_time - GVAR(busyTimer) > 0.2) then {
+                if (CBA_missionTime - GVAR(busyTimer) > 0.2) then {
                     (__dsp displayCtrl __mainText) ctrlSetText "Updating..";
                 };
-                if (ACE_time - GVAR(busyTimer) > 0.4) then {
+                if (CBA_missionTime - GVAR(busyTimer) > 0.4) then {
                     (__dsp displayCtrl __mainText) ctrlSetText "Updating...";
                 };
-                if (ACE_time - GVAR(busyTimer) > 0.6) then {
+                if (CBA_missionTime - GVAR(busyTimer) > 0.6) then {
                     (__dsp displayCtrl __mainText) ctrlSetText "Update Success";
                 };
-                if (ACE_time - GVAR(busyTimer) > 2.1) then {
+                if (CBA_missionTime - GVAR(busyTimer) > 2.1) then {
                     GVAR(busy) = false;
                     GVAR(menu) = "options"; GVAR(numSelections) = 2;
                 };

addons/disarming/functions/fnc_disarmDropItems.sqf

@@ -177,7 +177,7 @@ if (_holderIsEmpty) then {
     _needToRemoveVest = ((vest _target) != "") && {(vest _target) in _listOfItemsToRemove};
     _needToRemoveUniform = ((uniform _target) != "") && {(uniform _target) in _listOfItemsToRemove};
 
-    if ((ACE_time < _maxWaitTime) && {[_target] call FUNC(canBeDisarmed)} && {_needToRemoveWeapon || _needToRemoveMagazines || _needToRemoveBackpack}) then {
+    if ((CBA_missionTime < _maxWaitTime) && {[_target] call FUNC(canBeDisarmed)} && {_needToRemoveWeapon || _needToRemoveMagazines || _needToRemoveBackpack}) then {
         //action drop weapons (keeps loaded magazine and attachements)
         {
             if (_x in _listOfItemsToRemove) then {
@@ -233,7 +233,7 @@ if (_holderIsEmpty) then {
             clearItemCargoGlobal _holder;
         };
         //Verify we didn't timeout waiting on drop action
-        if (ACE_time >= _maxWaitTime)  exitWith {
+        if (CBA_missionTime >= _maxWaitTime)  exitWith {
             _holder setVariable [QGVAR(holderInUse), false];
             [_caller, _target, "Debug: Drop Actions Timeout"] call FUNC(eventTargetFinish);
         };
@@ -263,4 +263,4 @@ if (_holderIsEmpty) then {
         [_caller, _target, ""] call FUNC(eventTargetFinish);
     };
 
-}, 0.0, [_caller,_target, _listOfItemsToRemove, _holder, _holderIsEmpty, (ACE_time + TIME_MAX_WAIT), _doNotDropAmmo, _targetMagazinesEnd]] call CBA_fnc_addPerFrameHandler;
+}, 0.0, [_caller,_target, _listOfItemsToRemove, _holder, _holderIsEmpty, (CBA_missionTime + TIME_MAX_WAIT), _doNotDropAmmo, _targetMagazinesEnd]] call CBA_fnc_addPerFrameHandler;

addons/disarming/functions/fnc_eventCallerFinish.sqf

@@ -23,4 +23,4 @@ params ["_caller", "_target", "_errorMsg"];
 if (_caller != ACE_player) exitWith {};
 
 systemChat format ["Debug-Caller: Disarm finished from [%1] with code [%2]", _target, _errorMsg];
-ACE_LOGINFO_2("%1 - eventCallerFinish: %2",ACE_time,_this);
+ACE_LOGINFO_2("%1 - eventCallerFinish: %2",CBA_missionTime,_this);

addons/disarming/functions/fnc_eventTargetFinish.sqf

@@ -22,6 +22,6 @@
 params ["_caller", "_target", "_errorMsg"];
 
 if (_errorMsg != "") then {
-    ACE_LOGINFO_2("%1 - eventTargetFinish: %2",ACE_time,_this);
+    ACE_LOGINFO_2("%1 - eventTargetFinish: %2",CBA_missionTime,_this);
     ["DisarmDebugCallback", [_caller], [_caller, _target, _errorMsg]] call EFUNC(common,targetEvent);
 };

addons/dragging/functions/fnc_carryObject.sqf

@@ -64,7 +64,7 @@ if (_target isKindOf "CAManBase") then {
 };
 
 // check everything
-[FUNC(carryObjectPFH), 0.5, [_unit, _target, ACE_time]] call CBA_fnc_addPerFrameHandler;
+[FUNC(carryObjectPFH), 0.5, [_unit, _target, CBA_missionTime]] call CBA_fnc_addPerFrameHandler;
 
 // reset current dragging height.
 GVAR(currentHeightChange) = 0;

addons/dragging/functions/fnc_carryObjectPFH.sqf

@@ -20,7 +20,7 @@
 #include "script_component.hpp"
 
 #ifdef DEBUG_ENABLED_DRAGGING
-    systemChat format ["%1 carryObjectPFH running", ACE_time];
+    systemChat format ["%1 carryObjectPFH running", CBA_missionTime];
 #endif
 
 params ["_args", "_idPFH"];
@@ -34,10 +34,10 @@ if !(_unit getVariable [QGVAR(isCarrying), false]) exitWith {
 // drop if the crate is destroyed OR (target moved away from carrier (weapon disasembled))
 if (!alive _target || {_unit distance _target > 10}) then {
     TRACE_2("dead/distance",_unit,_target);
-    if ((_unit distance _target > 10) && {(ACE_time - _startTime) < 1}) exitWith {
+    if ((_unit distance _target > 10) && {(CBA_missionTime - _startTime) < 1}) exitWith {
         //attachTo seems to have some kind of network delay and target can return an odd position durring the first few frames, 
         //so wait a full second to exit if out of range (this is critical as we would otherwise detach and set it's pos to weird pos)
-        TRACE_3("ignoring bad distance at start",_unit distance _target,_startTime,ACE_time);
+        TRACE_3("ignoring bad distance at start",_unit distance _target,_startTime,CBA_missionTime);
     };
     [_unit, _target] call FUNC(dropObject_carry);
     [_idPFH] call CBA_fnc_removePerFrameHandler;

addons/dragging/functions/fnc_dragObject.sqf

@@ -53,7 +53,7 @@ _unit setVariable [QGVAR(ReleaseActionID), [
 [localize LSTRING(Drop), ""] call EFUNC(interaction,showMouseHint);
 
 // check everything
-[FUNC(dragObjectPFH), 0.5, [_unit, _target, ACE_time]] call CBA_fnc_addPerFrameHandler;
+[FUNC(dragObjectPFH), 0.5, [_unit, _target, CBA_missionTime]] call CBA_fnc_addPerFrameHandler;
 
 // reset current dragging height.
 GVAR(currentHeightChange) = 0;

addons/dragging/functions/fnc_dragObjectPFH.sqf

@@ -20,7 +20,7 @@
 #include "script_component.hpp"
 
 #ifdef DEBUG_ENABLED_DRAGGING
-    systemChat format ["%1 dragObjectPFH running", ACE_time];
+    systemChat format ["%1 dragObjectPFH running", CBA_missionTime];
 #endif
 
 params ["_args", "_idPFH"];
@@ -34,10 +34,10 @@ if !(_unit getVariable [QGVAR(isDragging), false]) exitWith {
 // drop if the crate is destroyed OR (target moved away from carrier (weapon disasembled))
 if (!alive _target || {_unit distance _target > 10}) then {
     TRACE_2("dead/distance",_unit,_target);
-    if ((_unit distance _target > 10) && {(ACE_time - _startTime) < 1}) exitWith {
+    if ((_unit distance _target > 10) && {(CBA_missionTime - _startTime) < 1}) exitWith {
         //attachTo seems to have some kind of network delay and target can return an odd position durring the first few frames, 
         //so wait a full second to exit if out of range (this is critical as we would otherwise detach and set it's pos to weird pos)
-        TRACE_3("ignoring bad distance at start",_unit distance _target,_startTime,ACE_time);
+        TRACE_3("ignoring bad distance at start",_unit distance _target,_startTime,CBA_missionTime);
     };
     [_unit, _target] call FUNC(dropObject);
     [_idPFH] call CBA_fnc_removePerFrameHandler;

addons/dragging/functions/fnc_startCarry.sqf

@@ -26,7 +26,7 @@ if (_weight > missionNamespace getVariable ["ACE_maxWeightCarry", 1E11]) exitWit
     [localize LSTRING(UnableToDrag)] call EFUNC(common,displayTextStructured);
 };
 
-private _timer = ACE_time + 5;
+private _timer = CBA_missionTime + 5;
 
 // handle objects vs persons
 if (_target isKindOf "CAManBase") then {
@@ -46,7 +46,7 @@ if (_target isKindOf "CAManBase") then {
     [_unit, "AcinPknlMstpSnonWnonDnon_AcinPercMrunSnonWnonDnon", 2, true] call EFUNC(common,doAnimation);
     [_target, "AinjPfalMstpSnonWrflDnon_carried_Up", 2, true] call EFUNC(common,doAnimation);
 
-    _timer = ACE_time + 15;
+    _timer = CBA_missionTime + 15;
 
 } else {
 

addons/dragging/functions/fnc_startCarryPFH.sqf

@@ -20,7 +20,7 @@
 #include "script_component.hpp"
 
 #ifdef DEBUG_ENABLED_DRAGGING
-    systemChat format ["%1 startCarryPFH running", ACE_time];
+    systemChat format ["%1 startCarryPFH running", CBA_missionTime];
 #endif
 
 params ["_args", "_idPFH"];
@@ -28,28 +28,28 @@ _args params ["_unit", "_target", "_timeOut"];
 
 // handle aborting carry
 if !(_unit getVariable [QGVAR(isCarrying), false]) exitWith {
-    TRACE_4("carry false",_unit,_target,_timeOut,ACE_time);
+    TRACE_4("carry false",_unit,_target,_timeOut,CBA_missionTime);
     [_idPFH] call CBA_fnc_removePerFrameHandler;
 };
 
 // same as dragObjectPFH, checks if object is deleted or dead OR (target moved away from carrier (weapon disasembled))
 if (!alive _target || {_unit distance _target > 10}) then {
-    TRACE_4("dead/distance",_unit,_target,_timeOut,ACE_time);
+    TRACE_4("dead/distance",_unit,_target,_timeOut,CBA_missionTime);
     [_unit, _target] call FUNC(dropObject);
     [_idPFH] call CBA_fnc_removePerFrameHandler;
 };
 
 // handle persons vs objects
 if (_target isKindOf "CAManBase") then {
-    if (ACE_time > _timeOut) exitWith {
+    if (CBA_missionTime > _timeOut) exitWith {
-        TRACE_4("Start carry person",_unit,_target,_timeOut,ACE_time);
+        TRACE_4("Start carry person",_unit,_target,_timeOut,CBA_missionTime);
         [_unit, _target] call FUNC(carryObject);
 
         [_idPFH] call CBA_fnc_removePerFrameHandler;
     };
 } else {
-    if (ACE_time > _timeOut) exitWith {
+    if (CBA_missionTime > _timeOut) exitWith {
-        TRACE_4("timeout",_unit,_target,_timeOut,ACE_time);
+        TRACE_4("timeout",_unit,_target,_timeOut,CBA_missionTime);
         [_idPFH] call CBA_fnc_removePerFrameHandler;
 
         // drop if in timeout
@@ -59,7 +59,7 @@ if (_target isKindOf "CAManBase") then {
 
     // wait for the unit to stand up
     if (stance _unit == "STAND") exitWith {
-        TRACE_4("Start carry object",_unit,_target,_timeOut,ACE_time);
+        TRACE_4("Start carry object",_unit,_target,_timeOut,CBA_missionTime);
         [_unit, _target] call FUNC(carryObject);
 
         [_idPFH] call CBA_fnc_removePerFrameHandler;

addons/dragging/functions/fnc_startDrag.sqf

@@ -52,4 +52,4 @@ if (_target isKindOf "CAManBase") then {
 // prevents draging and carrying at the same time
 _unit setVariable [QGVAR(isDragging), true, true];
 
-[FUNC(startDragPFH), 0.2, [_unit, _target, ACE_time + 5]] call CBA_fnc_addPerFrameHandler;
+[FUNC(startDragPFH), 0.2, [_unit, _target, CBA_missionTime + 5]] call CBA_fnc_addPerFrameHandler;

addons/dragging/functions/fnc_startDragPFH.sqf

@@ -20,7 +20,7 @@
 #include "script_component.hpp"
 
 #ifdef DEBUG_ENABLED_DRAGGING
-    systemChat format ["%1 startDragPFH running", ACE_time];
+    systemChat format ["%1 startDragPFH running", CBA_missionTime];
 #endif
 
 params ["_args", "_idPFH"];
@@ -28,20 +28,20 @@ _args params ["_unit", "_target", "_timeOut"];
 
 // handle aborting drag
 if !(_unit getVariable [QGVAR(isDragging), false]) exitWith {
-    TRACE_4("drag false",_unit,_target,_timeOut,ACE_time);
+    TRACE_4("drag false",_unit,_target,_timeOut,CBA_missionTime);
     [_idPFH] call CBA_fnc_removePerFrameHandler;
 };
 
 // same as dragObjectPFH, checks if object is deleted or dead OR (target moved away from carrier (weapon disasembled))
 if (!alive _target || {_unit distance _target > 10}) then {
-    TRACE_4("dead/distance",_unit,_target,_timeOut,ACE_time);
+    TRACE_4("dead/distance",_unit,_target,_timeOut,CBA_missionTime);
     [_unit, _target] call FUNC(dropObject);
     [_idPFH] call CBA_fnc_removePerFrameHandler;
 };
 
-// timeout. Do nothing. Quit. ACE_time, because anim length is linked to ingame time.
+// timeout. Do nothing. Quit. CBA_missionTime, because anim length is linked to ingame time.
-if (ACE_time > _timeOut) exitWith {
+if (CBA_missionTime > _timeOut) exitWith {
-    TRACE_4("timeout",_unit,_target,_timeOut,ACE_time);
+    TRACE_4("timeout",_unit,_target,_timeOut,CBA_missionTime);
     [_idPFH] call CBA_fnc_removePerFrameHandler;
 
     // drop if in timeout
@@ -51,7 +51,7 @@ if (ACE_time > _timeOut) exitWith {
 
 // unit is ready to start dragging
 if (animationState _unit in DRAG_ANIMATIONS) exitWith {
-    TRACE_4("Start Dragging",_unit,_target,_timeOut,ACE_time);
+    TRACE_4("Start Dragging",_unit,_target,_timeOut,CBA_missionTime);
     [_unit, _target] call FUNC(dragObject);
 
     [_idPFH] call CBA_fnc_removePerFrameHandler;

addons/fcs/functions/fnc_keyDown.sqf

@@ -29,7 +29,7 @@ private _distance = [
 if !(!GVAR(enabled) && FUNC(canUseFCS)) exitWith {};
 
 GVAR(Enabled) = true;
-GVAR(time) = ACE_time;
+GVAR(time) = CBA_missionTime;
 
 
 private _weaponDirection = _vehicle weaponDirection (_vehicle currentWeaponTurret _turret);  // @todo doesn't work for sub turrets

addons/fcs/functions/fnc_keyUp.sqf

@@ -41,10 +41,10 @@ private _angleTarget = asin (_weaponDirection select 2);
 
 private _movingAzimuth = 0;
 
-if (ACE_time - GVAR(time) > 1 && GVAR(time) != -1 && isNil {_this select 2}) then {
+if (CBA_missionTime - GVAR(time) > 1 && GVAR(time) != -1 && isNil {_this select 2}) then {
     // calculate speed of target
     private _posTarget = (getPosASL _vehicle) vectorAdd (_weaponDirection vectorMultiply _distance);
-    private _velocityTarget = (_posTarget vectorDiff GVAR(position)) vectorMultiply (1 / (ACE_time - GVAR(time)));
+    private _velocityTarget = (_posTarget vectorDiff GVAR(position)) vectorMultiply (1 / (CBA_missionTime - GVAR(time)));
 
     // estimate time to target
     private _magazine       = _vehicle currentMagazineTurret _turret;

addons/finger/functions/fnc_incomingFinger.sqf

@@ -27,7 +27,7 @@ _fingerPos = if (_sourceUnit == ACE_player) then {
     _fingerPosPrecise vectorAdd [random (2*FP_RANDOMIZATION_X) - FP_RANDOMIZATION_X, random (2*FP_RANDOMIZATION_X) - FP_RANDOMIZATION_X, random (2*FP_RANDOMIZATION_Y) - FP_RANDOMIZATION_Y]
 };
 
-_data = [ACE_diagTime, _fingerPos, ([_sourceUnit, false, true] call EFUNC(common,getName))];
+_data = [diag_tickTime, _fingerPos, ([_sourceUnit, false, true] call EFUNC(common,getName))];
 HASH_SET(GVAR(fingersHash), _sourceUnit, _data);
 
 if (GVAR(pfeh_id) == -1) then {

addons/finger/functions/fnc_keyPress.sqf

@@ -25,9 +25,9 @@ if ((ACE_player != vehicle ACE_player) && {!((vehicle ACE_player) isKindOf "Stat
 //Check camera view (not in GUNNER)
 if !(cameraView in ["INTERNAL", "EXTERNAL"]) exitWith {false};
 //Exit if run recently (run every 1 seconds)
-if (ACE_diagTime < (GVAR(lastFPTime) + FP_ACTION_TIMEOUT)) exitWith {true};
+if (diag_tickTime < (GVAR(lastFPTime) + FP_ACTION_TIMEOUT)) exitWith {true};
 
-GVAR(lastFPTime) = ACE_diagTime;
+GVAR(lastFPTime) = diag_tickTime;
 
 _fingerPosPrecise = positionCameraToWorld [0, 0, FP_DISTANCE];
 _playerEyePos = eyePos ACE_player;

addons/finger/functions/fnc_perFrameEH.sqf

@@ -31,7 +31,7 @@ _iconSize = BASE_SIZE * _fovCorrection;
 {
     _data = HASH_GET(GVAR(fingersHash), _x);
     _data params ["_lastTime", "_pos", "_name"];
-    _timeLeftToShow = _lastTime + FP_TIMEOUT - ACE_diagTime;
+    _timeLeftToShow = _lastTime + FP_TIMEOUT - diag_tickTime;
     if (_timeLeftToShow <= 0) then {
         HASH_REM(GVAR(fingersHash), _x);
     } else {

addons/frag/functions/fnc_addTrack.sqf

@@ -20,4 +20,4 @@ _positions set[(count _positions), [(getPos _obj), _objSpd]];
 _data = [_origin, typeOf _origin, typeOf _obj, _objSpd, _positions, _color];
 
 GVAR(traces) set[_index, _data];
-[DFUNC(trackTrace), 0, [_obj, _index, ACE_time]] call CBA_fnc_addPerFrameHandler;
+[DFUNC(trackTrace), 0, [_obj, _index, CBA_missionTime]] call CBA_fnc_addPerFrameHandler;

addons/frag/functions/fnc_frago.sqf

@@ -9,7 +9,7 @@
 if(!isServer) exitWith { };
 
 BEGIN_COUNTER(frago);
-// _startTime = ACE_diagTime;
+// _startTime = diag_tickTime;
 
 private ["_startTime", "_round", "_lastPos", "_lastVel", "_shellType", "_gun", "_fragTypes", "_warn", "_atlPos", "_isArmed", "_fuseDist", "_indirectHitRange", "_fragRange", "_c", "_m", "_k", "_gC", "_fragPower", "_fragPowerRandom", "_manObjects", "_objects", "_crew", "_fragCount", "_fragArcs", "_doRandom", "_boundingBox", "_targetPos", "_distance", "_add", "_bbX", "_bbY", "_bbZ", "_cubic", "_targetVel", "_baseVec", "_dir", "_currentCount", "_count", "_vecVar", "_vec", "_fp", "_vel", "_fragType", "_fragObj", "_randomCount", "_sectorSize", "_sectorOffset", "_i", "_randomDir", "_endTime", "_target"];
 
@@ -214,5 +214,5 @@ if(_isArmed && (count _objects) > 0) then {
     // ACE_player sideChat format["total frags: %1", GVAR(TOTALFRAGS)];
     // ACE_player sideChat format["tracks: %1", (count GVAR(trackedObjects))];
 // #endif
-// _endTime = ACE_diagTime;
+// _endTime = diag_tickTime;
 END_COUNTER(frago);

addons/gforces/functions/fnc_pfhUpdateGForces.sqf

@@ -16,8 +16,8 @@
 EXPLODE_2_PVT(_this,_params,_pfhId);
 
 // Update the g-forces at constant mission time intervals (taking accTime into account)
-if ((ACE_time - GVAR(lastUpdateTime)) < INTERVAL) exitWith {};
+if ((CBA_missionTime - GVAR(lastUpdateTime)) < INTERVAL) exitWith {};
-GVAR(lastUpdateTime) = ACE_time;
+GVAR(lastUpdateTime) = CBA_missionTime;
 
 if (isNull ACE_player || !(alive ACE_player)) exitWith {};
 

addons/goggles/functions/fnc_applyDustEffect.sqf

@@ -50,7 +50,7 @@ SETDUST(DBULLETS,0);
 GVAR(DustHandler) = -1;
 
 GVAR(DustHandler) = [{
-    if (ACE_diagTime >= GETDUSTT(DTIME) + 3) then {
+    if (diag_tickTime >= GETDUSTT(DTIME) + 3) then {
         SETDUST(DAMOUNT,CLAMP(GETDUSTT(DAMOUNT)-1,0,2));
 
         private _amount = 1 - (GETDUSTT(DAMOUNT) * 0.125);

addons/goggles/functions/fnc_handleFired.sqf

@@ -60,14 +60,14 @@ if (!GVAR(surfaceCacheIsDust)) exitWith {true};
 // increment dust value with type bullet
 _bullets = GETDUSTT(DBULLETS);
 
-if (ACE_diagTime - GETDUSTT(DTIME) > 1) then {
+if (diag_tickTime - GETDUSTT(DTIME) > 1) then {
     _bullets = 0;
 };
 
 _bullets = _bullets + 1;
 
 SETDUST(DBULLETS,_bullets);
-SETDUST(DTIME,ACE_diagTime);
+SETDUST(DTIME,diag_tickTime);
 
 // apply dust effect if the amount of fired bullets is over the threshold
 if (GETDUSTT(DAMOUNT) < 2) then {

addons/hearing/functions/fnc_updateVolume.sqf

@@ -27,8 +27,8 @@ if (!_justUpdateVolume) then {
     if (GVAR(deafnessDV) - GVAR(deafnessPrior) > 1 ||
         GVAR(deafnessDV) > 10) then {
 
-        if (ACE_time - GVAR(time3) < 3) exitWith {};
+        if (CBA_missionTime - GVAR(time3) < 3) exitWith {};
-        GVAR(time3) = ACE_time;
+        GVAR(time3) = CBA_missionTime;
 
         if (GVAR(deafnessDV) > 19.75) then {
             playSound (["ACE_Combat_Deafness_Heavy", "ACE_Combat_Deafness_Heavy_NoRing"] select GVAR(DisableEarRinging));

addons/huntir/functions/fnc_cam.sqf

@@ -145,7 +145,7 @@ GVAR(no_cams) sort true;
 
     ctrlSetText [1, format["%1 m", round(GVAR(pos) select 2)]];
     ctrlSetText [2, format["%1", GVAR(cur_cam) + 1]];
-    _cam_time = ACE_time - (GVAR(huntIR) getVariable [QGVAR(startTime), ACE_time]);
+    _cam_time = CBA_missionTime - (GVAR(huntIR) getVariable [QGVAR(startTime), CBA_missionTime]);
     ctrlSetText [3, format["%1 s", round(_cam_time)]];
     _cam_pos = getPosVisual GVAR(huntIR);
     _cam_pos = format ["X = %1, Y = %2", round (_cam_pos select 0), round (_cam_pos select 1)];

addons/huntir/functions/fnc_handleFired.sqf

@@ -34,7 +34,7 @@ if (!hasInterface) exitWith {};
         params ["_position"];
         _huntir = createVehicle ["ACE_HuntIR", _position, [], 0, "FLY"];
         _huntir setPosATL _position;
-        _huntir setVariable [QGVAR(startTime), ACE_time, true];
+        _huntir setVariable [QGVAR(startTime), CBA_missionTime, true];
         [{
             params ["_args", "_idPFH"];
             _args params ["_huntir"];

addons/huntir/functions/fnc_huntir.sqf

@@ -30,7 +30,7 @@ createDialog "ace_huntir_cam_dialog_off";
     createDialog "ace_huntir_cam_dialog_inactive";
     uiNameSpace setVariable ["ace_huntir_monitor", findDisplay 18881];
     [{
-        GVAR(startTime) = ACE_time;
+        GVAR(startTime) = CBA_missionTime;
         GVAR(done) = false;
         GVAR(connectionDelay) = 5;
         GVAR(state) = "searching";
@@ -44,7 +44,7 @@ createDialog "ace_huntir_cam_dialog_off";
             };
 
             private ["_elapsedTime", "_nearestHuntIRs"];
-            _elapsedTime = ACE_time - GVAR(startTime);
+            _elapsedTime = CBA_missionTime - GVAR(startTime);
             _nearestHuntIRs = ACE_player nearEntities ["ACE_HuntIR", HUNTIR_MAX_TRANSMISSION_RANGE];
 
             if ((!dialog) || GVAR(done)) exitWith {

addons/interact_menu/XEH_preInit.sqf

@@ -24,7 +24,7 @@ GVAR(keyDownSelfAction) = false;
 GVAR(keyDownTime) = 0;
 GVAR(openedMenuType) = -1;
 
-GVAR(lastTime) = ACE_diagTime;
+GVAR(lastTime) = diag_tickTime;
 GVAR(rotationAngle) = 0;
 
 GVAR(selectedAction) = [[],[]];
@@ -40,8 +40,8 @@ GVAR(lastPath) = [];
 
 GVAR(expanded) = false;
 
-GVAR(startHoverTime) = ACE_diagTime;
+GVAR(startHoverTime) = diag_tickTime;
-GVAR(expandedTime) = ACE_diagTime;
+GVAR(expandedTime) = diag_tickTime;
 GVAR(iconCtrls) = [];
 GVAR(iconCount) = 0;
 

addons/interact_menu/functions/fnc_keyDown.sqf

@@ -32,7 +32,7 @@ if (_menuType == 0) then {
     GVAR(keyDown) = false;
     GVAR(keyDownSelfAction) = true;
 };
-GVAR(keyDownTime) = ACE_diagTime;
+GVAR(keyDownTime) = diag_tickTime;
 GVAR(openedMenuType) = _menuType;
 GVAR(lastTimeSearchedActions) = -1000;
 GVAR(ParsedTextCached) = [];
@@ -83,21 +83,21 @@ if (GVAR(openedMenuType) == 0) then {
         if (vehicle ACE_player != ACE_player) then {
             GVAR(menuDepthPath) = [["ACE_SelfActions", (vehicle ACE_player)]];
             GVAR(expanded) = true;
-            GVAR(expandedTime) = ACE_diagTime;
+            GVAR(expandedTime) = diag_tickTime;
             GVAR(lastPath) = +GVAR(menuDepthPath);
             GVAR(startHoverTime) = -1000;
         };
     } else {
         GVAR(menuDepthPath) = [["ACE_ZeusActions", (getAssignedCuratorLogic player)]];
         GVAR(expanded) = true;
-        GVAR(expandedTime) = ACE_diagTime;
+        GVAR(expandedTime) = diag_tickTime;
         GVAR(lastPath) = +GVAR(menuDepthPath);
         GVAR(startHoverTime) = -1000;
     };
 } else {
     GVAR(menuDepthPath) = [["ACE_SelfActions", ACE_player]];
     GVAR(expanded) = true;
-    GVAR(expandedTime) = ACE_diagTime;
+    GVAR(expandedTime) = diag_tickTime;
     GVAR(lastPath) = +GVAR(menuDepthPath);
     GVAR(startHoverTime) = -1000;
 };

addons/interact_menu/functions/fnc_render.sqf

@@ -51,7 +51,7 @@ if (GVAR(openedMenuType) >= 0) then {
     private _closest = GVAR(currentOptions) select _closestSelection;
     _closest params ["_action", "_sPos", "_hoverPath"];
 
-    private _cTime = ACE_diagTime;
+    private _cTime = diag_tickTime;
     private _delta = _cTime - GVAR(lastTime);
     GVAR(lastTime) = _cTime;
 
@@ -65,17 +65,17 @@ if (GVAR(openedMenuType) >= 0) then {
 
     private _misMatch = !(GVAR(lastPath) isEqualTo _hoverPath);
 
-    if(_misMatch && {ACE_diagTime-GVAR(expandedTime) > linearConversion [0, 2, GVAR(menuAnimationSpeed), 0.25, 0.08333333]}) then {
+    if(_misMatch && {diag_tickTime-GVAR(expandedTime) > linearConversion [0, 2, GVAR(menuAnimationSpeed), 0.25, 0.08333333]}) then {
-        GVAR(startHoverTime) = ACE_diagTime;
+        GVAR(startHoverTime) = diag_tickTime;
         GVAR(lastPath) = _hoverPath;
         GVAR(expanded) = false;
     } else {
-        if(!GVAR(expanded) && {ACE_diagTime-GVAR(startHoverTime) > linearConversion [0, 2, GVAR(menuAnimationSpeed), 0.25, 0.08333333]}) then {
+        if(!GVAR(expanded) && {diag_tickTime-GVAR(startHoverTime) > linearConversion [0, 2, GVAR(menuAnimationSpeed), 0.25, 0.08333333]}) then {
             GVAR(expanded) = true;
 
             // Start the expanding menu animation only if the user is not going up the menu
             if !([GVAR(menuDepthPath),GVAR(lastPath)] call FUNC(isSubPath)) then {
-                GVAR(expandedTime) = ACE_diagTime;
+                GVAR(expandedTime) = diag_tickTime;
             };
             GVAR(menuDepthPath) = +GVAR(lastPath);
 

addons/interact_menu/functions/fnc_renderActionPoints.sqf

@@ -24,7 +24,7 @@ private _fnc_renderNearbyActions = {
     #define MAXINTERACTOBJECTS 3
 
     GVAR(foundActions) = [];
-    GVAR(lastTimeSearchedActions) = ACE_diagTime;
+    GVAR(lastTimeSearchedActions) = diag_tickTime;
 
     private _numInteractObjects = 0;
     private _nearestObjects = nearestObjects [ACE_player, ["All"], 13];
@@ -127,7 +127,7 @@ GVAR(collectedActionPoints) resize 0;
 if (GVAR(openedMenuType) == 0) then {
     if (isNull curatorCamera) then {
         if (vehicle ACE_player == ACE_player) then {
-            if (ACE_diagTime > GVAR(lastTimeSearchedActions) + 0.20) then {
+            if (diag_tickTime > GVAR(lastTimeSearchedActions) + 0.20) then {
                 // Once every 0.2 secs, collect nearby objects active and visible action points and render them
                 call _fnc_renderNearbyActions;
             } else {

addons/interact_menu/functions/fnc_renderMenu.sqf

@@ -99,8 +99,8 @@ if (GVAR(UseListMenu)) then {
 
 // Animate menu scale
 if (_menuInSelectedPath && {_menuDepth == count _path}) then {
-    _scaleX = _scaleX * (0.3 + 0.7 * (((ACE_diagTime - GVAR(expandedTime)) * linearConversion [0, 2, GVAR(menuAnimationSpeed), 8, 16]) min 1));
+    _scaleX = _scaleX * (0.3 + 0.7 * (((diag_tickTime - GVAR(expandedTime)) * linearConversion [0, 2, GVAR(menuAnimationSpeed), 8, 16]) min 1));
-    _scaleY = _scaleY * (0.3 + 0.7 * (((ACE_diagTime - GVAR(expandedTime)) * linearConversion [0, 2, GVAR(menuAnimationSpeed), 8, 16]) min 1));
+    _scaleY = _scaleY * (0.3 + 0.7 * (((diag_tickTime - GVAR(expandedTime)) * linearConversion [0, 2, GVAR(menuAnimationSpeed), 8, 16]) min 1));
 };
 
 private _target = _actionObject;

addons/interaction/functions/fnc_openDoor.sqf

@@ -62,10 +62,10 @@ GVAR(usedScrollWheel) = false;
     };
 
     // this allows for holding the door in it's current state.
-    if (ACE_time > _time && {diag_frameno > _frame}) then {
+    if (CBA_missionTime > _time && {diag_frameno > _frame}) then {
         GVAR(usedScrollWheel) = true;
     };
 
     // do incremental door opening
     {_house animate [_x, GVAR(doorTargetPhase)]; false} count _animations;
-}, 0.1, [_house, _animations, getPosASL ACE_player, ACE_time + 0.2, diag_frameno + 2]] call CBA_fnc_addPerFrameHandler;
+}, 0.1, [_house, _animations, getPosASL ACE_player, CBA_missionTime + 0.2, diag_frameno + 2]] call CBA_fnc_addPerFrameHandler;

addons/javelin/functions/fnc_onOpticDraw.sqf

@@ -20,7 +20,7 @@ _currentShooter = (vehicle ACE_player);
 _args = uiNamespace getVariable[QGVAR(arguments), [] ];
 if( (count _args) > 0) then {
     _lastTick = _args select 0;
-    if(ACE_diagTime - _lastTick > 1) then {
+    if(diag_tickTime - _lastTick > 1) then {
         [] call FUNC(onOpticLoad);
     };
 };
@@ -184,12 +184,12 @@ if (isNull _newTarget) then {
         // Lock on after 3 seconds
         if(_currentTarget != _newTarget) then {
             TRACE_1("New Target, reseting locking", _newTarget);
-            _lockTime = ACE_diagTime;
+            _lockTime = diag_tickTime;
             _currentTarget = _newTarget;
 
             playSound "ACE_Javelin_Locking";
         } else {
-            if(ACE_diagTime - _lockTime > __LOCKONTIME + _randomLockInterval) then {
+            if(diag_tickTime - _lockTime > __LOCKONTIME + _randomLockInterval) then {
                 TRACE_2("LOCKED!", _currentTarget, _lockTime);
 
                 __JavelinIGUISeek ctrlSetTextColor __ColorGreen;
@@ -231,9 +231,9 @@ if (isNull _newTarget) then {
                 // Allow fire
                 _fireDisabledEH = [_fireDisabledEH] call FUNC(enableFire);
 
-                if(ACE_diagTime > _soundTime) then {
+                if(diag_tickTime > _soundTime) then {
                     playSound "ACE_Javelin_Locked";
-                    _soundTime = ACE_diagTime + 0.25;
+                    _soundTime = diag_tickTime + 0.25;
                 };
             } else {
                 __JavelinIGUITargeting ctrlShow true;
@@ -265,9 +265,9 @@ if (isNull _newTarget) then {
 
                 {_x ctrlCommit __TRACKINTERVAL} forEach [__JavelinIGUITargetingGateTL,__JavelinIGUITargetingGateTR,__JavelinIGUITargetingGateBL,__JavelinIGUITargetingGateBR];
 
-                if(ACE_diagTime > _soundTime) then {
+                if(diag_tickTime > _soundTime) then {
                     playSound "ACE_Javelin_Locking";
-                    _soundTime = ACE_diagTime + 0.25;
+                    _soundTime = diag_tickTime + 0.25;
                 };
                 // Disallow fire
                 _fireDisabledEH = [_fireDisabledEH] call FUNC(disableFire);
@@ -294,7 +294,7 @@ if (isNull _newTarget) then {
 //TRACE_2("", _newTarget, _currentTarget);
 
 // Save arguments for next run
-_args set[0, ACE_diagTime];
+_args set[0, diag_tickTime];
 _args set[1, _currentTarget];
 _args set[2, _runTime];
 _args set[3, _lockTime];

addons/javelin/functions/fnc_onOpticLoad.sqf

@@ -24,7 +24,7 @@ if(GVAR(pfehID) != -1) then {
 
 uiNameSpace setVariable [QGVAR(arguments), 
     [
-        ACE_diagTime,         // Last runtime
+        diag_tickTime,         // Last runtime
         objNull,   // currentTargetObject
         0,         // Run Time
         0,          // Lock Time

addons/kestrel4500/XEH_postInit.sqf

@@ -11,7 +11,7 @@ GVAR(MinAvgMax) = false;
 GVAR(MinAvgMaxMode) = 0;
 GVAR(referenceHeadingMenu) = 0;
 GVAR(referenceHeadingAutoSet) = true;
-GVAR(manualSetCooldown) = ACE_diagTime;
+GVAR(manualSetCooldown) = diag_tickTime;
 GVAR(headingSetDisplayTimer) = 0;
 
 GVAR(Menu) = 1;

addons/kestrel4500/functions/fnc_buttonPressed.sqf

@@ -33,12 +33,12 @@ switch (_this) do {
                 case 2: { // Auto set
                     GVAR(RefHeading) = (getDir ACE_player) % 360;
                     GVAR(referenceHeadingMenu) = 0;
-                    GVAR(headingSetDisplayTimer) = ACE_diagTime;
+                    GVAR(headingSetDisplayTimer) = diag_tickTime;
                 };
                 case 3: { // Manual set
                     GVAR(RefHeading) = GVAR(TmpHeading);
                     GVAR(referenceHeadingMenu) = 0;
-                    GVAR(headingSetDisplayTimer) = ACE_diagTime;
+                    GVAR(headingSetDisplayTimer) = diag_tickTime;
                 };
             };
         };
@@ -73,13 +73,13 @@ switch (_this) do {
             GVAR(MinAvgMax) = !GVAR(MinAvgMax);
         } else {
             if (GVAR(referenceHeadingMenu) == 3) then {
-                if (ACE_diagTime - GVAR(manualSetCooldown) < 0.2) then {
+                if (diag_tickTime - GVAR(manualSetCooldown) < 0.2) then {
                     GVAR(TmpHeading) = GVAR(TmpHeading) - 10;
                 } else {
                     GVAR(TmpHeading) = GVAR(TmpHeading) - 1;
                 };
                 GVAR(TmpHeading) = (GVAR(TmpHeading) + 360) % 360;
-                GVAR(manualSetCooldown) = ACE_diagTime;
+                GVAR(manualSetCooldown) = diag_tickTime;
             };
         };
     };
@@ -88,13 +88,13 @@ switch (_this) do {
             GVAR(MinAvgMax) = !GVAR(MinAvgMax);
         } else {
             if (GVAR(referenceHeadingMenu) == 3) then {
-                if (ACE_diagTime - GVAR(manualSetCooldown) < 0.2) then {
+                if (diag_tickTime - GVAR(manualSetCooldown) < 0.2) then {
                     GVAR(TmpHeading) = GVAR(TmpHeading) + 10;
                 } else {
                     GVAR(TmpHeading) = GVAR(TmpHeading) + 1;
                 };
                 GVAR(TmpHeading) = (GVAR(TmpHeading) + 360) % 360;
-                GVAR(manualSetCooldown) = ACE_diagTime;
+                GVAR(manualSetCooldown) = diag_tickTime;
             };
         };
     };

addons/kestrel4500/functions/fnc_displayKestrel.sqf

@@ -59,8 +59,8 @@ GVAR(Overlay) = true;
         [_this select 1] call CBA_fnc_removePerFrameHandler;
     };
 
-    if (ACE_diagTime > GVAR(updateTimer)) then {
+    if (diag_tickTime > GVAR(updateTimer)) then {
-        GVAR(updateTimer) = ACE_diagTime + 1;
+        GVAR(updateTimer) = diag_tickTime + 1;
 
         private ["_outputData"];
         _outputData = [] call FUNC(generateOutputData);

addons/kestrel4500/functions/fnc_generateOutputData.sqf

@@ -31,7 +31,7 @@
  */
 #include "script_component.hpp"
 
-if (ACE_diagTime - GVAR(headingSetDisplayTimer) < 0.8) exitWith {["", "", "  Heading Set", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""]};
+if (diag_tickTime - GVAR(headingSetDisplayTimer) < 0.8) exitWith {["", "", "  Heading Set", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""]};
 
 private ["_playerDir", "_playerAltitude", "_temperature", "_humidity", "_barometricPressure", "_airDensity", "_densityAltitude", "_chill", "_heatIndex", "_dewPoint", "_wetBulb", "_dayString", "_monthString", "_windSpeed", "_windDir", "_textTop", "_textCenterBig", "_textCenter", "_textCenterLine1Left", "_textCenterLine2Left", "_textCenterLine3Left", "_textCenterLine1Right", "_textCenterLine2Right", "_textCenterLine3Right", "_textInfoLine1", "_textInfoLine2", "_textBottomBig", "_textCenterLine1", "_textCenterLine2", "_textCenterLine3", "_textCenterLine4", "_textCenterLine5", "_textCenterLine6"];
 

addons/laser/functions/fnc_laserOn.sqf

@@ -17,7 +17,7 @@
 #include "script_component.hpp"
 
 private ["_uuid", "_args"];
-_uuid = format["%1%2%3", floor ACE_diagTime, floor random 1000, floor random 10000];
+_uuid = format["%1%2%3", floor diag_tickTime, floor random 1000, floor random 10000];
 _args = [_uuid, _this];
 ["laser_laserOn", _args] call EFUNC(common,globalEvent);
 _uuid;

addons/laser_selfdesignate/functions/fnc_laserHudDesignateOn.sqf

@@ -32,7 +32,7 @@ FUNC(laserHudDesignatePFH) = {
     };
 
     if( (count _args) < 4) then {
-        _args set[3, ACE_diagTime + FCS_UPDATE_DELAY];
+        _args set[3, diag_tickTime + FCS_UPDATE_DELAY];
     };
     _forceUpdateTime = _args select 3;
 
@@ -57,9 +57,9 @@ FUNC(laserHudDesignatePFH) = {
     };
     */
 
-    if(ACE_diagTime > _forceUpdateTime) then {
+    if(diag_tickTime > _forceUpdateTime) then {
         ["ace_fcs_forceUpdate", []] call ace_common_fnc_localEvent;
-         _args set[3, ACE_diagTime + FCS_UPDATE_DELAY];
+         _args set[3, diag_tickTime + FCS_UPDATE_DELAY];
     };
 
     _this set[0, _args];

addons/main/script_macros.hpp

@@ -101,9 +101,6 @@
 #define HASHLIST_SET(hashList, index, value)    ([hashList, index, value, __FILE__, __LINE__] call EFUNC(common,hashListSet))
 #define HASHLIST_PUSH(hashList, value)            ([hashList, value, __FILE__, __LINE__] call EFUNC(common,hashListPush))
 
-// Time functions for accuracy per frame
-#define ACE_tickTime (ACE_time + (diag_tickTime - ACE_diagTime))
-
 #define ACE_isHC (!hasInterface && !isDedicated)
 
 #define IDC_STAMINA_BAR 193

addons/map/XEH_postInitClient.sqf

@@ -29,7 +29,7 @@ call FUNC(determineZoom);
     if (isNull findDisplay 12) exitWith {};
 
     GVAR(lastStillPosition) = ((findDisplay 12) displayCtrl 51) ctrlMapScreenToWorld [0.5, 0.5];
-    GVAR(lastStillTime) = ACE_time;
+    GVAR(lastStillTime) = CBA_missionTime;
     GVAR(isShaking) = false;
 
     //map sizes are multiples of 1280

addons/map/functions/fnc_updateMapEffects.sqf

@@ -44,8 +44,8 @@ if (GVAR(mapShake)) then {
             _amplitude = (_speed - 0.1) / 5 * (1000 * _mapScale);
             _time = 0.1;
 
-            _shakePos = [(GVAR(lastStillPosition) select 0) + sin((ACE_time + _time - GVAR(lastStillTime))*100) * _amplitude * 0.25,
+            _shakePos = [(GVAR(lastStillPosition) select 0) + sin((CBA_missionTime + _time - GVAR(lastStillTime))*100) * _amplitude * 0.25,
-                         (GVAR(lastStillPosition) select 1) + sin((ACE_time + _time - GVAR(lastStillTime))*260) * _amplitude];
+                         (GVAR(lastStillPosition) select 1) + sin((CBA_missionTime + _time - GVAR(lastStillTime))*260) * _amplitude];
 
             _mapCtrl ctrlMapAnimAdd [_time, _mapScale, _shakePos];
             ctrlMapAnimCommit _mapCtrl;
@@ -62,7 +62,7 @@ if (GVAR(mapShake)) then {
         } else {
             // The map is still, store state
             GVAR(lastStillPosition) = _mapCentre;
-            GVAR(lastStillTime) = ACE_time;
+            GVAR(lastStillTime) = CBA_missionTime;
         };
     };
 };

addons/medical/XEH_postInit.sqf

@@ -108,7 +108,7 @@ GVAR(effectPainCC) = [
 
 // Initialize Other Variables
 GVAR(effectBlind) = false;
-GVAR(effectTimeBlood) = ACE_time;
+GVAR(effectTimeBlood) = CBA_missionTime;
 
 // MAIN EFFECTS LOOP
 [{
@@ -155,8 +155,8 @@ GVAR(effectTimeBlood) = ACE_time;
 
     _bleeding = [ACE_player] call FUNC(getBloodLoss);
     // Bleeding Indicator
-    if (_bleeding > 0 and GVAR(effectTimeBlood) + 3.5 < ACE_time) then {
+    if (_bleeding > 0 and GVAR(effectTimeBlood) + 3.5 < CBA_missionTime) then {
-        GVAR(effectTimeBlood) = ACE_time;
+        GVAR(effectTimeBlood) = CBA_missionTime;
         [600 * _bleeding] call BIS_fnc_bloodEffect;
     };
 
@@ -172,8 +172,8 @@ GVAR(effectTimeBlood) = ACE_time;
 }, 0.5, []] call CBA_fnc_addPerFrameHandler;
 
 
-GVAR(lastHeartBeat) = ACE_time;
+GVAR(lastHeartBeat) = CBA_missionTime;
-GVAR(lastHeartBeatSound) = ACE_time;
+GVAR(lastHeartBeatSound) = CBA_missionTime;
 
 // HEARTRATE BASED EFFECTS
 [{
@@ -193,8 +193,8 @@ GVAR(lastHeartBeatSound) = ACE_time;
             GVAR(effectPainCC) ppEffectEnable false;
         };
     } else {
-        if ((ACE_time > GVAR(lastHeartBeat) + _interval)) then {
+        if ((CBA_missionTime > GVAR(lastHeartBeat) + _interval)) then {
-            GVAR(lastHeartBeat) = ACE_time;
+            GVAR(lastHeartBeat) = CBA_missionTime;
 
             // Pain effect, no pain effect in zeus camera
             if (isNull curatorCamera) then {
@@ -251,8 +251,8 @@ GVAR(lastHeartBeatSound) = ACE_time;
 
     if (GVAR(level) >= 2 && {_heartRate > 0}) then {
         _minTime = 60 / _heartRate;
-        if (ACE_time - GVAR(lastHeartBeatSound) > _minTime) then {
+        if (CBA_missionTime - GVAR(lastHeartBeatSound) > _minTime) then {
-            GVAR(lastHeartBeatSound) = ACE_time;
+            GVAR(lastHeartBeatSound) = CBA_missionTime;
             // Heart rate sound effect
             if (_heartRate < 60) then {
                 _sound = GVAR(heartBeatSounds_Normal) select (random((count GVAR(heartBeatSounds_Normal)) -1));

addons/medical/functions/fnc_addToInjuredCollection.sqf

@@ -27,8 +27,8 @@ if ([_unit] call FUNC(hasMedicalEnabled) || _force) then {
     [{
         params ["_args", "_idPFH"];
         _args params ["_unit", "_interval"];
-        _interval = ACE_time - _interval;
+        _interval = CBA_missionTime - _interval;
-        (_this select 0) set [1, ACE_time];
+        (_this select 0) set [1, CBA_missionTime];
 
         if (!alive _unit || !local _unit) then {
            [_idPFH] call CBA_fnc_removePerFrameHandler;
@@ -55,5 +55,5 @@ if ([_unit] call FUNC(hasMedicalEnabled) || _force) then {
                 [_unit, _pain] call FUNC(playInjuredSound);
             };
         };
-    }, 1, [_unit, ACE_time]] call CBA_fnc_addPerFrameHandler;
+    }, 1, [_unit, CBA_missionTime]] call CBA_fnc_addPerFrameHandler;
 };

addons/medical/functions/fnc_addToTriageCard.sqf

@@ -29,7 +29,7 @@ _amount = 1;
         private "_info";
         _info = _log select _forEachIndex;
         _info set [1,(_info select 1) + 1];
-        _info set [2, ACE_gameTime];
+        _info set [2, CBA_missionTime];
         _log set [_forEachIndex, _info];
 
         _amount = (_info select 1);
@@ -38,7 +38,7 @@ _amount = 1;
 } forEach _log;
 
 if (!_inList) then {
-    _log pushBack [_newItem, 1, ACE_gameTime];
+    _log pushBack [_newItem, 1, CBA_missionTime];
 };
 _unit setVariable [QGVAR(triageCard), _log, true];
 ["Medical_onItemAddedToTriageCard", [_unit, _newItem, _amount]] call EFUNC(common,localEvent);

addons/medical/functions/fnc_getCardiacOutput.sqf

@@ -14,7 +14,7 @@
 #include "script_component.hpp"
 
 /*
-    Cardiac output (Q or or CO ) is the volume of blood being pumped by the heart, in particular by a left or right ventricle in the ACE_time interval of one minute. CO may be measured in many ways, for example dm3/min (1 dm3 equals 1 litre).
+    Cardiac output (Q or or CO ) is the volume of blood being pumped by the heart, in particular by a left or right ventricle in the CBA_missionTime interval of one minute. CO may be measured in many ways, for example dm3/min (1 dm3 equals 1 litre).
 
     Source: http://en.wikipedia.org/wiki/Cardiac_output
 */

addons/medical/functions/fnc_handleCreateLitter.sqf

@@ -41,14 +41,14 @@ if((count GVAR(allCreatedLitter)) > _maxLitterCount ) then {
     } forEach (_oldLitter select 1);
 };
 
-GVAR(allCreatedLitter) pushBack [ACE_time, [_litterObject]];
+GVAR(allCreatedLitter) pushBack [CBA_missionTime, [_litterObject]];
 
 if(!GVAR(litterPFHRunning) && {GVAR(litterCleanUpDelay) > 0}) then {
     GVAR(litterPFHRunning) = true;
     [{
         {
             _x params ["_time", "_objects"];
-            if (ACE_time - _time >= GVAR(litterCleanUpDelay)) then {
+            if (CBA_missionTime - _time >= GVAR(litterCleanUpDelay)) then {
                 {
                     deleteVehicle _x;
                 } forEach _objects;

addons/medical/functions/fnc_handleLocal.sqf

@@ -24,7 +24,7 @@ if (_local) then {
     if ((_unit getVariable ["ACE_isUnconscious",false]) && {count (_unit getVariable [QGVAR(unconsciousArguments), []]) >= 6}) then {
         private "_arguments";
         _arguments = (_unit getVariable [QGVAR(unconsciousArguments), []]);
-        _arguments set [2, ACE_time];
+        _arguments set [2, CBA_missionTime];
 
         [DFUNC(unconsciousPFH), 0.1, _arguments ] call CBA_fnc_addPerFrameHandler;
 

addons/medical/functions/fnc_handleUnitVitals.sqf

@@ -19,9 +19,9 @@ TRACE_3("ACE_DEBUG",_unit,_interval,_unit);
 if (_interval == 0) exitWith {};
 
 _lastTimeValuesSynced = _unit getVariable [QGVAR(lastMomentValuesSynced), 0];
-_syncValues = (ACE_time - _lastTimeValuesSynced >= (10 + floor(random(10))) && GVAR(keepLocalSettingsSynced));
+_syncValues = (CBA_missionTime - _lastTimeValuesSynced >= (10 + floor(random(10))) && GVAR(keepLocalSettingsSynced));
 if (_syncValues) then {
-    _unit setVariable [QGVAR(lastMomentValuesSynced), ACE_time];
+    _unit setVariable [QGVAR(lastMomentValuesSynced), CBA_missionTime];
 };
 
 _bloodVolume = (_unit getVariable [QGVAR(bloodVolume), 100]) + ([_unit] call FUNC(getBloodVolumeChange));

addons/medical/functions/fnc_isInMedicalFacility.sqf

@@ -19,7 +19,7 @@ params ["_unit"];
 
 //Cache the results as this function could be called rapidly
 (_unit getVariable [QGVAR(cacheInFacility), [-9, false]]) params ["_expireTime", "_lastResult"];
-if (ACE_time < _expireTime) exitWith {_lastResult};
+if (CBA_missionTime < _expireTime) exitWith {_lastResult};
 
 private _eyePos = eyePos _unit;
 private _isInBuilding = false;
@@ -58,6 +58,6 @@ if (!_isInBuilding) then {
 };
 
 //Save the results (with a 1 second expiry)
-_unit setVariable [QGVAR(cacheInFacility), [ACE_time + 1, _isInBuilding]];
+_unit setVariable [QGVAR(cacheInFacility), [CBA_missionTime + 1, _isInBuilding]];
 
 _isInBuilding;

addons/medical/functions/fnc_setCardiacArrest.sqf

@@ -36,9 +36,9 @@ _timeInCardiacArrest = 120 + round(random(600));
         [_idPFH] call CBA_fnc_removePerFrameHandler;
         _unit setVariable [QGVAR(inCardiacArrest), nil,true];
     };
-    if (ACE_time - _startTime >= _timeInCardiacArrest) exitWith {
+    if (CBA_missionTime - _startTime >= _timeInCardiacArrest) exitWith {
         [_idPFH] call CBA_fnc_removePerFrameHandler;
         _unit setVariable [QGVAR(inCardiacArrest), nil,true];
         [_unit] call FUNC(setDead);
     };
-}, 1, [_unit, ACE_time, _timeInCardiacArrest] ] call CBA_fnc_addPerFrameHandler;
+}, 1, [_unit, CBA_missionTime, _timeInCardiacArrest] ] call CBA_fnc_addPerFrameHandler;

addons/medical/functions/fnc_setDead.sqf

@@ -38,7 +38,7 @@ if (((_reviveVal == 1 && {[_unit] call EFUNC(common,isPlayer)} || _reviveVal ==
     };
 
     _unit setVariable [QGVAR(inReviveState), true, true];
-    _unit setVariable [QGVAR(reviveStartTime), ACE_time];
+    _unit setVariable [QGVAR(reviveStartTime), CBA_missionTime];
     [_unit, true] call FUNC(setUnconscious);
 
     [{
@@ -53,7 +53,7 @@ if (((_reviveVal == 1 && {[_unit] call EFUNC(common,isPlayer)} || _reviveVal ==
             [_unit] call EFUNC(common,unloadPerson);
         };
 
-        if (GVAR(maxReviveTime) > 0 && {ACE_time - _startTime > GVAR(maxReviveTime)}) exitwith {
+        if (GVAR(maxReviveTime) > 0 && {CBA_missionTime - _startTime > GVAR(maxReviveTime)}) exitwith {
             [_idPFH] call CBA_fnc_removePerFrameHandler;
             _unit setVariable [QGVAR(inReviveState), nil, true];
             _unit setVariable [QGVAR(reviveStartTime), nil];

addons/medical/functions/fnc_setUnconscious.sqf

@@ -115,7 +115,7 @@ _anim = [_unit] call EFUNC(common,getDeathAnim);
     };
 }, [_unit, _anim], 0.5, 0] call EFUNC(common,waitAndExecute);
 
-_startingTime = ACE_time;
+_startingTime = CBA_missionTime;
 
 [DFUNC(unconsciousPFH), 0.1, [_unit, _originalPos, _startingTime, _minWaitingTime, false, vehicle _unit isKindOf "ParachuteBase"] ] call CBA_fnc_addPerFrameHandler;
 

addons/medical/functions/fnc_treatmentAdvanced_CPRLocal.sqf

@@ -20,7 +20,7 @@ params ["_caller","_target"];
 if (_target getVariable [QGVAR(inReviveState), false]) then {
     _reviveStartTime = _target getVariable [QGVAR(reviveStartTime),0];
     if (_reviveStartTime > 0) then {
-        _target setVariable [QGVAR(reviveStartTime), (_reviveStartTime + random(20)) min ACE_time];
+        _target setVariable [QGVAR(reviveStartTime), (_reviveStartTime + random(20)) min CBA_missionTime];
     };
 };
 

addons/medical/functions/fnc_treatmentTourniquetLocal.sqf

@@ -39,9 +39,9 @@ _target setVariable [QGVAR(tourniquets), _tourniquets, true];
         // Tourniquet has been removed
         [_idPFH] call CBA_fnc_removePerFrameHandler;
     };
-    if (ACE_time - _time > 120) then {
+    if (CBA_missionTime - _time > 120) then {
         _target setVariable [QGVAR(pain), (_target getVariable [QGVAR(pain), 0]) + 0.005];
     };
-}, 5, [_target, _applyingTo, _part, ACE_time] ] call CBA_fnc_addPerFrameHandler;
+}, 5, [_target, _applyingTo, _part, CBA_missionTime] ] call CBA_fnc_addPerFrameHandler;
 
 true

addons/medical/functions/fnc_unconsciousPFH.sqf

@@ -130,13 +130,13 @@ if (_parachuteCheck) then {
 
 if (!local _unit) exitWith {
     TRACE_6("ACE_DEBUG_Unconscious_PFH",_unit, _args, _startingTime, _minWaitingTime, _idPFH, _unit getVariable QGVAR(unconsciousArguments));
-    _args set [3, _minWaitingTime - (ACE_time - _startingTime)];
+    _args set [3, _minWaitingTime - (CBA_missionTime - _startingTime)];
     _unit setVariable [QGVAR(unconsciousArguments), _args, true];
     [_idPFH] call CBA_fnc_removePerFrameHandler;
 };
 
 // Ensure we are waiting at least a minimum period before checking if we can wake up the unit again, allows for temp knock outs
-if ((ACE_time - _startingTime) >= _minWaitingTime) exitWith {
+if ((CBA_missionTime - _startingTime) >= _minWaitingTime) exitWith {
     TRACE_2("ACE_DEBUG_Unconscious_Temp knock outs",_unit, [_unit] call FUNC(getUnconsciousCondition));
     if (!([_unit] call FUNC(getUnconsciousCondition))) then {
         _unit setVariable ["ACE_isUnconscious", false, true];

addons/medical_menu/XEH_postInit.sqf

@@ -31,7 +31,7 @@ GVAR(pendingReopen) = false;
     false
 },
 {
-    if (ACE_time - GVAR(lastOpenedOn) > 0.5) exitWith {
+    if (CBA_missionTime - GVAR(lastOpenedOn) > 0.5) exitWith {
         [objNull] call FUNC(openMenu);
     };
     false

addons/medical_menu/functions/fnc_handleUI_DisplayOptions.sqf

@@ -77,7 +77,7 @@ if (_name isEqualTo "triage") exitWith {
                 _message = localize _message;
             };
         };
-        _triageCardTexts pushBack format["%1x - %2 (%3m)", _amount, _message, round((ACE_gameTime - _time) / 60)];
+        _triageCardTexts pushBack format["%1x - %2 (%3m)", _amount, _message, round((CBA_missionTime - _time) / 60)];
         nil;
     } count _log;
 

addons/medical_menu/functions/fnc_openMenu.sqf

@@ -34,6 +34,6 @@ if (dialog || {isNull _interactionTarget}) exitWith {
 GVAR(INTERACTION_TARGET) = _interactionTarget;
 
 createDialog QGVAR(medicalMenu);
-GVAR(lastOpenedOn) = ACE_time;
+GVAR(lastOpenedOn) = CBA_missionTime;
 
 true

addons/missileguidance/functions/fnc_guidancePFH.sqf

@@ -24,7 +24,7 @@ _seekerParams = _args select 3;
 _stateParams = _args select 4;
 
 _lastRunTime = _stateParams select 0;
-_runtimeDelta = ACE_diagTime - _lastRunTime;
+_runtimeDelta = diag_tickTime - _lastRunTime;
 _adjustTime = 1;
 
 if(accTime > 0) then {
@@ -100,7 +100,7 @@ _PS setDropInterval 3.0;
 hintSilent format["d: %1", _distanceToTarget];
 #endif
 
-_stateParams set[0, ACE_diagTime];
+_stateParams set[0, diag_tickTime];
 
 _args set[4, _stateParams];
 _this set[0, _args];

addons/missileguidance/functions/fnc_onFired.sqf

@@ -89,7 +89,7 @@ _args = [_this,
                 getNumber ( _config >> "seekerAccuracy" ),
                 getNumber ( _config >> "seekerMaxRange" )
             ],
-            [ ACE_diagTime, [], [] ]
+            [ diag_tickTime, [], [] ]
         ];
   
 // Hand off to the guiding unit. We just use local player so local PFH fires for now

addons/missionmodules/functions/fnc_moduleAmbianceSound.sqf

@@ -74,7 +74,7 @@ if (_activated && local _logic) then {
             [_pfhHandle] call CBA_fnc_removePerFrameHandler;
         };
 
-        if (ACE_time - _lastTimePlayed >= ((_minDelayBetweensounds + random(_maxDelayBetweenSounds)) min _maxDelayBetweenSounds)) then {
+        if (CBA_missionTime - _lastTimePlayed >= ((_minDelayBetweensounds + random(_maxDelayBetweenSounds)) min _maxDelayBetweenSounds)) then {
 
             // Find all players in session.
             _allUnits = if (isMultiplayer) then {playableUnits} else {[ACE_player]};
@@ -109,11 +109,11 @@ if (_activated && local _logic) then {
                 // If no unit is to close to this position, we will play the sound.
                 if ({(_newPos distance _x < (_minimalDistance / 2))}count _allUnits == 0) then {
                     playSound3D [selectRandom _ambianceSounds, objNull,  false, _newPos, _volume, 1, 1000];
-                    _args set [8, ACE_time];
+                    _args set [8, CBA_missionTime];
                 };
             };
         };
-    }, 0.1, [_logic, _ambianceSounds, _minimalDistance, _maximalDistance, _minDelayBetweensounds, _maxDelayBetweenSounds, _volume, _followPlayers, ACE_time] ] call CBA_fnc_addPerFrameHandler;
+    }, 0.1, [_logic, _ambianceSounds, _minimalDistance, _maximalDistance, _minDelayBetweensounds, _maxDelayBetweenSounds, _volume, _followPlayers, CBA_missionTime] ] call CBA_fnc_addPerFrameHandler;
 };
 
 true;

addons/mk6mortar/functions/fnc_dev_simulateCalcRangeTableLine.sqf

@@ -21,7 +21,7 @@ Example:
 
 private ["_startTime", "_muzzleVelocity", "_rangeToHit", "_airFriction", "_vacElevation", "_radicand", "_maxElev", "_minElev", "_error", "_solutionElevation", "_lastTestResult", "_numberOfAttempts", "_lineElevation", "_lineTimeOfFlight", "_lineHeightElevation", "_lineHeightTimeDelta", "_lineCrosswindDeg", "_lineHeadwindMeters", "_lineTailWindMeters", "_result"];
 
-_startTime = ACE_diagTime;
+_startTime = diag_tickTime;
 
 _muzzleVelocity = _this select 0;
 _rangeToHit = _this select 1;
@@ -74,6 +74,6 @@ _lineAirDensDec = (_rangeToHit - (_lastTestResult select 0)) / 10;
 _lastTestResult = [_lineElevation, _muzzleVelocity, _airFriction, 15, 1.1, 0, 0, 0, TIME_STEP] call FUNC(dev_simulateShot);
 _lineAirDensInc = (_rangeToHit - (_lastTestResult select 0)) / 10;
 
-// systemChat format ["debug: Range %1 - in %2 sec", _rangeToHit, (ACE_diagTime - _startTime)];
+// systemChat format ["debug: Range %1 - in %2 sec", _rangeToHit, (diag_tickTime - _startTime)];
 
 [_rangeToHit, _lineElevation, _lineHeightElevation, _lineHeightTimeDelta, _lineTimeOfFlight, _lineCrosswindDeg, _lineHeadwindMeters, _lineTailWindMeters, _lineTempDec, _lineTempInc, _lineAirDensDec, _lineAirDensInc]

addons/mk6mortar/functions/fnc_handleFired.sqf

@@ -70,8 +70,8 @@ if (_newMuzzleVelocityCoefficent != 1) then {
         [_pfID] call CBA_fnc_removePerFrameHandler;
     };
 
-    _deltaT = ACE_time - _time;
+    _deltaT = CBA_missionTime - _time;
-    _args set[2, ACE_time];
+    _args set[2, CBA_missionTime];
 
     _bulletVelocity = velocity _shell;
     _bulletSpeed = vectorMagnitude _bulletVelocity;
@@ -85,4 +85,4 @@ if (_newMuzzleVelocityCoefficent != 1) then {
 
     _shell setVelocity _bulletVelocity;
 
-}, 0, [_projectile, MK6_82mm_AIR_FRICTION, ACE_time, _relativeDensity]] call CBA_fnc_addPerFrameHandler;
+}, 0, [_projectile, MK6_82mm_AIR_FRICTION, CBA_missionTime, _relativeDensity]] call CBA_fnc_addPerFrameHandler;

addons/nametags/XEH_postInit.sqf

@@ -14,7 +14,7 @@ GVAR(showNamesTime) = -10;
     if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
 
     // Statement
-    GVAR(showNamesTime) = ACE_time;
+    GVAR(showNamesTime) = CBA_missionTime;
     if (call FUNC(canShow)) then{ call FUNC(doShow); };
     // Return false so it doesn't block other actions
     false

addons/nametags/functions/fnc_onDraw3d.sqf

@@ -47,13 +47,13 @@ switch (GVAR(showPlayerNames)) do {
     };
     case 3: {
         // Player names Only Keypress
-        _onKeyPressAlphaMax = 2 + (GVAR(showNamesTime) - ACE_time);
+        _onKeyPressAlphaMax = 2 + (GVAR(showNamesTime) - CBA_missionTime);
         _enabledTagsNearby = (_onKeyPressAlphaMax) > 0 || (GVAR(showSoundWaves) == 2);
         _enabledTagsCursor = false;
     };
     case 4: {
         // Player names Only Cursor and Keypress
-        _onKeyPressAlphaMax = 2 + (GVAR(showNamesTime) - ACE_time);
+        _onKeyPressAlphaMax = 2 + (GVAR(showNamesTime) - CBA_missionTime);
         _enabledTagsNearby = (GVAR(showSoundWaves) == 2);
         _enabledTagsCursor = _onKeyPressAlphaMax > 0;
     };

addons/overheating/functions/fnc_firedEH.sqf

@@ -65,8 +65,8 @@ if (_unit != ACE_player && (!GVAR(showParticleEffectsForEveryone) || {_unit dist
 };
 
 //Particle Effects:
-if (GVAR(showParticleEffects) && {(ACE_time > ((_unit getVariable [QGVAR(lastDrop), -1000]) + 0.40)) && {_scaledTemperature > 0.1}}) then {
+if (GVAR(showParticleEffects) && {(CBA_missionTime > ((_unit getVariable [QGVAR(lastDrop), -1000]) + 0.40)) && {_scaledTemperature > 0.1}}) then {
-    _unit setVariable [QGVAR(lastDrop), ACE_time];
+    _unit setVariable [QGVAR(lastDrop), CBA_missionTime];
 
     private _direction = (_unit weaponDirection _weapon) vectorMultiply 0.25;
     private _position = (position _projectile) vectorAdd (_direction vectorMultiply (4*(random 0.30)));

addons/overheating/functions/fnc_swapBarrelCallback.sqf

@@ -29,4 +29,4 @@ playSound "ACE_BarrelSwap";
 // Publish the temperature variable
 _player setVariable [format [QGVAR(%1_temp), _weapon], 0, true];
 // Store the update time
-_player setVariable [format [QGVAR(%1_time), _weapon], ACE_time];
+_player setVariable [format [QGVAR(%1_time), _weapon], CBA_missionTime];

addons/overheating/functions/fnc_updateTemperature.sqf

@@ -72,7 +72,7 @@ _fnc_cooling = {
 };
 
 // Calculate cooling
-_temperature = [_temperature, _barrelMass, ACE_time - _lastTime] call _fnc_cooling;
+_temperature = [_temperature, _barrelMass, CBA_missionTime - _lastTime] call _fnc_cooling;
 TRACE_1("cooledTo",_temperature);
 // Calculate heating
 // Steel Heat Capacity = 466 J/(Kg.K)
@@ -81,6 +81,6 @@ _temperature = _temperature + _heatIncrement / (_barrelMass * 466);
 // Publish the temperature variable
 [_unit, _tempVarName, _temperature, TEMP_TOLERANCE] call EFUNC(common,setApproximateVariablePublic);
 // Store the update time locally
-_unit setVariable [_timeVarName, ACE_time];
+_unit setVariable [_timeVarName, CBA_missionTime];
 
 _temperature

addons/parachute/functions/fnc_doLanding.sqf

@@ -20,8 +20,8 @@ GVAR(PFH) = false;
 [_unit, "AmovPercMevaSrasWrflDf_AmovPknlMstpSrasWrflDnon", 2] call EFUNC(common,doAnimation);
 _unit setVariable [QGVAR(chuteIsCut), false, true];
 [{
-    if (ACE_time >= ((_this select 0) select 0) + 1) then {
+    if (CBA_missionTime >= ((_this select 0) select 0) + 1) then {
         ((_this select 0) select 1) playActionNow "Crouch";
         [(_this select 1)] call CALLSTACK(CBA_fnc_removePerFrameHandler);
     };
-}, 1, [ACE_time,_unit]] call CALLSTACK(CBA_fnc_addPerFrameHandler);
+}, 1, [CBA_missionTime,_unit]] call CALLSTACK(CBA_fnc_addPerFrameHandler);

addons/parachute/functions/fnc_showAltimeter.sqf

@@ -37,7 +37,7 @@ GVAR(AltimeterActive) = true;
     _minute = floor ((daytime - _hour) * 60);
 
     _height = ((getPosASL _unit) select 2) + EGVAR(common,mapAltitude);
-    _curTime = ACE_time;
+    _curTime = CBA_missionTime;
     _timeDiff = _curTime - _prevTime;
     _descentRate = if(_timeDiff > 0) then {floor((_oldHeight - _height) / _timeDiff)} else {0};
 
@@ -47,4 +47,4 @@ GVAR(AltimeterActive) = true;
 
     (_this select 0) set [2, _height];
     (_this select 0) set [3, _curTime];
-}, 0.2, [uiNamespace getVariable ["ACE_Altimeter", displayNull], _unit,floor ((getPosASL _unit) select 2), ACE_time]] call CALLSTACK(CBA_fnc_addPerFrameHandler);
+}, 0.2, [uiNamespace getVariable ["ACE_Altimeter", displayNull], _unit,floor ((getPosASL _unit) select 2), CBA_missionTime]] call CALLSTACK(CBA_fnc_addPerFrameHandler);

addons/scopes/functions/fnc_showZeroing.sqf

@@ -45,13 +45,13 @@ _vertical ctrlSetText (str _elevation);
 _horizontal ctrlSetText (str _windage);
 
 // Set the time when to hide the knobs
-GVAR(timeToHide) = ACE_diagTime + 3.0;
+GVAR(timeToHide) = diag_tickTime + 3.0;
 
 if !(isNil QGVAR(fadePFH)) exitWith {};
 
 // Launch a PFH to wait and fade out the knobs
 GVAR(fadePFH) = [{
-    if (ACE_diagTime >= GVAR(timeToHide)) exitWith {
+    if (diag_tickTime >= GVAR(timeToHide)) exitWith {
         private "_layer";
         params ["", "_pfhId"];
         _layer = [QGVAR(Zeroing)] call BIS_fnc_rscLayer;

addons/tacticalladder/XEH_postInit.sqf

@@ -8,7 +8,7 @@ GVAR(currentStep) = 3;
 GVAR(currentAngle) = 0;
 
 /*["interactMenuOpened", {
-    if ((ACE_time > GVAR(cancelTime)) && !isNull GVAR(ladder)) then {
+    if ((CBA_missionTime > GVAR(cancelTime)) && !isNull GVAR(ladder)) then {
         GVAR(ladder) call FUNC(cancelTLdeploy);
     };
 }] call EFUNC(common,addEventHandler);*/

addons/tacticalladder/functions/fnc_positionTL.sqf

@@ -37,7 +37,7 @@ _ladder animate ["rotate", 0];
 } count ["extract_1", "extract_2", "extract_3"]; // Extract ladder at head height (extract_3)
 
 GVAR(ladder) = _ladder;
-GVAR(cancelTime) = ACE_time + 1; // Workaround to prevent accidental canceling
+GVAR(cancelTime) = CBA_missionTime + 1; // Workaround to prevent accidental canceling
 GVAR(currentStep) = 3;
 GVAR(currentAngle) = 0;
 

addons/vector/functions/fnc_onKeyDown.sqf

@@ -40,19 +40,19 @@ switch (_this select 0) do {
 
         // handle input in option menu
         if (GVAR(currentMode) == "settings") exitWith {
-            if (ACE_diagTime < GVAR(keyDownTimeMenu) + 1) exitWith {};
+            if (diag_tickTime < GVAR(keyDownTimeMenu) + 1) exitWith {};
 
-            if (ACE_diagTime < GVAR(keyDownTimeAzimuth) + 0.5) then {
+            if (diag_tickTime < GVAR(keyDownTimeAzimuth) + 0.5) then {
                 GVAR(keyDownTabCountAzimuth) = (GETGVAR(keyDownTabCountAzimuth,0)) + 1;
             } else {
                 GVAR(keyDownTabCountAzimuth) = 1;
             };
 
-            GVAR(keyDownTimeAzimuth) = ACE_diagTime;
+            GVAR(keyDownTimeAzimuth) = diag_tickTime;
         };
 
         if (GVAR(currentMode) == "config") exitWith {
-            if (ACE_diagTime < GVAR(keyDownTimeMenu) + 0.5) exitWith {};
+            if (diag_tickTime < GVAR(keyDownTimeMenu) + 0.5) exitWith {};
 
             ["config"] call FUNC(nextMode);
         };
@@ -66,30 +66,30 @@ switch (_this select 0) do {
         [false] call FUNC(showP1);
 
         // handle 5 times clicking
-        if (ACE_diagTime < GVAR(keyDownTimeAzimuth) + 0.5) then {
+        if (diag_tickTime < GVAR(keyDownTimeAzimuth) + 0.5) then {
             GVAR(keyDownTabCountAzimuth) = (GETGVAR(keyDownTabCountAzimuth,0)) + 1;
-            GVAR(keyDownTimeAzimuth) = ACE_diagTime;
+            GVAR(keyDownTimeAzimuth) = diag_tickTime;
         } else {
             GVAR(keyDownTabCountAzimuth) = 1;
         };
 
         // open settings menu
         if (GVAR(keyDownTabCountAzimuth) == 5) exitWith {
-            GVAR(keyDownTimeMenu) = ACE_diagTime;
+            GVAR(keyDownTimeMenu) = diag_tickTime;
-            GVAR(keyDownTimeAzimuth) = ACE_diagTime;
+            GVAR(keyDownTimeAzimuth) = diag_tickTime;
             GVAR(keyDownTabCountAzimuth) = 0;
             GVAR(configTemp) = [GVAR(useFeet), GVAR(useMil)];
             ["settings"] call FUNC(showText);
             "settings" call _fnc_setPFH;
         };
 
-        if (ACE_diagTime < GVAR(keyDownTimeAzimuth) + 0.5) exitWith {
+        if (diag_tickTime < GVAR(keyDownTimeAzimuth) + 0.5) exitWith {
             "azimuth+inclination" call _fnc_setPFH;
         };
 
-        GVAR(keyDownTimeAzimuth) = ACE_diagTime;
+        GVAR(keyDownTimeAzimuth) = diag_tickTime;
 
-        if (ACE_diagTime > GVAR(keyDownTimeDistance) + 0.5) then {
+        if (diag_tickTime > GVAR(keyDownTimeDistance) + 0.5) then {
             if !(GETGVAR(isKeyDownDistance,false)) then {
                 ["distance"] call FUNC(clearDisplay);
                 "azimuth" call _fnc_setPFH;
@@ -110,19 +110,19 @@ switch (_this select 0) do {
 
         // handle input in option menu
         if (GVAR(currentMode) == "config") exitWith {
-            if (ACE_diagTime < GVAR(keyDownTimeMenu) + 0.5) exitWith {};
+            if (diag_tickTime < GVAR(keyDownTimeMenu) + 0.5) exitWith {};
 
-            if (ACE_diagTime < GVAR(keyDownTimeDistance) + 0.5) then {
+            if (diag_tickTime < GVAR(keyDownTimeDistance) + 0.5) then {
                 GVAR(keyDownTabCountDistance) = (GETGVAR(keyDownTabCountDistance,0)) + 1;
             } else {
                 GVAR(keyDownTabCountDistance) = 1;
             };
 
-            GVAR(keyDownTimeDistance) = ACE_diagTime;
+            GVAR(keyDownTimeDistance) = diag_tickTime;
         };
 
         if (GVAR(currentMode) == "settings") exitWith {
-            if (ACE_diagTime < GVAR(keyDownTimeMenu) + 0.5) exitWith {};
+            if (diag_tickTime < GVAR(keyDownTimeMenu) + 0.5) exitWith {};
 
             ["settings"] call FUNC(nextMode);
         };
@@ -141,30 +141,30 @@ switch (_this select 0) do {
         [false] call FUNC(showP1);
 
         // handle 5 times clicking
-        if (ACE_diagTime < GVAR(keyDownTimeDistance) + 0.5) then {
+        if (diag_tickTime < GVAR(keyDownTimeDistance) + 0.5) then {
             GVAR(keyDownTabCountDistance) = (GETGVAR(keyDownTabCountDistance,0)) + 1;
-            GVAR(keyDownTimeDistance) = ACE_diagTime;
+            GVAR(keyDownTimeDistance) = diag_tickTime;
         } else {
             GVAR(keyDownTabCountDistance) = 1;
         };
 
         // open config menu
         if (GVAR(keyDownTabCountDistance) == 5) exitWith {
-            GVAR(keyDownTimeMenu) = ACE_diagTime;
+            GVAR(keyDownTimeMenu) = diag_tickTime;
-            GVAR(keyDownTimeDistance) = ACE_diagTime;
+            GVAR(keyDownTimeDistance) = diag_tickTime;
             GVAR(keyDownTabCountDistance) = 0;
             GVAR(configTemp) = GVAR(modeReticle);
             ["config"] call FUNC(showText);
             "config" call _fnc_setPFH;
         };
 
-        if (ACE_diagTime < GVAR(keyDownTimeDistance) + 0.5) exitWith {
+        if (diag_tickTime < GVAR(keyDownTimeDistance) + 0.5) exitWith {
             "height+distance" call _fnc_setPFH;
         };
 
-        GVAR(keyDownTimeDistance) = ACE_diagTime;
+        GVAR(keyDownTimeDistance) = diag_tickTime;
 
-        if (ACE_diagTime > GVAR(keyDownTimeAzimuth) + 0.5) then {
+        if (diag_tickTime > GVAR(keyDownTimeAzimuth) + 0.5) then {
             if !(GETGVAR(isKeyDownAzimuth,false)) then {
                 ["azimuth"] call FUNC(clearDisplay);
                 "distance" call _fnc_setPFH;

addons/vector/functions/fnc_onKeyHold.sqf

@@ -21,7 +21,7 @@ switch (_this select 0) do {
     case ("azimuth"): {
 
         private "_isReady";
-        _isReady = ACE_diagTime > GVAR(keyDownTimeAzimuth) + 0.2;
+        _isReady = diag_tickTime > GVAR(keyDownTimeAzimuth) + 0.2;
 
         [false] call FUNC(showCenter);
 
@@ -42,7 +42,7 @@ switch (_this select 0) do {
     case ("distance"): {
 
         private "_isReady";
-        _isReady = ACE_diagTime > GVAR(keyDownTimeDistance) + 0.5;
+        _isReady = diag_tickTime > GVAR(keyDownTimeDistance) + 0.5;
 
         [_isReady] call FUNC(showCenter);
 
@@ -66,7 +66,7 @@ switch (_this select 0) do {
         call FUNC(showAzimuth);
 
         private "_isReady";
-        _isReady = ACE_diagTime > GVAR(keyDownTimeDistance) + 0.5;
+        _isReady = diag_tickTime > GVAR(keyDownTimeDistance) + 0.5;
 
         [_isReady] call FUNC(showCenter);
 
@@ -89,7 +89,7 @@ switch (_this select 0) do {
     case ("azimuth+inclination"): {
 
         private "_isReady";
-        _isReady = ACE_diagTime > GVAR(keyDownTimeAzimuth) + 0.2;
+        _isReady = diag_tickTime > GVAR(keyDownTimeAzimuth) + 0.2;
 
         [false] call FUNC(showCenter);
 
@@ -110,7 +110,7 @@ switch (_this select 0) do {
     case ("height+distance"): {
 
         private "_isReady";
-        _isReady = ACE_diagTime > GVAR(keyDownTimeDistance) + 0.5;
+        _isReady = diag_tickTime > GVAR(keyDownTimeDistance) + 0.5;
 
         [_isReady] call FUNC(showCenter);
 
@@ -132,7 +132,7 @@ switch (_this select 0) do {
     case ("relative_distance"): {
 
         private "_isReady";
-        _isReady = ACE_diagTime > GVAR(keyDownTimeAzimuth) + 0.5;
+        _isReady = diag_tickTime > GVAR(keyDownTimeAzimuth) + 0.5;
 
         [_isReady] call FUNC(showCenter);
 
@@ -155,7 +155,7 @@ switch (_this select 0) do {
     case ("relative_height+length"): {
 
         private "_isReady";
-        _isReady = ACE_diagTime > GVAR(keyDownTimeAzimuth) + 0.5;
+        _isReady = diag_tickTime > GVAR(keyDownTimeAzimuth) + 0.5;
 
         [_isReady] call FUNC(showCenter);
 
@@ -178,7 +178,7 @@ switch (_this select 0) do {
     case ("relative_azimuth+distance"): {
 
         private "_isReady";
-        _isReady = ACE_diagTime > GVAR(keyDownTimeDistance) + 0.5;
+        _isReady = diag_tickTime > GVAR(keyDownTimeDistance) + 0.5;
 
         [_isReady] call FUNC(showCenter);
 
@@ -201,7 +201,7 @@ switch (_this select 0) do {
     case ("fall_of_shot"): {
 
         private "_isReady";
-        _isReady = ACE_diagTime > GVAR(keyDownTimeDistance) + 0.5;
+        _isReady = diag_tickTime > GVAR(keyDownTimeDistance) + 0.5;
 
         [_isReady] call FUNC(showCenter);
 
@@ -223,8 +223,8 @@ switch (_this select 0) do {
     };
 
     case ("settings"): {
-        if (ACE_diagTime < GVAR(keyDownTimeMenu) + 1) exitWith {
+        if (diag_tickTime < GVAR(keyDownTimeMenu) + 1) exitWith {
-            GVAR(keyDownTimeAzimuth) = ACE_diagTime;
+            GVAR(keyDownTimeAzimuth) = diag_tickTime;
         };
 
         [["meter", "feet"] select (GVAR(configTemp) select 0)] call FUNC(showText);
@@ -247,7 +247,7 @@ switch (_this select 0) do {
             };
         };
 
-        if (GVAR(keyDownTabCountAzimuth) > 0 && {ACE_diagTime > GVAR(keyDownTimeAzimuth) + 0.5}) exitWith {
+        if (GVAR(keyDownTabCountAzimuth) > 0 && {diag_tickTime > GVAR(keyDownTimeAzimuth) + 0.5}) exitWith {
 
             ["clear_left"] call FUNC(showText);
             ["clear_right"] call FUNC(showText);
@@ -264,8 +264,8 @@ switch (_this select 0) do {
     };
 
     case ("config"): {
-        if (ACE_diagTime < GVAR(keyDownTimeMenu) + 1) exitWith {
+        if (diag_tickTime < GVAR(keyDownTimeMenu) + 1) exitWith {
-            GVAR(keyDownTimeDistance) = ACE_diagTime;
+            GVAR(keyDownTimeDistance) = diag_tickTime;
         };
 
         switch (GVAR(configTemp)) do {
@@ -315,7 +315,7 @@ switch (_this select 0) do {
             };
         };
 
-        if (GVAR(keyDownTabCountDistance) > 0 && {ACE_diagTime > GVAR(keyDownTimeDistance) + 0.5}) exitWith {
+        if (GVAR(keyDownTabCountDistance) > 0 && {diag_tickTime > GVAR(keyDownTimeDistance) + 0.5}) exitWith {
 
             ["clear_left"] call FUNC(showText);
             ["clear_right"] call FUNC(showText);

addons/vehicles/functions/fnc_startEngine.sqf

@@ -24,9 +24,9 @@ if (!_isEngineOn || {floor abs speed _vehicle > 0}) exitWith {};
     params ["_args", "_idPFH"];
     _args params ["_vehicle", "_time", "_direction"];
 
-    if (ACE_time > _time) exitWith { [_idPFH] call CBA_fnc_removePerFrameHandler; };
+    if (CBA_missionTime > _time) exitWith { [_idPFH] call CBA_fnc_removePerFrameHandler; };
 
     _vehicle setVelocity [0, 0, 0];
     _vehicle setVectorDirAndUp _direction;
 
-} , 0, [_vehicle, ACE_time + STARTUP_DELAY, [vectorDir _vehicle, vectorUp _vehicle]]] call CBA_fnc_addPerFrameHandler;
+} , 0, [_vehicle, CBA_missionTime + STARTUP_DELAY, [vectorDir _vehicle, vectorUp _vehicle]]] call CBA_fnc_addPerFrameHandler;

addons/weather/XEH_postInit.sqf

@@ -5,13 +5,13 @@ GVAR(temperatureShift) = 3 - random 6;
 GVAR(badWeatherShift) = (random 1) ^ 2 * 10;
 GVAR(humidityShift) = (5 - random 10) / 100;
 
-GVAR(wind_period_start_time) = ACE_time;
+GVAR(wind_period_start_time) = CBA_missionTime;
-GVAR(rain_period_start_time) = ACE_time;
+GVAR(rain_period_start_time) = CBA_missionTime;
 
 GVAR(ACE_rain) = rain;
 
-"ACE_WIND_PARAMS" addPublicVariableEventHandler { GVAR(wind_period_start_time) = ACE_time; };
+"ACE_WIND_PARAMS" addPublicVariableEventHandler { GVAR(wind_period_start_time) = CBA_missionTime; };
-"ACE_RAIN_PARAMS" addPublicVariableEventHandler { GVAR(rain_period_start_time) = ACE_time; };
+"ACE_RAIN_PARAMS" addPublicVariableEventHandler { GVAR(rain_period_start_time) = CBA_missionTime; };
 "ACE_MISC_PARAMS" addPublicVariableEventHandler {
     if (!isServer) then {
         TRACE_1("MISC PARAMS PVEH",ACE_MISC_PARAMS);
@@ -65,14 +65,14 @@ simulWeatherSync;
 
         [] call FUNC(updateWind); //Every 1 second
 
-        if (ACE_time >= GVAR(nextUpdateRain)) then {
+        if (CBA_missionTime >= GVAR(nextUpdateRain)) then {
             [] call FUNC(updateRain); //Every 2 seconds
-            GVAR(nextUpdateRain) = 2 + ACE_time;
+            GVAR(nextUpdateRain) = 2 + CBA_missionTime;
         };
-        if (ACE_time >= GVAR(nextUpdateTempAndHumidity)) then {
+        if (CBA_missionTime >= GVAR(nextUpdateTempAndHumidity)) then {
             [] call FUNC(updateTemperature); //Every 20 seconds
             [] call FUNC(updateHumidity); //Every 20 seconds
-            GVAR(nextUpdateTempAndHumidity) = 20 + ACE_time;
+            GVAR(nextUpdateTempAndHumidity) = 20 + CBA_missionTime;
         };
 
         END_COUNTER(weatherPFEH);