diff --git a/addons/advanced_ballistics/CfgVehicles.hpp b/addons/advanced_ballistics/CfgVehicles.hpp
index 27ccb2377b..804a6e9236 100644
--- a/addons/advanced_ballistics/CfgVehicles.hpp
+++ b/addons/advanced_ballistics/CfgVehicles.hpp
@@ -3,7 +3,7 @@ class CfgVehicles {
class GVAR(ModuleSettings): ACE_Module {
scope = 2;
displayName = CSTRING(DisplayName);
- icon = QUOTE(PATHTOF(UI\Icon_Module_Wind_ca.paa));
+ icon = QPATHTOF(UI\Icon_Module_Wind_ca.paa);
category = "ACE";
function = QUOTE(DFUNC(initModuleSettings));
functionPriority = 1;
diff --git a/addons/advanced_ballistics/XEH_postInit.sqf b/addons/advanced_ballistics/XEH_postInit.sqf
index 140820e400..96aef4a93d 100644
--- a/addons/advanced_ballistics/XEH_postInit.sqf
+++ b/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;
diff --git a/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf b/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
index 8ff21e60cc..62663c843b 100644
--- a/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
+++ b/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
@@ -43,13 +43,13 @@ GVAR(Protractor) = true;
__ctrl1 ctrlSetScale 1;
__ctrl1 ctrlCommit 0;
- __ctrl1 ctrlSetText QUOTE(PATHTOF(UI\protractor.paa));
+ __ctrl1 ctrlSetText QPATHTOF(UI\protractor.paa);
__ctrl1 ctrlSetTextColor [1, 1, 1, 1];
__ctrl2 ctrlSetScale 1;
__ctrl2 ctrlSetPosition [SafeZoneX + 0.001, SafeZoneY - 0.001 - 0.1074 * (-0.86 max ((ACE_player weaponDirection currentWeapon ACE_player) select 2) min 0.86), 0.2, 0.2 * 4/3];
__ctrl2 ctrlCommit 0;
- __ctrl2 ctrlSetText QUOTE(PATHTOF(UI\protractor_marker.paa));
+ __ctrl2 ctrlSetText QPATHTOF(UI\protractor_marker.paa);
__ctrl2 ctrlSetTextColor [1, 1, 1, 1];
}, 0.1, []] call CBA_fnc_addPerFrameHandler;
diff --git a/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf b/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
index fc8dc1b8a2..6bc6e234ae 100644
--- a/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
+++ b/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);
diff --git a/addons/advanced_ballistics/functions/fnc_handleFired.sqf b/addons/advanced_ballistics/functions/fnc_handleFired.sqf
index 7844e8a53a..7085224771 100644
--- a/addons/advanced_ballistics/functions/fnc_handleFired.sqf
+++ b/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;
-"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];
+_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, CBA_missionTime - _aceTimeSecond];
GVAR(allBullets) pushBack [_projectile, _caliber, _bulletTraceVisible, GVAR(currentbulletID)];
diff --git a/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf b/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf
index 25562a71d0..9fed872a6b 100644
--- a/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf
+++ b/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;
};
diff --git a/addons/aircraft/RscInGameUI.hpp b/addons/aircraft/RscInGameUI.hpp
index 620d895d9e..6411085b24 100644
--- a/addons/aircraft/RscInGameUI.hpp
+++ b/addons/aircraft/RscInGameUI.hpp
@@ -145,7 +145,7 @@ class RscInGameUI
sizeEx = "0.038*SafezoneH";
shadow = 0;
font = "EtelkaMonospacePro";
- text = PATHTOF(data\Helo_LaserON.paa);
+ text = QPATHTOF(data\Helo_LaserON.paa);
x = "20.45 * (0.01875 * SafezoneH)";
y = "14.1 * (0.025 * SafezoneH)";
w = "12.5 * (0.01875 * SafezoneH)";
@@ -335,7 +335,7 @@ class RscInGameUI
shadow = 0;
align = "right";
font = "EtelkaMonospacePro";
- text = PATHTOF(data\Helo_LaserON.paa);
+ text = QPATHTOF(data\Helo_LaserON.paa);
x = "20.45 * (0.01875 * SafezoneH)";
y = "14.1 * (0.025 * SafezoneH)";
w = "12.5 * (0.01875 * SafezoneH)";
diff --git a/addons/atragmx/CfgVehicles.hpp b/addons/atragmx/CfgVehicles.hpp
index cc4a7880fe..6e8a136a03 100644
--- a/addons/atragmx/CfgVehicles.hpp
+++ b/addons/atragmx/CfgVehicles.hpp
@@ -9,7 +9,7 @@ class CfgVehicles {
statement = QUOTE(call FUNC(create_dialog));
showDisabled = 0;
priority = 2;
- icon = PATHTOF(UI\ATRAG_Icon.paa);
+ icon = QPATHTOF(UI\ATRAG_Icon.paa);
exceptions[] = {"notOnMap", "isNotInside", "isNotSitting"};
};
};
diff --git a/addons/atragmx/CfgWeapons.hpp b/addons/atragmx/CfgWeapons.hpp
index 42d1e56ae2..af5e1a9955 100644
--- a/addons/atragmx/CfgWeapons.hpp
+++ b/addons/atragmx/CfgWeapons.hpp
@@ -8,8 +8,8 @@ class CfgWeapons {
scope = 2;
displayName = CSTRING(Name);
descriptionShort = CSTRING(Description);
- model = PATHTOF(data\tdsrecon.p3d);
- picture = PATHTOF(UI\ATRAG_Icon.paa);
+ model = QPATHTOF(data\tdsrecon.p3d);
+ picture = QPATHTOF(UI\ATRAG_Icon.paa);
icon = "iconObject_circle";
mapSize = 0.034;
diff --git a/addons/atragmx/functions/fnc_create_dialog.sqf b/addons/atragmx/functions/fnc_create_dialog.sqf
index 791374c9d0..a9912ccd34 100644
--- a/addons/atragmx/functions/fnc_create_dialog.sqf
+++ b/addons/atragmx/functions/fnc_create_dialog.sqf
@@ -56,7 +56,7 @@ GVAR(DialogPFH) = [{
if (!GVAR(active)) exitWith {
[_this select 1] call CBA_fnc_removePerFrameHandler;
};
- __ctrlBackground ctrlSetText format [QUOTE(PATHTOF(UI\ATRAG_%1.paa)), ["N", "D"] select (call EFUNC(common,ambientBrightness))];
+ __ctrlBackground ctrlSetText format [QPATHTOF(UI\ATRAG_%1.paa), ["N", "D"] select (call EFUNC(common,ambientBrightness))];
}, 60, []] call CBA_fnc_addPerFrameHandler;
true
diff --git a/addons/atragmx/functions/fnc_target_speed_assist_timer.sqf b/addons/atragmx/functions/fnc_target_speed_assist_timer.sqf
index 14a0a276cc..692de386af 100644
--- a/addons/atragmx/functions/fnc_target_speed_assist_timer.sqf
+++ b/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;
};
diff --git a/addons/atragmx/initKeybinds.sqf b/addons/atragmx/initKeybinds.sqf
index 51d2338292..94704e8132 100644
--- a/addons/atragmx/initKeybinds.sqf
+++ b/addons/atragmx/initKeybinds.sqf
@@ -33,4 +33,4 @@ _closeCode = {
closeDialog 0;
};
};
-[(localize LSTRING(Name)), QUOTE(PATHTOF(UI\ATRAG_Icon.paa)), _conditonCode, _toggleCode, _closeCode] call EFUNC(common,deviceKeyRegisterNew);
+[(localize LSTRING(Name)), QPATHTOF(UI\ATRAG_Icon.paa), _conditonCode, _toggleCode, _closeCode] call EFUNC(common,deviceKeyRegisterNew);
diff --git a/addons/attach/CfgMagazines.hpp b/addons/attach/CfgMagazines.hpp
index f85cac82b4..7ba8cebbc5 100644
--- a/addons/attach/CfgMagazines.hpp
+++ b/addons/attach/CfgMagazines.hpp
@@ -3,17 +3,17 @@ class CfgMagazines {
class CA_Magazine;
class B_IR_Grenade: CA_Magazine {
ACE_Attachable = "B_IRStrobe";
- model = QUOTE(PATHTOF(data\ace_IRStrobe.p3d));
+ model = QPATHTOF(data\ace_IRStrobe.p3d);
};
class O_IR_Grenade: B_IR_Grenade {
ACE_Attachable = "O_IRStrobe";
- model = QUOTE(PATHTOF(data\ace_IRStrobe.p3d));
+ model = QPATHTOF(data\ace_IRStrobe.p3d);
};
class I_IR_Grenade: B_IR_Grenade {
ACE_Attachable = "I_IRStrobe";
- model = QUOTE(PATHTOF(data\ace_IRStrobe.p3d));
+ model = QPATHTOF(data\ace_IRStrobe.p3d);
};
class SmokeShell;
diff --git a/addons/attach/CfgVehicles.hpp b/addons/attach/CfgVehicles.hpp
index e462c0cefa..1e0c0f3e71 100644
--- a/addons/attach/CfgVehicles.hpp
+++ b/addons/attach/CfgVehicles.hpp
@@ -9,7 +9,7 @@
exceptions[] = {}; \
showDisabled = 0; \
priority = 0; \
- icon = PATHTOF(UI\attach_ca.paa); \
+ icon = QPATHTOF(UI\attach_ca.paa); \
distance = 4.5; \
}; \
class GVAR(DetachVehicle) { \
@@ -19,7 +19,7 @@
exceptions[] = {}; \
showDisabled = 0; \
priority = 0.1; \
- icon = PATHTOF(UI\detach_ca.paa); \
+ icon = QPATHTOF(UI\detach_ca.paa); \
distance = 4.5; \
}; \
}; \
@@ -60,7 +60,7 @@ class CfgVehicles {
exceptions[] = {"isNotDragging"};
showDisabled = 0;
priority = 5;
- icon = PATHTOF(UI\attach_ca.paa);
+ icon = QPATHTOF(UI\attach_ca.paa);
};
class GVAR(Detach) {
displayName = CSTRING(Detach);
@@ -69,7 +69,7 @@ class CfgVehicles {
exceptions[] = {"isNotDragging"};
showDisabled = 0;
priority = 5;
- icon = PATHTOF(UI\detach_ca.paa);
+ icon = QPATHTOF(UI\detach_ca.paa);
};
};
};
diff --git a/addons/attach/CfgWeapons.hpp b/addons/attach/CfgWeapons.hpp
index dfea64678d..cc50b3be5e 100644
--- a/addons/attach/CfgWeapons.hpp
+++ b/addons/attach/CfgWeapons.hpp
@@ -8,8 +8,8 @@ class CfgWeapons {
scope = 2;
displayName = CSTRING(IrStrobe_Name);
descriptionShort = CSTRING(IrStrobe_Description);
- model = QUOTE(PATHTOF(data\ace_IRStrobe.p3d));
- picture = PATHTOF(UI\irstrobe_item.paa);
+ model = QPATHTOF(data\ace_IRStrobe.p3d);
+ picture = QPATHTOF(UI\irstrobe_item.paa);
class ItemInfo: InventoryItem_Base_F {
mass = 1;
diff --git a/addons/attach/functions/fnc_attach.sqf b/addons/attach/functions/fnc_attach.sqf
index 305c3c0960..42bfe44dbc 100644
--- a/addons/attach/functions/fnc_attach.sqf
+++ b/addons/attach/functions/fnc_attach.sqf
@@ -51,7 +51,7 @@ if (_unit == _attachToVehicle) then { //Self Attachment
[_unit, "forceWalk", "ACE_Attach", true] call EFUNC(common,statusEffect_set);
- [{[localize LSTRING(PlaceAction), ""] call EFUNC(interaction,showMouseHint)}, []] call EFUNC(common,execNextFrame);
+ [{[localize LSTRING(PlaceAction), ""] call EFUNC(interaction,showMouseHint)}, []] call CBA_fnc_execNextFrame;
_unit setVariable [QGVAR(placeActionEH), [_unit, "DefaultAction", {true}, {GVAR(placeAction) = PLACE_APPROVE;}] call EFUNC(common,AddActionEventHandler)];
_actionID = _unit addAction [format ["%1", localize LSTRING(CancelAction)], {GVAR(placeAction) = PLACE_CANCEL}];
diff --git a/addons/attach/functions/fnc_detach.sqf b/addons/attach/functions/fnc_detach.sqf
index 05c625b374..0cf5c78082 100644
--- a/addons/attach/functions/fnc_detach.sqf
+++ b/addons/attach/functions/fnc_detach.sqf
@@ -57,7 +57,7 @@ if (toLower _itemName in ["b_ir_grenade", "o_ir_grenade", "i_ir_grenade"]) then
detach _attachedObject;
_attachedObject setPos ((getPos _unit) vectorAdd [0, 0, -1000]);
// Delete attached item after 0.5 seconds
- [{deleteVehicle (_this select 0)}, [_attachedObject], 2] call EFUNC(common,waitAndExecute);
+ [{deleteVehicle (_this select 0)}, [_attachedObject], 2] call CBA_fnc_waitAndExecute;
} else {
// Delete attached item
deleteVehicle _attachedObject;
diff --git a/addons/attach/functions/fnc_getChildrenAttachActions.sqf b/addons/attach/functions/fnc_getChildrenAttachActions.sqf
index aeb75c00d4..9f811197e0 100644
--- a/addons/attach/functions/fnc_getChildrenAttachActions.sqf
+++ b/addons/attach/functions/fnc_getChildrenAttachActions.sqf
@@ -31,7 +31,7 @@ _actions = [];
if (getText (_item >> "ACE_Attachable") != "") then {
_displayName = getText(_item >> "displayName");
_picture = getText(_item >> "picture");
- _action = [_x, _displayName, _picture, {[{_this call FUNC(attach)}, _this] call EFUNC(common,execNextFrame)}, {_this call FUNC(canAttach)}, {}, [_x]] call EFUNC(interact_menu,createAction);
+ _action = [_x, _displayName, _picture, {[{_this call FUNC(attach)}, _this] call CBA_fnc_execNextFrame}, {_this call FUNC(canAttach)}, {}, [_x]] call EFUNC(interact_menu,createAction);
_actions pushBack [_action, [], _target];
};
};
@@ -44,7 +44,7 @@ _actions = [];
if (getText (_item >> "ACE_Attachable") != "") then {
_displayName = getText(_item >> "displayName");
_picture = getText(_item >> "picture");
- _action = [_x, _displayName, _picture, {[{_this call FUNC(attach)}, _this] call EFUNC(common,execNextFrame)}, {_this call FUNC(canAttach)}, {}, [_x]] call EFUNC(interact_menu,createAction);
+ _action = [_x, _displayName, _picture, {[{_this call FUNC(attach)}, _this] call CBA_fnc_execNextFrame}, {_this call FUNC(canAttach)}, {}, [_x]] call EFUNC(interact_menu,createAction);
_actions pushBack [_action, [], _target];
};
};
diff --git a/addons/attach/functions/fnc_handleGetIn.sqf b/addons/attach/functions/fnc_handleGetIn.sqf
index d9f469eee2..dd173c4125 100644
--- a/addons/attach/functions/fnc_handleGetIn.sqf
+++ b/addons/attach/functions/fnc_handleGetIn.sqf
@@ -36,7 +36,7 @@ if (!isNull _xObject) then {
params ["_detachedLight"];
TRACE_1("delayed delete",_detachedLight);
deleteVehicle _detachedLight;
- }, [_xObject], 2] call EFUNC(common,waitAndExecute);
+ }, [_xObject], 2] call CBA_fnc_waitAndExecute;
(_attachedList select 0) set [0, objNull];
};
diff --git a/addons/attach/functions/fnc_handleKilled.sqf b/addons/attach/functions/fnc_handleKilled.sqf
index 06c5473c88..69ab31122b 100644
--- a/addons/attach/functions/fnc_handleKilled.sqf
+++ b/addons/attach/functions/fnc_handleKilled.sqf
@@ -32,7 +32,7 @@ if ((count _attachedList) == 0) exitWith {};
//If it's a vehicle, also delete the attached
if (!(_deadUnit isKindOf "CAManBase")) then {
_xObject setPos ((getPos _deadUnit) vectorAdd [0, 0, -1000]);
- [{deleteVehicle (_this select 0)}, [_xObject], 2] call EFUNC(common,waitAndExecute);
+ [{deleteVehicle (_this select 0)}, [_xObject], 2] call CBA_fnc_waitAndExecute;
};
} forEach _attachedList;
diff --git a/addons/ballistics/scripts/initTargetWall.sqf b/addons/ballistics/scripts/initTargetWall.sqf
index d9b16eec10..0ce3950de1 100644
--- a/addons/ballistics/scripts/initTargetWall.sqf
+++ b/addons/ballistics/scripts/initTargetWall.sqf
@@ -11,5 +11,5 @@ if (local _wall) then {
_paper attachTo [_wall, [0,-0.02,0.6]];
_paper setDir getDir _wall;
- _paper setObjectTextureGlobal [0, QUOTE(PATHTOF(textures\target_ca.paa))];
+ _paper setObjectTextureGlobal [0, QPATHTOF(textures\target_ca.paa)];
};
diff --git a/addons/captives/CfgVehicles.hpp b/addons/captives/CfgVehicles.hpp
index a8215c0cdc..2afa1cfea4 100644
--- a/addons/captives/CfgVehicles.hpp
+++ b/addons/captives/CfgVehicles.hpp
@@ -10,7 +10,7 @@ class CfgVehicles {
condition = QUOTE([ARR_2(_player, _target)] call FUNC(canApplyHandcuffs));
statement = QUOTE([ARR_2(_player, _target)] call FUNC(doApplyHandcuffs));
exceptions[] = {};
- icon = QUOTE(PATHTOF(UI\handcuff_ca.paa));
+ icon = QPATHTOF(UI\handcuff_ca.paa);
};
class ACE_MainActions {
@@ -21,7 +21,7 @@ class CfgVehicles {
condition = QUOTE([ARR_2(_player, _target)] call FUNC(canRemoveHandcuffs));
statement = QUOTE([ARR_2(_player, _target)] call FUNC(doRemoveHandcuffs));
exceptions[] = {};
- icon = QUOTE(PATHTOF(UI\handcuff_ca.paa));
+ icon = QPATHTOF(UI\handcuff_ca.paa);
};
class ACE_EscortCaptive {
displayName = CSTRING(EscortCaptive);
@@ -30,7 +30,7 @@ class CfgVehicles {
statement = QUOTE([ARR_3(_player, _target, true)] call FUNC(doEscortCaptive));
exceptions[] = {};
showDisabled = 0;
- icon = QUOTE(PATHTOF(UI\captive_ca.paa));
+ icon = QPATHTOF(UI\captive_ca.paa);
priority = 2.3;
};
class ACE_StopEscorting {
@@ -40,7 +40,7 @@ class CfgVehicles {
statement = QUOTE([ARR_3(_player,_target, false)] call FUNC(doEscortCaptive));
exceptions[] = {"isNotEscorting"};
showDisabled = 0;
- icon = QUOTE(PATHTOF(UI\captive_ca.paa));
+ icon = QPATHTOF(UI\captive_ca.paa);
priority = 2.3;
};
class ACE_LoadCaptive {
@@ -50,7 +50,7 @@ class CfgVehicles {
statement = QUOTE([ARR_3(_player, _target, objNull)] call FUNC(doLoadCaptive));
exceptions[] = {"isNotEscorting"};
showDisabled = 0;
- icon = QUOTE(PATHTOF(UI\captive_ca.paa));
+ icon = QPATHTOF(UI\captive_ca.paa);
priority = 2.2;
};
class GVAR(UnloadCaptive) {
@@ -79,7 +79,7 @@ class CfgVehicles {
exceptions[] = {};
showDisabled = 0;
priority = 0;
- icon = QUOTE(PATHTOF(UI\Surrender_ca.paa));
+ icon = QPATHTOF(UI\Surrender_ca.paa);
};
class ACE_StopSurrenderingSelf {
displayName = CSTRING(StopSurrendering);
@@ -88,7 +88,7 @@ class CfgVehicles {
exceptions[] = {"isNotSurrendering"};
showDisabled = 0;
priority = 0;
- icon = QUOTE(PATHTOF(UI\Surrender_ca.paa));
+ icon = QPATHTOF(UI\Surrender_ca.paa);
};
};
};
@@ -154,7 +154,7 @@ class CfgVehicles {
scope = 2; //show in editor
isGlobal = 0; //run on server
isTriggerActivated = 1; //Wait for triggers
- icon = QUOTE(PATHTOF(UI\Icon_Module_Make_Unit_Surrender_ca.paa));
+ icon = QPATHTOF(UI\Icon_Module_Make_Unit_Surrender_ca.paa);
functionPriority = 0;
class Arguments {};
class ModuleDescription: ModuleDescription {
@@ -170,7 +170,7 @@ class CfgVehicles {
scope = 2; //show in editor
isGlobal = 0; //run on server
isTriggerActivated = 1; //Wait for triggers
- icon = QUOTE(PATHTOF(UI\Icon_Module_Make_Unit_Handcuffed_ca.paa));
+ icon = QPATHTOF(UI\Icon_Module_Make_Unit_Handcuffed_ca.paa);
functionPriority = 0;
class Arguments {};
class ModuleDescription: ModuleDescription {
@@ -186,7 +186,7 @@ class CfgVehicles {
displayName = CSTRING(ModuleSettings_DisplayName);
function = QFUNC(moduleSettings);
scope = 2;
- icon = QUOTE(PATHTOF(UI\Icon_Module_settings_ca.paa));
+ icon = QPATHTOF(UI\Icon_Module_settings_ca.paa);
isGlobal = 1;
isSingular = 1;
class Arguments {
diff --git a/addons/captives/CfgWeapons.hpp b/addons/captives/CfgWeapons.hpp
index 7092962519..1b65a0a4bf 100644
--- a/addons/captives/CfgWeapons.hpp
+++ b/addons/captives/CfgWeapons.hpp
@@ -5,8 +5,8 @@ class CfgWeapons {
class ACE_CableTie: ACE_ItemCore {
displayName = CSTRING(CableTie);
descriptionShort = CSTRING(CableTieDescription);
- model = QUOTE(PATHTOF(models\ace_cabletie.p3d));
- picture = QUOTE(PATHTOF(UI\ace_cabletie_ca.paa));
+ model = QPATHTOF(models\ace_cabletie.p3d);
+ picture = QPATHTOF(UI\ace_cabletie_ca.paa);
scope = 2;
class ItemInfo: InventoryItem_Base_F {
mass = 1;
diff --git a/addons/captives/XEH_postInit.sqf b/addons/captives/XEH_postInit.sqf
index f8511b5789..8cbb93d059 100644
--- a/addons/captives/XEH_postInit.sqf
+++ b/addons/captives/XEH_postInit.sqf
@@ -4,7 +4,7 @@
// Hold on a little bit longer to ensure anims will work
[{
GVAR(captivityEnabled) = true;
- }, [], 0.05] call EFUNC(common,waitAndExecute);
+ }, [], 0.05] call CBA_fnc_waitAndExecute;
}] call CBA_fnc_addEventHandler;
//Handles when someone starts escorting and then disconnects, leaving the captive attached
diff --git a/addons/captives/functions/fnc_moduleHandcuffed.sqf b/addons/captives/functions/fnc_moduleHandcuffed.sqf
index c2cf0708d3..b2e0b431b3 100644
--- a/addons/captives/functions/fnc_moduleHandcuffed.sqf
+++ b/addons/captives/functions/fnc_moduleHandcuffed.sqf
@@ -32,7 +32,7 @@ if (!isServer) exitWith {};
TRACE_2("event",_x,local _x);
[QGVAR(setHandcuffed), [_x, true], [_x]] call CBA_fnc_targetEvent;
} forEach _units;
-}, [_units], 0.05] call EFUNC(common,waitAndExecute);
+}, [_units], 0.05] call CBA_fnc_waitAndExecute;
if (!isNull _logic) then {
deleteVehicle _logic;
diff --git a/addons/captives/functions/fnc_moduleSurrender.sqf b/addons/captives/functions/fnc_moduleSurrender.sqf
index 04d9027896..c4482ce904 100644
--- a/addons/captives/functions/fnc_moduleSurrender.sqf
+++ b/addons/captives/functions/fnc_moduleSurrender.sqf
@@ -32,7 +32,7 @@ if (!isServer) exitWith {};
TRACE_2("event",_x,local _x);
[QGVAR(setSurrendered), [_x, true], [_x]] call CBA_fnc_targetEvent;
} forEach _units;
-}, [_units], 0.05] call EFUNC(common,waitAndExecute);
+}, [_units], 0.05] call CBA_fnc_waitAndExecute;
if (!isNull _logic) then {
deleteVehicle _logic;
diff --git a/addons/captives/functions/fnc_setHandcuffed.sqf b/addons/captives/functions/fnc_setHandcuffed.sqf
index 5092fa94dc..4fbedaef87 100644
--- a/addons/captives/functions/fnc_setHandcuffed.sqf
+++ b/addons/captives/functions/fnc_setHandcuffed.sqf
@@ -27,7 +27,7 @@ if !(missionNamespace getVariable [QGVAR(captivityEnabled), false]) exitWith {
// It's to soon to call this function, delay it
if (EGVAR(common,settingsInitFinished)) then {
// Settings are already initialized, but the small wait isn't over
- [DFUNC(setHandCuffed), _this, 0.05] call EFUNC(common,waitAndExecute);
+ [DFUNC(setHandCuffed), _this, 0.05] call CBA_fnc_waitAndExecute;
} else {
// Settings are not initialized yet
[DFUNC(setHandCuffed), _this] call EFUNC(common,runAfterSettingsInit);
@@ -98,7 +98,7 @@ if (_state) then {
TRACE_2("Adding animChangedEH",_unit,_animChangedEHID);
_unit setVariable [QGVAR(handcuffAnimEHID), _animChangedEHID];
- }, [_unit], 0.01] call EFUNC(common,waitAndExecute);
+ }, [_unit], 0.01] call CBA_fnc_waitAndExecute;
} else {
_unit setVariable [QGVAR(isHandcuffed), false, true];
[_unit, "setCaptive", QGVAR(Handcuffed), false] call EFUNC(common,statusEffect_set);
diff --git a/addons/captives/functions/fnc_setSurrendered.sqf b/addons/captives/functions/fnc_setSurrendered.sqf
index e0b4cb8fb5..ba7468da0d 100644
--- a/addons/captives/functions/fnc_setSurrendered.sqf
+++ b/addons/captives/functions/fnc_setSurrendered.sqf
@@ -27,7 +27,7 @@ if !(missionNamespace getVariable [QGVAR(captivityEnabled), false]) exitWith {
// It's to soon to call this function, delay it
if (EGVAR(common,settingsInitFinished)) then {
// Settings are already initialized, but the small wait isn't over
- [DFUNC(setSurrendered), _this, 0.05] call EFUNC(common,waitAndExecute);
+ [DFUNC(setSurrendered), _this, 0.05] call CBA_fnc_waitAndExecute;
} else {
// Settings are not initialized yet
[DFUNC(setSurrendered), _this] call EFUNC(common,runAfterSettingsInit);
@@ -73,7 +73,7 @@ if (_state) then {
}];
_unit setVariable [QGVAR(surrenderAnimEHID), _animChangedEHID];
};
- }, [_unit], 0.01] call EFUNC(common,waitAndExecute);
+ }, [_unit], 0.01] call CBA_fnc_waitAndExecute;
} else {
_unit setVariable [QGVAR(isSurrendering), false, true];
[_unit, "setCaptive", QGVAR(Surrendered), false] call EFUNC(common,statusEffect_set);
@@ -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;
};
};
diff --git a/addons/cargo/CfgVehicles.hpp b/addons/cargo/CfgVehicles.hpp
index 3b2239019d..69c01b9e59 100644
--- a/addons/cargo/CfgVehicles.hpp
+++ b/addons/cargo/CfgVehicles.hpp
@@ -10,7 +10,7 @@ class CfgVehicles {
class ACE_moduleCargoSettings: ACE_Module {
scope = 2;
displayName = CSTRING(SettingsModule_DisplayName);
- icon = QUOTE(PATHTOF(UI\Icon_Module_Cargo_ca.paa));
+ icon = QPATHTOF(UI\Icon_Module_Cargo_ca.paa);
category = "ACE_Logistics";
function = QFUNC(moduleSettings);
functionPriority = 1;
@@ -36,7 +36,7 @@ class CfgVehicles {
class GVAR(makeLoadable): ACE_Module {
scope = 2;
displayName = CSTRING(makeLoadable_displayName);
- icon = QUOTE(PATHTOF(UI\Icon_Module_makeLoadable_ca.paa));
+ icon = QPATHTOF(UI\Icon_Module_makeLoadable_ca.paa);
category = "ACE_Logistics";
function = QFUNC(moduleMakeLoadable);
isGlobal = 1;
diff --git a/addons/cargo/functions/fnc_initObject.sqf b/addons/cargo/functions/fnc_initObject.sqf
index dc8db802e5..f740d0e371 100644
--- a/addons/cargo/functions/fnc_initObject.sqf
+++ b/addons/cargo/functions/fnc_initObject.sqf
@@ -39,7 +39,7 @@ private _statement = {
[_player, _target] call FUNC(startLoadIn);
};
private _text = localize LSTRING(loadObject);
-private _icon = QUOTE(PATHTOF(UI\Icon_load.paa));
+private _icon = QPATHTOF(UI\Icon_load.paa);
private _action = [QGVAR(load), _text, _icon, _statement, _condition] call EFUNC(interact_menu,createAction);
[_type, 0, ["ACE_MainActions"], _action] call EFUNC(interact_menu,addActionToClass);
diff --git a/addons/common/CfgEventHandlers.hpp b/addons/common/CfgEventHandlers.hpp
index 5d55e40f2d..beb07e35e7 100644
--- a/addons/common/CfgEventHandlers.hpp
+++ b/addons/common/CfgEventHandlers.hpp
@@ -33,7 +33,7 @@ class Extended_InitPost_EventHandlers {
};
class CAManBase {
class GVAR(setName) {
- init = QUOTE(if (local (_this select 0)) then {[ARR_2(FUNC(setName),_this)] call FUNC(execNextFrame)};);
+ init = QUOTE(if (local (_this select 0)) then {[ARR_2(FUNC(setName),_this)] call CBA_fnc_execNextFrame};);
};
class GVAR(muteUnit) {
init = QUOTE(_this call FUNC(muteUnitHandleInitPost));
diff --git a/addons/common/CfgUnitInsignia.hpp b/addons/common/CfgUnitInsignia.hpp
index c1cd541e9c..337baa4235 100644
--- a/addons/common/CfgUnitInsignia.hpp
+++ b/addons/common/CfgUnitInsignia.hpp
@@ -3,13 +3,13 @@ class CfgUnitInsignia {
class ACE_insignia_logo {
displayName = "ACE3";
author = CSTRING(ACETeam);
- texture = PATHTOF(data\Insignia_ace3logo_ca.paa);
+ texture = QPATHTOF(data\Insignia_ace3logo_ca.paa);
textureVehicle = "";
};
class ACE_insignia_banana {
displayName = "ABE3";
author = CSTRING(ACETeam);
- texture = PATHTOF(data\insignia_banana_ca.paa);
+ texture = QPATHTOF(data\insignia_banana_ca.paa);
textureVehicle = "";
};
};
diff --git a/addons/common/CfgVehicles.hpp b/addons/common/CfgVehicles.hpp
index de1f7f7cf4..1e958027be 100644
--- a/addons/common/CfgVehicles.hpp
+++ b/addons/common/CfgVehicles.hpp
@@ -36,7 +36,7 @@ class CfgVehicles {
scope = 2;
isGlobal = 1;
isSingular = 1;
- icon = QUOTE(PATHTOF(UI\Icon_Module_CheckPBO_ca.paa));
+ icon = QPATHTOF(UI\Icon_Module_CheckPBO_ca.paa);
class Arguments {
class Action {
displayName = CSTRING(CheckPBO_Action_DisplayName);
@@ -82,7 +82,7 @@ class CfgVehicles {
displayName = CSTRING(LSDVehicles_DisplayName);
function = "ACE_Common_fnc_moduleLSDVehicles";
scope = 2;
- icon = QUOTE(PATHTOF(UI\Icon_Module_LSD_ca.paa));
+ icon = QPATHTOF(UI\Icon_Module_LSD_ca.paa);
isGlobal = 1;
class Arguments {};
class ModuleDescription: ModuleDescription {
@@ -132,7 +132,7 @@ class CfgVehicles {
class ACE_Headbug_Fix: Bicycle {
scope = 1;
side = 3;
- model = PATHTOF(data\ACE_HeadBanger.p3d);
+ model = QPATHTOF(data\ACE_HeadBanger.p3d);
//model = QPATHTO_M(ACE_HeadBanger.p3d);
author = CSTRING(ACETeam);
displayName = " ";
diff --git a/addons/common/CfgWeapons.hpp b/addons/common/CfgWeapons.hpp
index 22075e2903..488d4210c4 100644
--- a/addons/common/CfgWeapons.hpp
+++ b/addons/common/CfgWeapons.hpp
@@ -34,8 +34,8 @@ class CfgWeapons {
scope = 2;
displayName = CSTRING(bananaDisplayName);
descriptionShort = CSTRING(bananaDescr);
- model = PATHTOF(data\banana.p3d);
- picture = PATHTOF(data\icon_banana_ca.paa);
+ model = QPATHTOF(data\banana.p3d);
+ picture = QPATHTOF(data\icon_banana_ca.paa);
icon = "iconObject_circle";
mapSize = 0.034;
class ItemInfo: InventoryItem_Base_F {
diff --git a/addons/common/XEH_PREP.hpp b/addons/common/XEH_PREP.hpp
index 971d6cc722..0af9fa0ab9 100644
--- a/addons/common/XEH_PREP.hpp
+++ b/addons/common/XEH_PREP.hpp
@@ -24,6 +24,7 @@ PREP(debugModule);
PREP(defineVariable);
PREP(deviceKeyFindValidIndex);
PREP(deviceKeyRegisterNew);
+PREP(deprecateComponent);
PREP(disableAI);
PREP(disableUserInput);
PREP(displayIcon);
@@ -276,5 +277,3 @@ PREP(hashListCreateHash);
PREP(hashListSelect);
PREP(hashListSet);
PREP(hashListPush);
-
-PREP(timePFH);
diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
index 26f25d9ea4..a116ca4e63 100644
--- a/addons/common/XEH_postInit.sqf
+++ b/addons/common/XEH_postInit.sqf
@@ -3,47 +3,6 @@
// #define DEBUG_MODE_FULL
#include "script_component.hpp"
-
-//////////////////////////////////////////////////
-// PFHs
-//////////////////////////////////////////////////
-
-//Singe PFEH to handle execNextFrame, waitAndExec and waitUntilAndExec:
-[{
- BEGIN_COUNTER(waitAndExec);
-
- //Handle the waitAndExec array:
- while {!(GVAR(waitAndExecArray) isEqualTo []) && {GVAR(waitAndExecArray) select 0 select 0 <= ACE_Time}} do {
- private _entry = GVAR(waitAndExecArray) deleteAt 0;
- (_entry select 2) call (_entry select 1);
- };
-
- //Handle the execNextFrame array:
- {
- (_x select 0) call (_x select 1);
- false
- } count GVAR(nextFrameBufferA);
-
- //Swap double-buffer:
- GVAR(nextFrameBufferA) = GVAR(nextFrameBufferB);
- GVAR(nextFrameBufferB) = [];
- GVAR(nextFrameNo) = diag_frameno + 1;
-
- //Handle the waitUntilAndExec array:
- {
- // if condition is satisifed call statement
- if ((_x select 2) call (_x select 0)) then {
- // make sure to delete the correct handle when multiple conditions are met in one frame
- GVAR(waitUntilAndExecArray) deleteAt (GVAR(waitUntilAndExecArray) find _x);
- (_x select 2) call (_x select 1);
- };
- nil
- } count +GVAR(waitUntilAndExecArray);
-
- END_COUNTER(waitAndExec);
-}, 0, []] call CBA_fnc_addPerFrameHandler;
-
-
//////////////////////////////////////////////////
// Get Map Data
//////////////////////////////////////////////////
diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf
index 8b16777781..6ec637552a 100644
--- a/addons/common/XEH_preInit.sqf
+++ b/addons/common/XEH_preInit.sqf
@@ -51,20 +51,6 @@ GVAR(setHearingCapabilityMap) = [];
ACE_player = objNull;
uiNamespace setVariable ["ACE_player", objNull];
-//////////////////////////////////////////////////
-// 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);
diff --git a/addons/common/functions/fnc__handleSyncedEvent.sqf b/addons/common/functions/fnc__handleSyncedEvent.sqf
index db8151dbd7..c65ccad8b0 100644
--- a/addons/common/functions/fnc__handleSyncedEvent.sqf
+++ b/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];
};
};
diff --git a/addons/common/functions/fnc_binocularMagazine.sqf b/addons/common/functions/fnc_binocularMagazine.sqf
index b5f4f0558e..aacac7c142 100644
--- a/addons/common/functions/fnc_binocularMagazine.sqf
+++ b/addons/common/functions/fnc_binocularMagazine.sqf
@@ -15,18 +15,6 @@
*/
#include "script_component.hpp"
-params [["_unit", objNull, [objNull]]];
+ACE_DEPRECATED("ace_common_fnc_binocularMagazine","3.8.0","CBA_fnc_binocularMagazine");
-private _binocular = binocular _unit;
-
-scopeName "main";
-
-{
- if ((_x select 0) isEqualTo _binocular) then {
- // note: if there is no magazine, _x(4,0) will be nil, which skips the breakOut.
- (_x select 4 select 0) breakOut "main";
- };
- false
-} count weaponsitems _unit;
-
-""
+_this call CBA_fnc_binocularMagazine
diff --git a/addons/common/functions/fnc_cachedCall.sqf b/addons/common/functions/fnc_cachedCall.sqf
index a87e9f2364..8ff6744a54 100644
--- a/addons/common/functions/fnc_cachedCall.sqf
+++ b/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 {
- _namespace setVariable [_uid, [ACE_diagTime + _duration, _params call _function]];
+if ((_namespace getVariable [_uid, [-99999]]) select 0 < diag_tickTime) then {
+ _namespace setVariable [_uid, [diag_tickTime + _duration, _params call _function]];
// Does the cache needs to be cleared on an event?
if (!isNil "_event") then {
diff --git a/addons/common/functions/fnc_checkPBOs.sqf b/addons/common/functions/fnc_checkPBOs.sqf
index f447d126af..6d786aebf4 100644
--- a/addons/common/functions/fnc_checkPBOs.sqf
+++ b/addons/common/functions/fnc_checkPBOs.sqf
@@ -79,7 +79,7 @@ if (!isServer) then {
params ["_rscLayer"];
TRACE_2("Hiding Error message after 10 seconds",time,_rscLayer);
_rscLayer cutFadeOut 0.2;
- }, [_rscLayer], 10] call FUNC(waitAndExecute);
+ }, [_rscLayer], 10] call CBA_fnc_waitAndExecute;
};
};
@@ -89,7 +89,7 @@ if (!isServer) then {
TRACE_2("Player is alive, showing msg and exiting",time,_text);
_text = composeText [parseText format ["%1", _text]];
["[ACE] ERROR", _text, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);
- }, [_text]] call FUNC(waitUntilAndExecute);
+ }, [_text]] call CBA_fnc_waitUntilAndExecute;
};
};
diff --git a/addons/common/functions/fnc_deprecateComponent.sqf b/addons/common/functions/fnc_deprecateComponent.sqf
new file mode 100644
index 0000000000..21905e8e4e
--- /dev/null
+++ b/addons/common/functions/fnc_deprecateComponent.sqf
@@ -0,0 +1,63 @@
+/*
+ * Author: Glowbal
+ * Mark a component as deprecated and switches it to a new component if that is available
+ *
+ * Arguments:
+ * 0: Component
+ * 1: New component
+ * 2: Version when the compent will be removed
+ *
+ * Return Value:
+ * Replaced by new component
+ *
+ * Public: No
+ *
+ * Example:
+ * [["ace_sitting", "ace_sitting_enabled"], ["acex_sitting", "acex_sitting_enabled"], "3.7.0"] call ace_common_fnc_deprecateComponent;
+ */
+#include "script_component.hpp"
+
+params ["_oldComponent", "_newComponent", "_version"];
+
+_oldComponent params ["_oldComponentName", "_oldSettingName"];
+_newComponent params ["_newComponentName", "_newSettingName"];
+
+private _isReplacementAvailable = isClass (configFile >> "CfgPatches" >> _newComponentName);
+private _isDeprecatedLoaded = missionNamespace getvariable [_oldSettingName, false];
+private _isReplacementLoaded = missionNamespace getvariable [_newSettingName, false];
+
+if (_isDeprecatedLoaded && {_isReplacementAvailable} && {!_isReplacementLoaded}) then {
+ [_newSettingName, true, true, true] call FUNC(setSetting);
+};
+
+if (_isDeprecatedLoaded && {!_isReplacementLoaded}) then {
+ private _componentVersion = getText (configFile >> "CfgPatches" >> _oldComponentName >> "version");
+ ((_componentVersion splitString ".") apply {parseNumber _x}) params ["_componentMajor", "_componentMinor", "_componentPatch"];
+ ((_version splitString ".") apply {parseNumber _x}) params ["_major", "_minor", "_patch"];
+
+ switch (true) do {
+ case (_componentMajor >= _major && {_componentMinor >= _minor} && {_componentPatch >= _patch}): { // Removed from this version
+ private _message = format[
+ "Component %1 is deprecated. It has been replaced by %2. The component %1 is no longer usable on this version. ", _oldComponentName, _newComponentName, _version];
+ systemChat format["ACE [ERROR] - %1", _message];
+ ACE_LOGERROR(_message);
+ };
+ case (_componentMajor >= _major && {_componentMinor >= _minor-1}): { // Removed the next this version
+ private _message = format[
+ "Component %1 is deprecated. It is replaced by %2. Please disable %1 and make use of %2. "
+ + "The component (%1) will no longer be available from version %3 and later.", _oldComponentName, _newComponentName, _version];
+ systemChat format["ACE [WARNING] - %1", _message];
+ ACE_LOGWARNING(_message);
+ };
+ case (_componentMajor == _major && {_componentMinor >= _minor - 2}): { // we are in a version leading up to removal
+ private _message = format[
+ "Component %1 is deprecated. It is replaced by %2. Please disable %1 and make use of %2. "
+ + "The component (%1) will no longer be available from version %3 and later.", _oldComponentName, _newComponentName, _version];
+ ACE_LOGWARNING(_message);
+ };
+ default {
+ };
+ };
+};
+
+_isReplacementAvailable;
diff --git a/addons/common/functions/fnc_deviceKeyRegisterNew.sqf b/addons/common/functions/fnc_deviceKeyRegisterNew.sqf
index 416eef2c77..ce012fc3aa 100644
--- a/addons/common/functions/fnc_deviceKeyRegisterNew.sqf
+++ b/addons/common/functions/fnc_deviceKeyRegisterNew.sqf
@@ -13,7 +13,7 @@
* None
*
* Example:
- * [(localize "STR_ACE_microdagr_itemName"), QUOTE(PATHTOF(images\microDAGR_item.paa)), _conditionCode, _toggleCode, _closeCode] call ace_common_fnc_deviceKeyRegisterNew
+ * [(localize "STR_ACE_microdagr_itemName"), QPATHTOF(images\microDAGR_item.paa), _conditionCode, _toggleCode, _closeCode] call ace_common_fnc_deviceKeyRegisterNew
*
* Public: No
*/
diff --git a/addons/common/functions/fnc_displayIcon.sqf b/addons/common/functions/fnc_displayIcon.sqf
index c51b3bd454..e4f824791a 100644
--- a/addons/common/functions/fnc_displayIcon.sqf
+++ b/addons/common/functions/fnc_displayIcon.sqf
@@ -14,7 +14,7 @@
* None
*
* Example:
- * ["myID", true, QUOTE(PATHTOF(data\icon_group.paa)), [1,1,1,1], 0] call ace_gui_fnc_displayIcon;
+ * ["myID", true, QPATHTOF(data\icon_group.paa), [1,1,1,1], 0] call ace_gui_fnc_displayIcon;
*
* Public: Yes
*/
@@ -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;
};
@@ -104,7 +104,7 @@ if (_show) then {
if (_timeAlive >= 0) then {
[{
[_this select 0, false, "", [0,0,0], 0] call FUNC(displayIcon);
- }, [_iconId], _timeAlive, _timeAlive] call FUNC(waitAndExecute);
+ }, [_iconId], _timeAlive, _timeAlive] call CBA_fnc_waitAndExecute;
};
} else {
diff --git a/addons/common/functions/fnc_displayText.sqf b/addons/common/functions/fnc_displayText.sqf
index 3c68327535..ee22f6949a 100644
--- a/addons/common/functions/fnc_displayText.sqf
+++ b/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;
@@ -33,5 +33,5 @@ if (_time > _lastHintTime + _delay || {_priority >= _lastHintPriority}) then {
GVAR(lastHint) set [0, _time];
GVAR(lastHint) set [1, _priority];
- [{if ((_this select 0) == GVAR(lastHint) select 0) then {hintSilent ""};}, [_time], _delay, 0] call FUNC(waitAndExecute);
+ [{if ((_this select 0) == GVAR(lastHint) select 0) then {hintSilent ""};}, [_time], _delay, 0] call CBA_fnc_waitAndExecute;
};
diff --git a/addons/common/functions/fnc_execNextFrame.sqf b/addons/common/functions/fnc_execNextFrame.sqf
index 7b3f034c6d..c1c4b81592 100644
--- a/addons/common/functions/fnc_execNextFrame.sqf
+++ b/addons/common/functions/fnc_execNextFrame.sqf
@@ -13,10 +13,6 @@
*/
#include "script_component.hpp"
-params ["_func", "_params"];
+ACE_DEPRECATED("ace_common_fnc_execNextFrame","3.8.0","CBA_fnc_execNextFrame");
-if (diag_frameno != GVAR(nextFrameNo)) then {
- GVAR(nextFrameBufferA) pushBack [_params, _func];
-} else {
- GVAR(nextFrameBufferB) pushBack [_params, _func];
-};
+_this call CBA_fnc_execNextFrame;
diff --git a/addons/common/functions/fnc_fixCollision.sqf b/addons/common/functions/fnc_fixCollision.sqf
index c0cf7b93e7..3b3b16a9f9 100644
--- a/addons/common/functions/fnc_fixCollision.sqf
+++ b/addons/common/functions/fnc_fixCollision.sqf
@@ -19,4 +19,4 @@ if (!local _this) exitWith {};
[_this, "blockDamage", "fixCollision", true] call FUNC(statusEffect_set);
// re-allow damage after 2 seconds
-[{[_this, "blockDamage", "fixCollision", false] call FUNC(statusEffect_set);}, _this, 2] call EFUNC(common,waitAndExecute);
+[{[_this, "blockDamage", "fixCollision", false] call FUNC(statusEffect_set);}, _this, 2] call CBA_fnc_waitAndExecute;
diff --git a/addons/common/functions/fnc_getAllGear.sqf b/addons/common/functions/fnc_getAllGear.sqf
index cebcc489f1..de6ea62dff 100644
--- a/addons/common/functions/fnc_getAllGear.sqf
+++ b/addons/common/functions/fnc_getAllGear.sqf
@@ -64,5 +64,5 @@ if (isNull _unit) exitWith {[
handgunWeapon _unit, handgunItems _unit, handgunMagazine _unit,
assignedItems _unit,
binocular _unit,
- [_unit] call FUNC(binocularMagazine)
+ [_unit] call CBA_fnc_binocularMagazine
]
diff --git a/addons/common/functions/fnc_getConfigType.sqf b/addons/common/functions/fnc_getConfigType.sqf
index 1496cfa2b9..34aaa03172 100644
--- a/addons/common/functions/fnc_getConfigType.sqf
+++ b/addons/common/functions/fnc_getConfigType.sqf
@@ -12,12 +12,6 @@
*/
#include "script_component.hpp"
-params ["_item"];
+ACE_DEPRECATED("ace_common_fnc_getConfigType","3.8.0","CBA_fnc_getItemConfig");
-if (isClass (configFile >> "CfgWeapons" >> _item)) exitWith {"CfgWeapons"};
-
-if (isClass (configFile >> "CfgMagazines" >> _item)) exitWith {"CfgMagazines"};
-
-if (isClass (configFile >> "CfgGlasses" >> _item)) exitWith {"CfgGlasses"};
-
-""
+configName (configHierarchy (_item call CBA_fnc_getItemConfig) param [1, configNull])
diff --git a/addons/common/functions/fnc_getConfigTypeObject.sqf b/addons/common/functions/fnc_getConfigTypeObject.sqf
index 6186ad6bff..92a6d43a42 100644
--- a/addons/common/functions/fnc_getConfigTypeObject.sqf
+++ b/addons/common/functions/fnc_getConfigTypeObject.sqf
@@ -12,10 +12,6 @@
*/
#include "script_component.hpp"
-params ["_object"];
+ACE_DEPRECATED("ace_common_fnc_getConfigTypeObject","3.8.0","CBA_fnc_getObjectConfig");
-if (isClass (configFile >> "CfgVehicles" >> _object)) exitWith {"CfgVehicles"};
-
-if (isClass (configFile >> "CfgAmmo" >> _object)) exitWith {"CfgAmmo"};
-
-""
+configName (configHierarchy (_item call CBA_fnc_getObjectConfig) param [1, configNull])
diff --git a/addons/common/functions/fnc_getItemType.sqf b/addons/common/functions/fnc_getItemType.sqf
index d3eb511949..eb5015e20a 100644
--- a/addons/common/functions/fnc_getItemType.sqf
+++ b/addons/common/functions/fnc_getItemType.sqf
@@ -15,9 +15,11 @@
params ["_item"];
-private _cfgType = [_item] call FUNC(getConfigType);
+private _config = _item call CBA_fnc_getItemConfig;
-if (_cfgType == "") exitWith {["", ""]};
+if (isNull _config) exitWith {["", ""]};
+
+private _cfgType = configName ((configHierarchy _config) param [1, configNull]);
if (_cfgType == "CfgGlasses") exitWith {["item", "glasses"]};
diff --git a/addons/common/functions/fnc_getTurretCommander.sqf b/addons/common/functions/fnc_getTurretCommander.sqf
index e73795e148..3e7f09215f 100644
--- a/addons/common/functions/fnc_getTurretCommander.sqf
+++ b/addons/common/functions/fnc_getTurretCommander.sqf
@@ -14,19 +14,4 @@
params [["_vehicle", objNull, [objNull]]];
-private _turrets = allTurrets [_vehicle, true];
-
-private _turret = [];
-
-{
- private _config = configFile >> "CfgVehicles" >> typeOf _vehicle;
-
- _config = [_config, _x] call FUNC(getTurretConfigPath);
-
- if (getNumber (_config >> "primaryObserver") == 1) exitWith {
- _turret = _x;
- };
- false
-} count _turrets;
-
-_turret
+fullCrew [_vehicle, "commander", true] apply {_x select 3} param [0, []] // return
diff --git a/addons/common/functions/fnc_getTurretCopilot.sqf b/addons/common/functions/fnc_getTurretCopilot.sqf
index 6161f5c4cc..49002cc40e 100644
--- a/addons/common/functions/fnc_getTurretCopilot.sqf
+++ b/addons/common/functions/fnc_getTurretCopilot.sqf
@@ -14,19 +14,6 @@
params [["_vehicle", objNull, [objNull]]];
-private _turrets = allTurrets [_vehicle, true];
-
-private _turret = [];
-
-{
- private _config = configFile >> "CfgVehicles" >> typeOf _vehicle;
-
- _config = [_config, _x] call FUNC(getTurretConfigPath);
-
- if (getNumber (_config >> "isCopilot") == 1 && {getNumber (_config >> "primaryGunner") != 1} && {getNumber (_config >> "primaryObserver") != 1}) exitWith {
- _turret = _x;
- };
- false
-} count _turrets;
-
-_turret
+fullCrew [_vehicle, "turret", true] apply {_x select 3} select {
+ getNumber ([_vehicle, _x] call CBA_fnc_getTurret >> "isCopilot") == 1
+} param [0, []] // return
diff --git a/addons/common/functions/fnc_getTurretGunner.sqf b/addons/common/functions/fnc_getTurretGunner.sqf
index 6f59798cc6..4a26e2c03d 100644
--- a/addons/common/functions/fnc_getTurretGunner.sqf
+++ b/addons/common/functions/fnc_getTurretGunner.sqf
@@ -14,19 +14,4 @@
params [["_vehicle", objNull, [objNull]]];
-private _turrets = allTurrets [_vehicle, true];
-
-private _turret = [];
-
-{
- private _config = configFile >> "CfgVehicles" >> typeOf _vehicle;
-
- _config = [_config, _x] call FUNC(getTurretConfigPath);
-
- if (getNumber (_config >> "primaryGunner") == 1) exitWith {
- _turret = _x;
- };
- false
-} count _turrets;
-
-_turret
+fullCrew [_vehicle, "gunner", true] apply {_x select 3} param [0, []] // return
diff --git a/addons/common/functions/fnc_getTurrets.sqf b/addons/common/functions/fnc_getTurrets.sqf
index 229f3ab1f7..0479580764 100644
--- a/addons/common/functions/fnc_getTurrets.sqf
+++ b/addons/common/functions/fnc_getTurrets.sqf
@@ -8,12 +8,14 @@
* Return Value:
* Turret Indecies
*
- * Public: Yes
+ * Public: No
*
* Note: It's advised to use allTurrets [_vehicle, true] instead whenever possible
*/
#include "script_component.hpp"
+ACE_DEPRECATED("ace_common_fnc_getTurrets","3.7.0","allTurrets [_vehicle, true]");
+
params ["_type"];
private _varName = format [QGVAR(CachedTurrets_%1), _type];
diff --git a/addons/common/functions/fnc_getTurretsFFV.sqf b/addons/common/functions/fnc_getTurretsFFV.sqf
index 8c471824cf..5c36e20197 100644
--- a/addons/common/functions/fnc_getTurretsFFV.sqf
+++ b/addons/common/functions/fnc_getTurretsFFV.sqf
@@ -14,19 +14,4 @@
params [["_vehicle", objNull, [objNull]]];
-private _turrets = allTurrets [_vehicle, true];
-
-private _turret = [];
-
-{
- private _config = configFile >> "CfgVehicles" >> typeOf _vehicle;
-
- _config = [_config, _x] call FUNC(getTurretConfigPath);
-
- if (getNumber (_config >> "isPersonTurret") == 1) then {
- _turret pushBack _x;
- };
- false
-} count _turrets;
-
-_turret
+fullCrew [_vehicle, "turret", true] select {_x select 4} apply {_x select 3} // return
diff --git a/addons/common/functions/fnc_getTurretsOther.sqf b/addons/common/functions/fnc_getTurretsOther.sqf
index 408a5529d5..ef2a1278dc 100644
--- a/addons/common/functions/fnc_getTurretsOther.sqf
+++ b/addons/common/functions/fnc_getTurretsOther.sqf
@@ -14,24 +14,6 @@
params [["_vehicle", objNull, [objNull]]];
-private _turrets = allTurrets [_vehicle, true];
-
-private _turret = [];
-
-{
- private _config = configFile >> "CfgVehicles" >> typeOf _vehicle;
-
- _config = [_config, _x] call FUNC(getTurretConfigPath);
-
- if (
- getNumber (_config >> "isCopilot") != 1
- && {getNumber (_config >> "primaryGunner") != 1}
- && {getNumber (_config >> "primaryObserver") != 1}
- && {getNumber (_config >> "isPersonTurret") != 1}
- ) then {
- _turret pushBack _x;
- };
- false
-} count _turrets;
-
-_turret
+fullCrew [_vehicle, "turret", true] select {!(_x select 4)} apply {_x select 3} select {
+ getNumber ([_vehicle, _x] call CBA_fnc_getTurret >> "isCopilot") != 1
+} // return
diff --git a/addons/common/functions/fnc_hashHasKey.sqf b/addons/common/functions/fnc_hashHasKey.sqf
index b2978f9cc4..97998c1298 100644
--- a/addons/common/functions/fnc_hashHasKey.sqf
+++ b/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"];
diff --git a/addons/common/functions/fnc_hashSet.sqf b/addons/common/functions/fnc_hashSet.sqf
index 10e2881c10..0890578857 100644
--- a/addons/common/functions/fnc_hashSet.sqf
+++ b/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"];
diff --git a/addons/common/functions/fnc_progressBar.sqf b/addons/common/functions/fnc_progressBar.sqf
index b39fd8fd73..7103dd08e4 100644
--- a/addons/common/functions/fnc_progressBar.sqf
+++ b/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;
diff --git a/addons/common/functions/fnc_receiveRequest.sqf b/addons/common/functions/fnc_receiveRequest.sqf
index 75f684f5dd..1bb48428df 100644
--- a/addons/common/functions/fnc_receiveRequest.sqf
+++ b/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];
diff --git a/addons/common/functions/fnc_removeBinocularMagazine.sqf b/addons/common/functions/fnc_removeBinocularMagazine.sqf
index 487295ccc3..4f1e0fcdd6 100644
--- a/addons/common/functions/fnc_removeBinocularMagazine.sqf
+++ b/addons/common/functions/fnc_removeBinocularMagazine.sqf
@@ -15,13 +15,6 @@
*/
#include "script_component.hpp"
-params [["_unit", objNull, [objNull]]];
+ACE_DEPRECATED("ace_common_fnc_removeBinocularMagazine","3.8.0","CBA_fnc_removeBinocularMagazine");
-private _binocular = binocular _unit;
-private _selectBinocular = currentWeapon _unit == _binocular;
-
-_unit addWeapon _binocular;
-
-if (_selectBinocular) then {
- _unit selectWeapon _binocular;
-};
+_this call CBA_fnc_removeBinocularMagazine
diff --git a/addons/common/functions/fnc_setVariablePublic.sqf b/addons/common/functions/fnc_setVariablePublic.sqf
index bf6b35a862..1cfba0a422 100644
--- a/addons/common/functions/fnc_setVariablePublic.sqf
+++ b/addons/common/functions/fnc_setVariablePublic.sqf
@@ -50,4 +50,4 @@ TRACE_2("Starting Embargo", _varName, _delay);
if (!(_value isEqualTo _curValue)) then {
_this call FUNC(setVariablePublic);
};
-}, _this, _delay] call FUNC(waitAndExecute);
+}, _this, _delay] call CBA_fnc_waitAndExecute;
diff --git a/addons/common/functions/fnc_syncedEventPFH.sqf b/addons/common/functions/fnc_syncedEventPFH.sqf
index 62df8f10a7..d5a2623cd8 100644
--- a/addons/common/functions/fnc_syncedEventPFH.sqf
+++ b/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}};
};
};
diff --git a/addons/common/functions/fnc_throttledPublicVariable.sqf b/addons/common/functions/fnc_throttledPublicVariable.sqf
index 67cfc50f9a..3aaa3c8f47 100644
--- a/addons/common/functions/fnc_throttledPublicVariable.sqf
+++ b/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);
diff --git a/addons/common/functions/fnc_timePFH.sqf b/addons/common/functions/fnc_timePFH.sqf
deleted file mode 100644
index e5366d331e..0000000000
--- a/addons/common/functions/fnc_timePFH.sqf
+++ /dev/null
@@ -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);
diff --git a/addons/common/functions/fnc_unloadPerson.sqf b/addons/common/functions/fnc_unloadPerson.sqf
index c88e8d23a6..716f46dc8e 100644
--- a/addons/common/functions/fnc_unloadPerson.sqf
+++ b/addons/common/functions/fnc_unloadPerson.sqf
@@ -15,7 +15,7 @@
*/
#include "script_component.hpp"
-#define GROUP_SWITCH_ID QUOTE(FUNC(loadPerson))
+#define GROUP_SWITCH_ID QFUNC(loadPerson)
params ["_unit"];
diff --git a/addons/common/functions/fnc_unloadPersonLocal.sqf b/addons/common/functions/fnc_unloadPersonLocal.sqf
index b734109a16..bf467332eb 100644
--- a/addons/common/functions/fnc_unloadPersonLocal.sqf
+++ b/addons/common/functions/fnc_unloadPersonLocal.sqf
@@ -14,7 +14,7 @@
*/
#include "script_component.hpp"
-#define GROUP_SWITCH_ID QUOTE(FUNC(loadPerson))
+#define GROUP_SWITCH_ID QFUNC(loadPerson)
params ["_unit", "_vehicle", ["_unloader", objNull]];
TRACE_3("params",_unit,_vehicle,_unloader);
@@ -58,10 +58,10 @@ _unit action ["Eject", vehicle _unit];
if ((_unit getVariable "ACE_isUnconscious") and (animationState _unit != _anim)) then {
[_unit, _anim, 2, true] call FUNC(doAnimation);
};
- }, [_unit, _anim], 0.5] call FUNC(waitAndExecute);
+ }, [_unit, _anim], 0.5] call CBA_fnc_waitAndExecute;
};
};
-}, [_unit, _emptyPos], 0.5] call FUNC(waitAndExecute);
+}, [_unit, _emptyPos], 0.5] call CBA_fnc_waitAndExecute;
[_unit, false, GROUP_SWITCH_ID, side group _unit] call FUNC(switchToGroupSide);
diff --git a/addons/common/functions/fnc_waitAndExecute.sqf b/addons/common/functions/fnc_waitAndExecute.sqf
index 6f282ba656..1ac0d3f54d 100644
--- a/addons/common/functions/fnc_waitAndExecute.sqf
+++ b/addons/common/functions/fnc_waitAndExecute.sqf
@@ -17,7 +17,6 @@
*/
#include "script_component.hpp"
-params ["_func", "_params", "_delay"];
+ACE_DEPRECATED("ace_common_fnc_waitAndExecute","3.8.0","CBA_fnc_waitAndExecute");
-GVAR(waitAndExecArray) pushBack [ACE_time + _delay, _func, _params];
-GVAR(waitAndExecArray) sort true;
+_this call CBA_fnc_waitAndExecute;
diff --git a/addons/common/functions/fnc_waitUntilAndExecute.sqf b/addons/common/functions/fnc_waitUntilAndExecute.sqf
index bbc6c540fe..76f3d22ce1 100644
--- a/addons/common/functions/fnc_waitUntilAndExecute.sqf
+++ b/addons/common/functions/fnc_waitUntilAndExecute.sqf
@@ -17,7 +17,8 @@
*/
#include "script_component.hpp"
-TRACE_1("Adding",_this);
+ACE_DEPRECATED("ace_common_fnc_waitUntilAndExecute","3.8.0","CBA_fnc_waitUntilAndExecute");
+
+_this call CBA_fnc_waitUntilAndExecute;
-GVAR(waitUntilAndExecArray) pushBack _this;
nil
diff --git a/addons/common/init_versionTooltip.sqf b/addons/common/init_versionTooltip.sqf
index 7aef3f4786..ce0d005a14 100644
--- a/addons/common/init_versionTooltip.sqf
+++ b/addons/common/init_versionTooltip.sqf
@@ -30,7 +30,7 @@ _display setVariable [QGVAR(versionTooltip), [_display] spawn {
_ctrl ctrlCommit 0;
// pls ignore
- _ctrl ctrlSetText QUOTE(PATHTOF(data\icon_banana_ca.paa));
+ _ctrl ctrlSetText QPATHTOF(data\icon_banana_ca.paa);
// animate with random speed
_position set [1, 1 - safezoneY];
diff --git a/addons/concertina_wire/CfgVehicles.hpp b/addons/concertina_wire/CfgVehicles.hpp
index 88975ea7e9..d7f5d0d82a 100644
--- a/addons/concertina_wire/CfgVehicles.hpp
+++ b/addons/concertina_wire/CfgVehicles.hpp
@@ -10,7 +10,7 @@ class CfgVehicles {
scope = 1;
displayName = "";
- model = PATHTOF(data\ACE_ConcertinaWireNoGeo.p3d);
+ model = QPATHTOF(data\ACE_ConcertinaWireNoGeo.p3d);
destrType = "DestructTent";
accuracy = 0.3;
mapSize = 2.8;
@@ -75,7 +75,7 @@ class CfgVehicles {
class ACE_ConcertinaWire: ACE_ConcertinaWireNoGeo {
scope = 2;
displayName = $STR_ACE_CONCERTINA_WIRE;
- model = PATHTOF(data\ACE_ConcertinaWire.p3d);
+ model = QPATHTOF(data\ACE_ConcertinaWire.p3d);
EGVAR(logistics_wirecutter,isFence) = 1;
class ACE_Actions {
class ACE_MainActions {
@@ -91,7 +91,7 @@ class CfgVehicles {
showDisabled = 0;
exceptions[] = {};
priority = 5;
- icon = PATHTOF(UI\icon_sandbag_ca.paa);
+ icon = QPATHTOF(UI\icon_sandbag_ca.paa);
};
};
};
@@ -105,7 +105,7 @@ class CfgVehicles {
scope = 2;
displayName = $STR_ACE_CONCERTINA_WIRECOIL;
- model = PATHTOF(data\ACE_ConcertinaWireCoil.p3d);
+ model = QPATHTOF(data\ACE_ConcertinaWireCoil.p3d);
mapsize = 0.5;
animated = 0;
nameSound = "fence";
@@ -134,11 +134,11 @@ class CfgVehicles {
distance = 4;
condition = "true";
//wait a frame to handle "Do When releasing action menu key" option:
- statement = QUOTE([ARR_2({_this call FUNC(deploy)}, [ARR_2(_target,_player)])] call EFUNC(common,execNextFrame));
+ statement = QUOTE([ARR_2({_this call FUNC(deploy)}, [ARR_2(_target,_player)])] call CBA_fnc_execNextFrame);
showDisabled = 0;
exceptions[] = {};
priority = 5;
- icon = PATHTOF(UI\icon_sandbag_ca.paa);
+ icon = QPATHTOF(UI\icon_sandbag_ca.paa);
};
};
};
diff --git a/addons/concertina_wire/functions/fnc_dismount.sqf b/addons/concertina_wire/functions/fnc_dismount.sqf
index 6e8ae8f4f5..50429c054b 100644
--- a/addons/concertina_wire/functions/fnc_dismount.sqf
+++ b/addons/concertina_wire/functions/fnc_dismount.sqf
@@ -18,7 +18,7 @@
if (uiNamespace getVariable [QEGVAR(interact_menu,cursorMenuOpened),false]) exitWith {
[{
_this call FUNC(dismount);
- }, _this] call EFUNC(common,execNextFrame);
+ }, _this] call CBA_fnc_execNextFrame;
};
params ["_wire", "_unit"];
diff --git a/addons/concertina_wire/functions/fnc_vehicleDamage.sqf b/addons/concertina_wire/functions/fnc_vehicleDamage.sqf
index dffa15b609..0bca28c3cf 100644
--- a/addons/concertina_wire/functions/fnc_vehicleDamage.sqf
+++ b/addons/concertina_wire/functions/fnc_vehicleDamage.sqf
@@ -114,7 +114,7 @@ if (_mode == 1) then {
_vDir = getDir _vehicle;
_vehicle setPosASL (_vPos vectorAdd [-0.35 * sin(_vDir), -0.35 * cos(_vDir), 0]);
// TODO: Needs to be placed in safe distance to wire, so we do not constantly re-spawn new wires
- }, [_vehicle, _wire], 0.1] call EFUNC(common,waitAndExecute);
+ }, [_vehicle, _wire], 0.1] call CBA_fnc_waitAndExecute;
};
//TODO: Create broken geoless wire (two version)
diff --git a/addons/dagr/CfgVehicles.hpp b/addons/dagr/CfgVehicles.hpp
index 7f0a7f6cff..89bfd8af4e 100644
--- a/addons/dagr/CfgVehicles.hpp
+++ b/addons/dagr/CfgVehicles.hpp
@@ -9,7 +9,7 @@ class CfgVehicles {
statement = QUOTE(call FUNC(menuInit));
showDisabled = 0;
priority = 0.1;
- icon = QUOTE(PATHTOF(UI\DAGR_Icon.paa));
+ icon = QPATHTOF(UI\DAGR_Icon.paa);
exceptions[] = {"isNotInside", "isNotSitting"};
class GVAR(toggle) {
displayName = CSTRING(ToggleDAGR);
@@ -17,7 +17,7 @@ class CfgVehicles {
statement = QUOTE(call FUNC(toggleOverlay));
showDisabled = 0;
priority = 0.2;
- icon = QUOTE(PATHTOF(UI\DAGR_Icon.paa));
+ icon = QPATHTOF(UI\DAGR_Icon.paa);
exceptions[] = {"notOnMap", "isNotInside", "isNotSitting"};
};
};
diff --git a/addons/dagr/CfgWeapons.hpp b/addons/dagr/CfgWeapons.hpp
index 9fcd903cdd..b6601e094c 100644
--- a/addons/dagr/CfgWeapons.hpp
+++ b/addons/dagr/CfgWeapons.hpp
@@ -7,9 +7,9 @@ class CfgWeapons {
author[] = {$STR_ACE_Common_ACETeam, "Ruthberg"};
scope = 2;
displayName = CSTRING(Name);
- model = QUOTE(PATHTOF(data\DAGR.p3d));
+ model = QPATHTOF(data\DAGR.p3d);
descriptionShort = CSTRING(Description);
- picture = PATHTOF(UI\DAGR_Icon.paa);
+ picture = QPATHTOF(UI\DAGR_Icon.paa);
icon = "iconObject_circle";
mapSize = 0.034;
class ItemInfo: InventoryItem_Base_F {
diff --git a/addons/dagr/Dialog.hpp b/addons/dagr/Dialog.hpp
index 8511829e5e..52e3a8f683 100644
--- a/addons/dagr/Dialog.hpp
+++ b/addons/dagr/Dialog.hpp
@@ -156,7 +156,7 @@ class DAGR_Menu {
idc = 266861;
x = 0.175;
y = -0.173;
- text = QUOTE(PATHTOF(UI\dagr_menu.paa));
+ text = QPATHTOF(UI\dagr_menu.paa);
sizeEx = 0.1;
};
diff --git a/addons/dagr/functions/fnc_menuInit.sqf b/addons/dagr/functions/fnc_menuInit.sqf
index 54cb4467c5..9bf36c393c 100644
--- a/addons/dagr/functions/fnc_menuInit.sqf
+++ b/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;
};
@@ -179,7 +179,7 @@ GVAR(menuRun) = true;
(__dsp displayCtrl __Option2) ctrlSetText "WP LIST";
(__dsp displayCtrl __Option3) ctrlSetText "CONNECT TO";
(__dsp displayCtrl __Option4) ctrlSetText "OPTIONS";
- (__dsp displayCtrl (__Selection0 + GVAR(selection))) ctrlSetText QUOTE(PATHTOF(UI\DAGR_Selection.paa));
+ (__dsp displayCtrl (__Selection0 + GVAR(selection))) ctrlSetText QPATHTOF(UI\DAGR_Selection.paa);
};
};
case "goto_wp": {
@@ -190,7 +190,7 @@ GVAR(menuRun) = true;
(__dsp displayCtrl __Option3) ctrlSetText GVAR(wpString3);
(__dsp displayCtrl __Option4) ctrlSetText GVAR(wpString4);
if (GVAR(numSelections) > 0) then {
- (__dsp displayCtrl (__Selection0 + GVAR(selection))) ctrlSetText QUOTE(PATHTOF(UI\DAGR_Selection.paa));
+ (__dsp displayCtrl (__Selection0 + GVAR(selection))) ctrlSetText QPATHTOF(UI\DAGR_Selection.paa);
};
};
if (GVAR(SEL)) then {
@@ -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;
};
@@ -238,7 +238,7 @@ GVAR(menuRun) = true;
(__dsp displayCtrl __F2) ctrlSetText "Edit";
(__dsp displayCtrl __F3) ctrlSetText "Delete";
if (GVAR(numSelections) > 0) then {
- (__dsp displayCtrl (__Selection0 + GVAR(selection))) ctrlSetText QUOTE(PATHTOF(UI\DAGR_Selection.paa));
+ (__dsp displayCtrl (__Selection0 + GVAR(selection))) ctrlSetText QPATHTOF(UI\DAGR_Selection.paa);
};
};
if (GVAR(F3) && GVAR(numWaypoints) > 0) then {
@@ -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;
};
@@ -399,7 +399,7 @@ GVAR(menuRun) = true;
(__dsp displayCtrl __F3) ctrlSetText "Cancel";
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);
- (__dsp displayCtrl __PSelection1 + GVAR(pointer)) ctrlSetText QUOTE(PATHTOF(UI\DAGR_PSelection.paa));
+ (__dsp displayCtrl __PSelection1 + GVAR(pointer)) ctrlSetText QPATHTOF(UI\DAGR_PSelection.paa);
};
if (GVAR(F1)) then {
if (!GVAR(busy)) then {
@@ -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;
@@ -507,21 +507,21 @@ GVAR(menuRun) = true;
case "connect": {
if (!GVAR(busy)) then {
(__dsp displayCtrl __Option0) ctrlSetText "Vector 21";
- (__dsp displayCtrl __Selection0) ctrlSetText QUOTE(PATHTOF(UI\DAGR_Selection.paa));
+ (__dsp displayCtrl __Selection0) ctrlSetText QPATHTOF(UI\DAGR_Selection.paa);
};
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 (({_x isKindOf ["ACE_Vector", configFile >> "CfgWeapons"]} count (weapons ACE_player)) > 0) 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;
@@ -542,7 +542,7 @@ GVAR(menuRun) = true;
case "options": {
(__dsp displayCtrl __Option0) ctrlSetText "Signal Delay";
(__dsp displayCtrl __Option1) ctrlSetText (if (GVAR(useDegrees)) then { "Direction: Deg" } else { "Direction: MIL" });
- (__dsp displayCtrl (__Selection0 + GVAR(selection))) ctrlSetText QUOTE(PATHTOF(UI\DAGR_Selection.paa));
+ (__dsp displayCtrl (__Selection0 + GVAR(selection))) ctrlSetText QPATHTOF(UI\DAGR_Selection.paa);
if (GVAR(SEL)) then {
GVAR(vectorConnected) = false;
switch (GVAR(selection)) do {
@@ -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;
};
diff --git a/addons/dagr/functions/fnc_outputData.sqf b/addons/dagr/functions/fnc_outputData.sqf
index 63350c71a3..a981514e54 100644
--- a/addons/dagr/functions/fnc_outputData.sqf
+++ b/addons/dagr/functions/fnc_outputData.sqf
@@ -25,7 +25,7 @@
#define __timeControl (__display displayCtrl 266855)
#define __background (__display displayCtrl 266856)
-__background ctrlSetText QUOTE(PATHTOF(UI\dagr_gps.paa));
+__background ctrlSetText QPATHTOF(UI\dagr_gps.paa);
if (GVAR(outputPFH) != -1) exitWith {};
diff --git a/addons/dagr/functions/fnc_outputVector.sqf b/addons/dagr/functions/fnc_outputVector.sqf
index ef93a53d8a..23996c46b4 100644
--- a/addons/dagr/functions/fnc_outputVector.sqf
+++ b/addons/dagr/functions/fnc_outputVector.sqf
@@ -27,7 +27,7 @@ private ["_xGrid", "_yGrid", "_dagrGrid", "_bearing", "_dagrDist", "_dagrElevati
#define __timeControl (__display displayCtrl 266855)
#define __background (__display displayCtrl 266856)
-__background ctrlSetText QUOTE(PATHTOF(UI\dagr_vector.paa));
+__background ctrlSetText QPATHTOF(UI\dagr_vector.paa);
if (GVAR(noVectorData)) exitWith {};
GVAR(LAZPOS) params ["_lazPosX", "_lazPosY", "_lazPosZ"];
diff --git a/addons/dagr/functions/fnc_outputWP.sqf b/addons/dagr/functions/fnc_outputWP.sqf
index 204a5ef556..2d1aee4d4e 100644
--- a/addons/dagr/functions/fnc_outputWP.sqf
+++ b/addons/dagr/functions/fnc_outputWP.sqf
@@ -25,7 +25,7 @@
#define __timeControl (__display displayCtrl 266859)
#define __background (__display displayCtrl 266856)
-__background ctrlSetText QUOTE(PATHTOF(UI\dagr_wp.paa));
+__background ctrlSetText QPATHTOF(UI\dagr_wp.paa);
if (GVAR(outputPFH) != -1) exitWith {};
diff --git a/addons/dagr/initKeybinds.sqf b/addons/dagr/initKeybinds.sqf
index 1a2f25ac4d..74a522e87f 100644
--- a/addons/dagr/initKeybinds.sqf
+++ b/addons/dagr/initKeybinds.sqf
@@ -56,4 +56,4 @@ _closeCode = {
closeDialog 0;
};
};
-["DAGR", QUOTE(PATHTOF(UI\DAGR_Icon.paa)), _conditonCode, _toggleCode, _closeCode] call EFUNC(common,deviceKeyRegisterNew);
+["DAGR", QPATHTOF(UI\DAGR_Icon.paa), _conditonCode, _toggleCode, _closeCode] call EFUNC(common,deviceKeyRegisterNew);
diff --git a/addons/disarming/CfgVehicles.hpp b/addons/disarming/CfgVehicles.hpp
index b4a1a4c7dd..1d04bb157c 100644
--- a/addons/disarming/CfgVehicles.hpp
+++ b/addons/disarming/CfgVehicles.hpp
@@ -8,7 +8,7 @@ class CfgVehicles {
distance = 3.5;
condition = QUOTE([ARR_2(_player,_target)] call FUNC(canPlayerDisarmUnit));
statement = QUOTE([ARR_2(_player,_target)] call FUNC(openDisarmDialog));
- icon = PATHTOF(UI\disarm.paa);
+ icon = QPATHTOF(UI\disarm.paa);
exceptions[] = {};
};
};
diff --git a/addons/disarming/CfgWeapons.hpp b/addons/disarming/CfgWeapons.hpp
index 404ef4aa76..4e7122ba41 100644
--- a/addons/disarming/CfgWeapons.hpp
+++ b/addons/disarming/CfgWeapons.hpp
@@ -5,7 +5,7 @@ class CfgWeapons {
class ACE_DebugPotato: ACE_ItemCore {
displayName = "ACE Potato (debug)";
descriptionShort = "Glorious Potato
If you see this in game it means someone fucked up";
- picture = QUOTE(PATHTOF(UI\potato_ca.paa));
+ picture = QPATHTOF(UI\potato_ca.paa);
scope = 1;
class ItemInfo: InventoryItem_Base_F {
mass = 1;
diff --git a/addons/disarming/functions/fnc_disarmDropItems.sqf b/addons/disarming/functions/fnc_disarmDropItems.sqf
index be2f932028..c9eb920084 100644
--- a/addons/disarming/functions/fnc_disarmDropItems.sqf
+++ b/addons/disarming/functions/fnc_disarmDropItems.sqf
@@ -67,7 +67,7 @@ if (isNull _holder) exitWith {
if (_holder getVariable [QGVAR(holderInUse), false]) exitWith {
[{
_this call FUNC(disarmDropItems);
- }, _this] call EFUNC(common,execNextFrame);
+ }, _this] call CBA_fnc_execNextFrame;
};
_holder setVariable [QGVAR(holderInUse), true];
@@ -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;
diff --git a/addons/disarming/functions/fnc_eventCallerFinish.sqf b/addons/disarming/functions/fnc_eventCallerFinish.sqf
index e1376f4052..bf1daee2f0 100644
--- a/addons/disarming/functions/fnc_eventCallerFinish.sqf
+++ b/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);
diff --git a/addons/disarming/functions/fnc_eventTargetFinish.sqf b/addons/disarming/functions/fnc_eventTargetFinish.sqf
index 42580d81f3..4b7487d47c 100644
--- a/addons/disarming/functions/fnc_eventTargetFinish.sqf
+++ b/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);
[QGVAR(debugCallback), [_caller, _target, _errorMsg], [_caller]] call CBA_fnc_targetEvent;
};
diff --git a/addons/disposable/CfgMagazines.hpp b/addons/disposable/CfgMagazines.hpp
index d26d5ecea2..d9ad0508db 100644
--- a/addons/disposable/CfgMagazines.hpp
+++ b/addons/disposable/CfgMagazines.hpp
@@ -5,7 +5,7 @@ class CfgMagazines {
scope = 1;
scopeArsenal = 1;
displayName = CSTRING(PreloadedMissileDummy);
- picture = PATHTOEF(common,UI\blank_CO.paa);
+ picture = QPATHTOEF(common,UI\blank_CO.paa);
weaponPoolAvailable = 0;
mass = 0;
};
diff --git a/addons/dragging/functions/fnc_carryObject.sqf b/addons/dragging/functions/fnc_carryObject.sqf
index e4cb1f58c8..f6a0b9ac46 100644
--- a/addons/dragging/functions/fnc_carryObject.sqf
+++ b/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;
diff --git a/addons/dragging/functions/fnc_carryObjectPFH.sqf b/addons/dragging/functions/fnc_carryObjectPFH.sqf
index 948af15891..963921efa7 100644
--- a/addons/dragging/functions/fnc_carryObjectPFH.sqf
+++ b/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;
diff --git a/addons/dragging/functions/fnc_dragObject.sqf b/addons/dragging/functions/fnc_dragObject.sqf
index b97a6a2a01..7a76684217 100644
--- a/addons/dragging/functions/fnc_dragObject.sqf
+++ b/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;
diff --git a/addons/dragging/functions/fnc_dragObjectPFH.sqf b/addons/dragging/functions/fnc_dragObjectPFH.sqf
index ab117e90fd..08aeba738b 100644
--- a/addons/dragging/functions/fnc_dragObjectPFH.sqf
+++ b/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;
diff --git a/addons/dragging/functions/fnc_startCarry.sqf b/addons/dragging/functions/fnc_startCarry.sqf
index fd528b0104..1890dbac1a 100644
--- a/addons/dragging/functions/fnc_startCarry.sqf
+++ b/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 {
diff --git a/addons/dragging/functions/fnc_startCarryPFH.sqf b/addons/dragging/functions/fnc_startCarryPFH.sqf
index 4d39672a9e..007469d960 100644
--- a/addons/dragging/functions/fnc_startCarryPFH.sqf
+++ b/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 {
- TRACE_4("Start carry person",_unit,_target,_timeOut,ACE_time);
+ if (CBA_missionTime > _timeOut) exitWith {
+ 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 {
- TRACE_4("timeout",_unit,_target,_timeOut,ACE_time);
+ if (CBA_missionTime > _timeOut) exitWith {
+ 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;
diff --git a/addons/dragging/functions/fnc_startDrag.sqf b/addons/dragging/functions/fnc_startDrag.sqf
index 24a279e7a7..8c46fbe122 100644
--- a/addons/dragging/functions/fnc_startDrag.sqf
+++ b/addons/dragging/functions/fnc_startDrag.sqf
@@ -39,7 +39,7 @@ _unit selectWeapon primaryWeapon _unit;
[_unit, _target, true] call EFUNC(common,claim);
// can't play action that depends on weapon if it was added the same frame
-[{_this playActionNow "grabDrag";}, _unit] call EFUNC(common,execNextFrame);
+[{_this playActionNow "grabDrag";}, _unit] call CBA_fnc_execNextFrame;
// move a bit closer and adjust direction when trying to pick up a person
if (_target isKindOf "CAManBase") then {
@@ -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;
diff --git a/addons/dragging/functions/fnc_startDragPFH.sqf b/addons/dragging/functions/fnc_startDragPFH.sqf
index cfa84fe279..c7843cfdc9 100644
--- a/addons/dragging/functions/fnc_startDragPFH.sqf
+++ b/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.
-if (ACE_time > _timeOut) exitWith {
- TRACE_4("timeout",_unit,_target,_timeOut,ACE_time);
+// timeout. Do nothing. Quit. CBA_missionTime, because anim length is linked to ingame time.
+if (CBA_missionTime > _timeOut) exitWith {
+ 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;
diff --git a/addons/explosives/ACE_Triggers.hpp b/addons/explosives/ACE_Triggers.hpp
index 280906432f..145ae0804e 100644
--- a/addons/explosives/ACE_Triggers.hpp
+++ b/addons/explosives/ACE_Triggers.hpp
@@ -11,52 +11,52 @@ onSetup parameters:
class Command {
isAttachable = 1;
displayName = CSTRING(clacker_displayName);
- picture = PATHTOF(Data\UI\Clacker.paa);
+ picture = QPATHTOF(Data\UI\Clacker.paa);
onPlace = QUOTE(_this call FUNC(AddClacker);false);
requires[] = {"ACE_Clacker"};
};
class MK16_Transmitter: Command {
isAttachable = 1;
displayName = CSTRING(M152_displayName);
- picture = PATHTOF(Data\UI\MK16_Reciever_ca.paa);
+ picture = QPATHTOF(Data\UI\MK16_Reciever_ca.paa);
requires[] = {"ACE_M26_Clacker"};
};
class DeadManSwitch: Command {
isAttachable = 1;
displayName = CSTRING(DeadManSwitch_displayName);
- picture = PATHTOF(Data\UI\DeadmanSwitch.paa);
+ picture = QPATHTOF(Data\UI\DeadmanSwitch.paa);
requires[] = {"ACE_DeadManSwitch"};
};
class Cellphone: Command {
isAttachable = 1;
displayName = CSTRING(cellphone_displayName);
- picture = PATHTOF(Data\UI\Cellphone_UI.paa);
+ picture = QPATHTOF(Data\UI\Cellphone_UI.paa);
onPlace = QUOTE(_this call FUNC(addCellphoneIED);false);
requires[] = {"ACE_Cellphone"};
};
class PressurePlate {
isAttachable = 0;
displayName = CSTRING(PressurePlate);
- picture = PATHTOF(Data\UI\PressurePlate.paa);
+ picture = QPATHTOF(Data\UI\PressurePlate.paa);
onPlace = QUOTE(false);
};
class IRSensor {
isAttachable = 0;
displayName = CSTRING(IRSensor);
- picture = PATHTOF(Data\UI\PressurePlate.paa);
+ picture = QPATHTOF(Data\UI\PressurePlate.paa);
onPlace = "false";
};
class Timer {
isAttachable = 1;
displayName = CSTRING(timerName);
- picture = PATHTOF(data\UI\Timer.paa);
+ picture = QPATHTOF(data\UI\Timer.paa);
onPlace = QUOTE([ARR_2(_this select 1,(_this select 3) select 0)] call FUNC(startTimer);false);
onSetup = QUOTE(_this call FUNC(openTimerSetUI);true);
};
class Tripwire {
isAttachable = 0;
displayName = CSTRING(TripWire);
- picture = PATHTOF(Data\UI\Tripwire.paa);
+ picture = QPATHTOF(Data\UI\Tripwire.paa);
onPlace = "false";
};
};
diff --git a/addons/explosives/CfgModule.hpp b/addons/explosives/CfgModule.hpp
index b651903f59..a4e0d8dbd2 100644
--- a/addons/explosives/CfgModule.hpp
+++ b/addons/explosives/CfgModule.hpp
@@ -3,11 +3,11 @@ class ACE_ModuleExplosive: ACE_Module {
author = ECSTRING(common,ACETeam);
category = "ACE";
displayName = CSTRING(Module_DisplayName);
- function = QUOTE(FUNC(module));
+ function = QFUNC(module);
scope = 2;
isGlobal = 1;
isSingular = 1;
- icon = PATHTOF(UI\Icon_Module_Explosives_ca.paa);
+ icon = QPATHTOF(UI\Icon_Module_Explosives_ca.paa);
class Arguments {
class RequireSpecialist {
displayName = CSTRING(RequireSpecialist_DisplayName);
diff --git a/addons/explosives/CfgVehicles.hpp b/addons/explosives/CfgVehicles.hpp
index 3db6546208..68d0ac1427 100644
--- a/addons/explosives/CfgVehicles.hpp
+++ b/addons/explosives/CfgVehicles.hpp
@@ -12,7 +12,7 @@ class CfgVehicles {
exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"};
showDisabled = 1;
priority = 4;
- icon = PATHTOF(UI\Explosives_Menu_ca.paa);
+ icon = QPATHTOF(UI\Explosives_Menu_ca.paa);
insertChildren = QUOTE([_player] call FUNC(addTransmitterActions););
//Sub-menu items
class ACE_Place {
@@ -22,7 +22,7 @@ class CfgVehicles {
insertChildren = QUOTE([_player] call FUNC(addExplosiveActions););
exceptions[] = {"isNotSwimming"};
showDisabled = 1;
- icon = PATHTOF(UI\Place_Explosive_ca.paa);
+ icon = QPATHTOF(UI\Place_Explosive_ca.paa);
priority = 1;
};
class ACE_Cellphone {
@@ -31,7 +31,7 @@ class CfgVehicles {
statement = "closeDialog 0;createDialog 'Rsc_ACE_PhoneInterface';";
exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"};
showDisabled = 0;
- icon = PATHTOF(Data\UI\Cellphone_UI.paa);
+ icon = QPATHTOF(Data\UI\Cellphone_UI.paa);
priority = 0.8;
};
};
@@ -63,7 +63,7 @@ class CfgVehicles {
statement = QUOTE([ARR_2(_player,_target)] call FUNC(startDefuse););
exceptions[] = {"isNotSwimming"};
showDisabled = 0;
- icon = PATHTOF(UI\Defuse_ca.paa);
+ icon = QPATHTOF(UI\Defuse_ca.paa);
priority = 0.8;
};
};
@@ -96,7 +96,7 @@ class CfgVehicles {
showDisabled = 0;
exceptions[] = {"isNotSwimming"};
priority = 5;
- icon = QUOTE(PATHTOF(UI\Explosives_Menu_ca.paa));
+ icon = QPATHTOF(UI\Explosives_Menu_ca.paa);
};
class ACE_PickUp {
selection = "";
diff --git a/addons/explosives/CfgWeapons.hpp b/addons/explosives/CfgWeapons.hpp
index cd900b2da3..a3f3b32d4c 100644
--- a/addons/explosives/CfgWeapons.hpp
+++ b/addons/explosives/CfgWeapons.hpp
@@ -11,8 +11,8 @@ class CfgWeapons {
scope = 2;
displayName = CSTRING(clacker_displayName);
descriptionShort = CSTRING(clacker_description);
- picture = PATHTOF(Data\UI\Clacker.paa);
- model = QUOTE(PATHTOF(data\ace_m57.p3d));
+ picture = QPATHTOF(Data\UI\Clacker.paa);
+ model = QPATHTOF(data\ace_m57.p3d);
GVAR(Range) = 250;
GVAR(Detonator) = 1;
GVAR(triggerType) = "Command";
@@ -24,7 +24,7 @@ class CfgWeapons {
};
class ACE_M26_Clacker: ACE_Clacker {
displayName = CSTRING(M152_Clacker_displayName);
- picture = PATHTOF(Data\UI\MK26_Transmitter_ca.paa);
+ picture = QPATHTOF(Data\UI\MK26_Transmitter_ca.paa);
GVAR(Range) = 5000;
GVAR(triggerType) = "MK16_Transmitter";
};
@@ -32,7 +32,7 @@ class CfgWeapons {
scope = 2;
displayName = CSTRING(DefusalKit_displayName);
descriptionShort = CSTRING(DefusalKit_description);
- picture = PATHTOF(Data\UI\Pliers.paa);
+ picture = QPATHTOF(Data\UI\Pliers.paa);
model = "\A3\Structures_F\Items\Tools\Pliers_F.p3d";
class ItemInfo: ACE_ExplosiveItem {
@@ -44,7 +44,7 @@ class CfgWeapons {
scope = 2;
displayName = CSTRING(DeadManSwitch_displayName);
descriptionShort = CSTRING(DeadManSwitch_description);
- picture = PATHTOF(Data\UI\DeadmanSwitch.paa);
+ picture = QPATHTOF(Data\UI\DeadmanSwitch.paa);
model = "\A3\weapons_F\ammo\mag_univ.p3d";
GVAR(Range) = 100;
GVAR(Detonator) = 1;
@@ -59,7 +59,7 @@ class CfgWeapons {
scope = 2;
displayName = CSTRING(cellphone_displayName);
descriptionShort = CSTRING(cellphone_description);
- picture = PATHTOF(Data\UI\Cellphone_UI.paa);
+ picture = QPATHTOF(Data\UI\Cellphone_UI.paa);
model = "\A3\weapons_F\ammo\mag_univ.p3d";
GVAR(Range) = 15000;
GVAR(Detonator) = 1;
diff --git a/addons/explosives/ExplosivesUI.hpp b/addons/explosives/ExplosivesUI.hpp
index 45582a8564..cf97794d8f 100644
--- a/addons/explosives/ExplosivesUI.hpp
+++ b/addons/explosives/ExplosivesUI.hpp
@@ -113,7 +113,7 @@ class Rsc_ACE_PhoneInterface {
class controls {
class RscPicture_1200: RscPicture {
idc = 1200;
- text = PATHTOF(Data\UI\Cellphone_Background.paa);
+ text = QPATHTOF(Data\UI\Cellphone_Background.paa);
x = 0.231875 * safezoneW + safezoneX;
y = 0.104 * safezoneH + safezoneY;
w = 0.195937 * safezoneW;
diff --git a/addons/explosives/functions/fnc_addExplosiveActions.sqf b/addons/explosives/functions/fnc_addExplosiveActions.sqf
index e744af6bce..fc494a5fad 100644
--- a/addons/explosives/functions/fnc_addExplosiveActions.sqf
+++ b/addons/explosives/functions/fnc_addExplosiveActions.sqf
@@ -45,7 +45,7 @@ _children = [];
format ["Explosive_%1", _forEachIndex],
format [_name + " (%1)", _itemCount select _forEachIndex],
getText(_x >> "picture"),
- {[{_this call FUNC(setupExplosive)}, _this] call EFUNC(common,execNextFrame)},
+ {[{_this call FUNC(setupExplosive)}, _this] call CBA_fnc_execNextFrame},
{true},
{},
(configName _x)
diff --git a/addons/explosives/functions/fnc_detonateExplosive.sqf b/addons/explosives/functions/fnc_detonateExplosive.sqf
index a01f181635..b7f4893e52 100644
--- a/addons/explosives/functions/fnc_detonateExplosive.sqf
+++ b/addons/explosives/functions/fnc_detonateExplosive.sqf
@@ -49,6 +49,6 @@ if (getNumber (ConfigFile >> "CfgAmmo" >> typeOf (_item select 0) >> "TriggerWhe
if (!isNull _explosive) then {
_explosive setDamage 1;
};
-}, [_item select 0], (_item select 1)] call EFUNC(common,waitAndExecute);
+}, [_item select 0], (_item select 1)] call CBA_fnc_waitAndExecute;
_result
diff --git a/addons/explosives/functions/fnc_dialPhone.sqf b/addons/explosives/functions/fnc_dialPhone.sqf
index 44addcda9f..6bfeac8595 100644
--- a/addons/explosives/functions/fnc_dialPhone.sqf
+++ b/addons/explosives/functions/fnc_dialPhone.sqf
@@ -40,7 +40,7 @@ if (_unit == ace_player) then {
[{
playSound3D [QUOTE(PATHTO_R(Data\Audio\Cellphone_Ring.wss)),objNull, false, getPosASL (_this select 1),3.16228,1,75];
(_this select 0) setVariable [QGVAR(Dialing), false, true];
- }, [_unit,_explosive select 0], 0.25 * (count _arr - 4)] call EFUNC(common,waitAndExecute);
+ }, [_unit,_explosive select 0], 0.25 * (count _arr - 4)] call CBA_fnc_waitAndExecute;
[_explosive select 0,(0.25 * (count _arr - 1)) + (_explosive select 2)] call FUNC(startTimer);
};
};
diff --git a/addons/explosives/functions/fnc_setupExplosive.sqf b/addons/explosives/functions/fnc_setupExplosive.sqf
index 709ea688d5..6dd1094c6a 100644
--- a/addons/explosives/functions/fnc_setupExplosive.sqf
+++ b/addons/explosives/functions/fnc_setupExplosive.sqf
@@ -187,7 +187,7 @@ GVAR(TweakedAngle) = 0;
_unit removeMagazine _magClassname;
_unit playActionNow "PutDown";
_unit setVariable [QGVAR(PlantingExplosive), true];
- [{_this setVariable [QGVAR(PlantingExplosive), false]}, _unit, 1.5] call EFUNC(common,waitAndExecute);
+ [{_this setVariable [QGVAR(PlantingExplosive), false]}, _unit, 1.5] call CBA_fnc_waitAndExecute;
};
} else {
diff --git a/addons/explosives/functions/fnc_startDefuse.sqf b/addons/explosives/functions/fnc_startDefuse.sqf
index 84d7274069..35333ecc17 100644
--- a/addons/explosives/functions/fnc_startDefuse.sqf
+++ b/addons/explosives/functions/fnc_startDefuse.sqf
@@ -56,7 +56,7 @@ if (ACE_player != _unit) then {
[_unit, _target] call FUNC(defuseExplosive);
_unit enableAI "MOVE";
_unit enableAI "TARGET";
- }, [_unit, _target], _defuseTime] call EFUNC(common,waitAndExecute);
+ }, [_unit, _target], _defuseTime] call CBA_fnc_waitAndExecute;
};
} else {
_unit playActionNow _actionToPlay;
diff --git a/addons/explosives/functions/fnc_startTimer.sqf b/addons/explosives/functions/fnc_startTimer.sqf
index ca219ed13c..1f529d9765 100644
--- a/addons/explosives/functions/fnc_startTimer.sqf
+++ b/addons/explosives/functions/fnc_startTimer.sqf
@@ -25,4 +25,4 @@ TRACE_2("params",_explosive,_delay);
if (!isNull _explosive) then {
[_explosive, -1, [_explosive, 0]] call FUNC(detonateExplosive);
};
-}, [_explosive], _delay] call EFUNC(common,waitAndExecute);
+}, [_explosive], _delay] call CBA_fnc_waitAndExecute;
diff --git a/addons/fastroping/CfgMoves.hpp b/addons/fastroping/CfgMoves.hpp
index 94f3fe51f0..b978539432 100644
--- a/addons/fastroping/CfgMoves.hpp
+++ b/addons/fastroping/CfgMoves.hpp
@@ -9,7 +9,7 @@ class CfgMovesMaleSdr: CfgMovesBasic {
class States {
class Crew;
class ACE_FastRoping: Crew {
- file = QUOTE(PATHTOF(anim\fastroping.rtm));
+ file = QPATHTOF(anim\fastroping.rtm);
interpolateTo[] = {"Unconscious", 1};
disableWeapons = 1;
disableWeaponsLong = 1;
diff --git a/addons/fastroping/CfgVehicles.hpp b/addons/fastroping/CfgVehicles.hpp
index 9182064157..7434b5c2ea 100644
--- a/addons/fastroping/CfgVehicles.hpp
+++ b/addons/fastroping/CfgVehicles.hpp
@@ -20,9 +20,9 @@ class CfgVehicles {
class ACE_moduleEquipFRIES: ACE_Module {
scope = 2;
displayName = CSTRING(Module_FRIES_DisplayName);
- icon = QUOTE(PATHTOF(UI\Icon_Module_FRIES_ca.paa));
+ icon = QPATHTOF(UI\Icon_Module_FRIES_ca.paa);
category = "ACE";
- function = QUOTE(FUNC(moduleEquipFRIES));
+ function = QFUNC(moduleEquipFRIES);
functionPriority = 10;
isGlobal = 0;
isTriggerActivated = 0;
@@ -81,7 +81,7 @@ class CfgVehicles {
class ACE_friesAnchorBar: ACE_friesBase {
author = "jokoho48";
scope = 1;
- model = QUOTE(PATHTOF(data\friesAnchorBar.p3d));
+ model = QPATHTOF(data\friesAnchorBar.p3d);
animated = 1;
class AnimationSources {
class extendHookRight {
@@ -99,7 +99,7 @@ class CfgVehicles {
class ACE_friesGantry: ACE_friesBase {
author = "jokoho48";
scope = 1;
- model = QUOTE(PATHTOF(data\friesGantry.p3d));
+ model = QPATHTOF(data\friesGantry.p3d);
animated = 1;
class AnimationSources {
class adjustWidth {
@@ -152,7 +152,7 @@ class CfgVehicles {
class GVAR(helper): Helicopter_Base_F {
author = "KoffeinFlummi";
scope = 1;
- model = PATHTOF(data\helper.p3d);
+ model = QPATHTOF(data\helper.p3d);
class ACE_Actions {};
class Turrets {};
};
diff --git a/addons/fastroping/CfgWaypoints.hpp b/addons/fastroping/CfgWaypoints.hpp
index 4c4da2a7cb..f3303c28ff 100644
--- a/addons/fastroping/CfgWaypoints.hpp
+++ b/addons/fastroping/CfgWaypoints.hpp
@@ -4,8 +4,8 @@ class CfgWaypoints {
class Fastrope {
displayName = CSTRING(Waypoint_Fastrope);
displayNameDebug = "Fastrope";
- file = QUOTE(PATHTOF(functions\fnc_deployAIWaypoint.sqf));
- icon = QUOTE(PATHTOF(UI\Icon_Waypoint.paa));
+ file = QPATHTOF(functions\fnc_deployAIWaypoint.sqf);
+ icon = QPATHTOF(UI\Icon_Waypoint.paa);
};
};
};
diff --git a/addons/fastroping/functions/fnc_checkVehicleThread.sqf b/addons/fastroping/functions/fnc_checkVehicleThread.sqf
index 0cd0ca3234..38a2cad8c6 100644
--- a/addons/fastroping/functions/fnc_checkVehicleThread.sqf
+++ b/addons/fastroping/functions/fnc_checkVehicleThread.sqf
@@ -21,5 +21,5 @@ params ["_vehicle", "_fries"];
if (isNull _vehicle) then {
deleteVehicle _fries;
} else {
- [FUNC(checkVehicleThread), _this, 5] call EFUNC(common,waitAndExecute);
+ [FUNC(checkVehicleThread), _this, 5] call CBA_fnc_waitAndExecute;
};
diff --git a/addons/fastroping/functions/fnc_cutRopes.sqf b/addons/fastroping/functions/fnc_cutRopes.sqf
index dcabda56ba..d619a24297 100644
--- a/addons/fastroping/functions/fnc_cutRopes.sqf
+++ b/addons/fastroping/functions/fnc_cutRopes.sqf
@@ -36,7 +36,7 @@ _deployedRopes = _vehicle getVariable [QGVAR(deployedRopes), []];
//Only delete the hook first so the rope falls down.
//Note: ropeDetach was used here before, but the command seems a bit broken.
deleteVehicle _hook;
- [{{deleteVehicle _x} count _this}, [_ropeTop, _ropeBottom, _dummy], 60] call EFUNC(common,waitAndExecute);
+ [{{deleteVehicle _x} count _this}, [_ropeTop, _ropeBottom, _dummy], 60] call CBA_fnc_waitAndExecute;
} count _deployedRopes;
_vehicle setVariable [QGVAR(deployedRopes), [], true];
@@ -50,4 +50,4 @@ if (isText (_config >> QGVAR(onCut))) then {
[{
_this setVariable [QGVAR(deploymentStage), 0, true];
-}, _vehicle, _waitTime] call EFUNC(common,waitAndExecute);
+}, _vehicle, _waitTime] call CBA_fnc_waitAndExecute;
diff --git a/addons/fastroping/functions/fnc_deployAI.sqf b/addons/fastroping/functions/fnc_deployAI.sqf
index dd4bfe4e71..843f23cdb5 100644
--- a/addons/fastroping/functions/fnc_deployAI.sqf
+++ b/addons/fastroping/functions/fnc_deployAI.sqf
@@ -64,7 +64,7 @@ _deployTime = 0;
if (getText (_config >> QGVAR(onPrepare)) != "") then {
_deployTime = [_vehicle] call (missionNamespace getVariable (getText (_config >> QGVAR(onPrepare))));
};
-[{[_this] call FUNC(deployRopes)}, _vehicle, _deployTime] call EFUNC(common,waitAndExecute);
+[{[_this] call FUNC(deployRopes)}, _vehicle, _deployTime] call CBA_fnc_waitAndExecute;
driver _vehicle disableAI "MOVE";
DFUNC(deployAIRecursive) = {
@@ -80,8 +80,8 @@ DFUNC(deployAIRecursive) = {
params ["_vehicle"];
private _deployedRopes = _vehicle getVariable [QGVAR(deployedRopes), []];
({!(_x select 5)} count (_deployedRopes)) > 0
- }, FUNC(deployAIRecursive), _this] call EFUNC(common,waitUntilAndExecute);
- }, [_vehicle, _unitsToDeploy], 1] call EFUNC(common,waitAndExecute);
+ }, FUNC(deployAIRecursive), _this] call CBA_fnc_waitUntilAndExecute;
+ }, [_vehicle, _unitsToDeploy], 1] call CBA_fnc_waitAndExecute;
} else {
[{
private _deployedRopes = _this getVariable [QGVAR(deployedRopes), []];
@@ -89,8 +89,8 @@ DFUNC(deployAIRecursive) = {
}, {
[_this] call FUNC(cutRopes);
driver _this enableAI "MOVE";
- }, _vehicle] call EFUNC(common,waitUntilAndExecute);
+ }, _vehicle] call CBA_fnc_waitUntilAndExecute;
};
};
-[FUNC(deployAIRecursive), [_vehicle, _unitsToDeploy], _deployTime + 4] call EFUNC(common,waitAndExecute);
+[FUNC(deployAIRecursive), [_vehicle, _unitsToDeploy], _deployTime + 4] call CBA_fnc_waitAndExecute;
diff --git a/addons/fastroping/functions/fnc_equipFRIES.sqf b/addons/fastroping/functions/fnc_equipFRIES.sqf
index eaf603f938..6d714611be 100644
--- a/addons/fastroping/functions/fnc_equipFRIES.sqf
+++ b/addons/fastroping/functions/fnc_equipFRIES.sqf
@@ -35,6 +35,6 @@ if !(isNumber (_config >> QGVAR(enabled))) then {
[_vehicle] call FUNC(cutRopes);
};
}];
- [FUNC(checkVehicleThread), [_vehicle, _fries], 5] call EFUNC(common,waitAndExecute);
+ [FUNC(checkVehicleThread), [_vehicle, _fries], 5] call CBA_fnc_waitAndExecute;
};
};
diff --git a/addons/fastroping/functions/fnc_fastRope.sqf b/addons/fastroping/functions/fnc_fastRope.sqf
index b941bc4c13..0db73f4fce 100644
--- a/addons/fastroping/functions/fnc_fastRope.sqf
+++ b/addons/fastroping/functions/fnc_fastRope.sqf
@@ -37,4 +37,4 @@ _vehicle setVariable [QGVAR(deployedRopes), _deployedRopes, true];
//Start server PFH asap
[QGVAR(startFastRope), [_unit, _vehicle, _usableRope, _usableRopeIndex, false]] call CBA_fnc_serverEvent;
moveOut _unit;
-[FUNC(fastRopeLocalPFH), 0, [_unit, _vehicle, _usableRope, _usableRopeIndex, ACE_diagTime]] call CBA_fnc_addPerFrameHandler;
+[FUNC(fastRopeLocalPFH), 0, [_unit, _vehicle, _usableRope, _usableRopeIndex, diag_tickTime]] call CBA_fnc_addPerFrameHandler;
diff --git a/addons/fastroping/functions/fnc_fastRopeLocalPFH.sqf b/addons/fastroping/functions/fnc_fastRopeLocalPFH.sqf
index 03df460f55..3a1e8d5707 100644
--- a/addons/fastroping/functions/fnc_fastRopeLocalPFH.sqf
+++ b/addons/fastroping/functions/fnc_fastRopeLocalPFH.sqf
@@ -43,7 +43,7 @@ if (isNull attachedTo _unit) exitWith {
[_pfhHandle] call CBA_fnc_removePerFrameHandler;
};
-if (ACE_diagTime > _timeToPlayRopeSound) then {
+if (diag_tickTime > _timeToPlayRopeSound) then {
_arguments set [4, (_timeToPlayRopeSound + 1)];
playSound QGVAR(Rope);
};
diff --git a/addons/fastroping/functions/fnc_onCutCommon.sqf b/addons/fastroping/functions/fnc_onCutCommon.sqf
index 404f94e9d8..004c176b65 100644
--- a/addons/fastroping/functions/fnc_onCutCommon.sqf
+++ b/addons/fastroping/functions/fnc_onCutCommon.sqf
@@ -30,7 +30,7 @@ if !(isNull _fries) then {
_this animate ["dvere1_posunZ", 0];
_this animate ["dvere2_posunZ", 0];
_this setVariable [QGVAR(doorsLocked), false, true];
- }, _vehicle, 2] call EFUNC(common,waitAndExecute);
+ }, _vehicle, 2] call CBA_fnc_waitAndExecute;
4
} else {
diff --git a/addons/fastroping/functions/fnc_onPrepareCommon.sqf b/addons/fastroping/functions/fnc_onPrepareCommon.sqf
index 5e8bf931bb..37eb6c7eb8 100644
--- a/addons/fastroping/functions/fnc_onPrepareCommon.sqf
+++ b/addons/fastroping/functions/fnc_onPrepareCommon.sqf
@@ -35,7 +35,7 @@ if !(isNull _fries) then {
[{
_this animate ["extendHookRight", 1];
_this animate ["extendHookLeft", 1];
- }, _fries, 2] call EFUNC(common,waitAndExecute);
+ }, _fries, 2] call CBA_fnc_waitAndExecute;
_waitTime = 4;
};
diff --git a/addons/fastroping/functions/fnc_prepareFRIES.sqf b/addons/fastroping/functions/fnc_prepareFRIES.sqf
index 4896259014..e4bce8458c 100644
--- a/addons/fastroping/functions/fnc_prepareFRIES.sqf
+++ b/addons/fastroping/functions/fnc_prepareFRIES.sqf
@@ -29,4 +29,4 @@ if (isText (_config >> QGVAR(onPrepare))) then {
[{
_this setVariable [QGVAR(deploymentStage), 2, true];
-}, _vehicle, _waitTime] call EFUNC(common,waitAndExecute);
+}, _vehicle, _waitTime] call CBA_fnc_waitAndExecute;
diff --git a/addons/fcs/functions/fnc_keyDown.sqf b/addons/fcs/functions/fnc_keyDown.sqf
index e61baed136..3c4943badf 100644
--- a/addons/fcs/functions/fnc_keyDown.sqf
+++ b/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
diff --git a/addons/fcs/functions/fnc_keyUp.sqf b/addons/fcs/functions/fnc_keyUp.sqf
index 113d369a3c..a07f5d5d35 100644
--- a/addons/fcs/functions/fnc_keyUp.sqf
+++ b/addons/fcs/functions/fnc_keyUp.sqf
@@ -44,10 +44,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;
diff --git a/addons/finger/CfgVehicles.hpp b/addons/finger/CfgVehicles.hpp
index 74229968e4..8125e7f2f5 100644
--- a/addons/finger/CfgVehicles.hpp
+++ b/addons/finger/CfgVehicles.hpp
@@ -4,7 +4,7 @@ class CfgVehicles {
scope = 2;
category = "ACE";
displayName = CSTRING(moduleSettings_displayName);
- icon = QUOTE(PATHTOF(UI\Icon_Module_finger_ca.paa));
+ icon = QPATHTOF(UI\Icon_Module_finger_ca.paa);
function = QFUNC(moduleSettings);
isGlobal = 0;
isSingular = 1;
diff --git a/addons/finger/functions/fnc_incomingFinger.sqf b/addons/finger/functions/fnc_incomingFinger.sqf
index 02c870a519..0b21bd4930 100644
--- a/addons/finger/functions/fnc_incomingFinger.sqf
+++ b/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 {
diff --git a/addons/finger/functions/fnc_keyPress.sqf b/addons/finger/functions/fnc_keyPress.sqf
index e957a1f72d..d0d8bce811 100644
--- a/addons/finger/functions/fnc_keyPress.sqf
+++ b/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;
diff --git a/addons/finger/functions/fnc_perFrameEH.sqf b/addons/finger/functions/fnc_perFrameEH.sqf
index 61c8f077ab..41fb718146 100644
--- a/addons/finger/functions/fnc_perFrameEH.sqf
+++ b/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 {
@@ -41,7 +41,7 @@ _iconSize = BASE_SIZE * _fovCorrection;
_drawColor set [3, ((_drawColor select 3) * (_timeLeftToShow / 0.5))];
};
- drawIcon3D [QUOTE(PATHTOF(UI\fp_icon2.paa)), _drawColor, _pos, _iconSize, _iconSize, 0, _name, 1, 0.03, "RobotoCondensed"];
+ drawIcon3D [QPATHTOF(UI\fp_icon2.paa), _drawColor, _pos, _iconSize, _iconSize, 0, _name, 1, 0.03, "RobotoCondensed"];
};
} count (GVAR(fingersHash) select 0);
diff --git a/addons/flashlights/CfgWeapons.hpp b/addons/flashlights/CfgWeapons.hpp
index 09fe70d764..84edac6c85 100644
--- a/addons/flashlights/CfgWeapons.hpp
+++ b/addons/flashlights/CfgWeapons.hpp
@@ -17,8 +17,8 @@ class CfgWeapons {
class ACE_Flashlight_MX991: ACE_ItemCore {
displayName = CSTRING(MX991_DisplayName);
descriptionShort = CSTRING(MX991_Description);
- model = QUOTE(PATHTOF(data\MX_991.p3d));
- picture = PATHTOF(UI\mx991_ca.paa);
+ model = QPATHTOF(data\MX_991.p3d);
+ picture = QPATHTOF(UI\mx991_ca.paa);
scope = 2;
class ItemInfo: InventoryItem_Base_F {
mass = 1;
@@ -32,8 +32,8 @@ class CfgWeapons {
class ACE_Flashlight_KSF1: ACE_ItemCore {
displayName = CSTRING(KSF1_DisplayName);
descriptionShort = CSTRING(KSF1_Description);
- model = QUOTE(PATHTOF(data\KSF_1.p3d));
- picture = PATHTOF(UI\ksf1_ca.paa);
+ model = QPATHTOF(data\KSF_1.p3d);
+ picture = QPATHTOF(UI\ksf1_ca.paa);
scope = 2;
class ItemInfo: InventoryItem_Base_F {
mass = 1;
@@ -47,8 +47,8 @@ class CfgWeapons {
class ACE_Flashlight_XL50: ACE_ItemCore {
displayName = CSTRING(XL50_DisplayName);
descriptionShort = CSTRING(XL50_Description);
- model = QUOTE(PATHTOF(data\Maglight.p3d));
- picture = PATHTOF(UI\xl50_ca.paa);
+ model = QPATHTOF(data\Maglight.p3d);
+ picture = QPATHTOF(UI\xl50_ca.paa);
scope = 2;
class ItemInfo: InventoryItem_Base_F {
mass = 1;
diff --git a/addons/flashsuppressors/CfgWeapons.hpp b/addons/flashsuppressors/CfgWeapons.hpp
index ae957ba4b0..e807dc2ae9 100644
--- a/addons/flashsuppressors/CfgWeapons.hpp
+++ b/addons/flashsuppressors/CfgWeapons.hpp
@@ -29,32 +29,73 @@ class asdg_MuzzleSlot_45ACP_SMG: asdg_MuzzleSlot { // for .45ACP universal mount
ACE_muzzle_mzls_smg_01 = 1;
};
};
+class asdg_MuzzleSlot_762MG: asdg_MuzzleSlot { // for 7.62, 6.5 and 5.56 universal mount MG suppressors
+ class compatibleItems {
+ ACE_muzzle_mzls_B = 1;
+ };
+};
class MuzzleSlot;
class CfgWeapons {
-
- /* MX */
-
- class Rifle;
- class Rifle_Base_F: Rifle {
+ class Rifle_Base_F;
+
+ class Rifle_Long_Base_F: Rifle_Base_F {
class WeaponSlotsInfo;
};
- class arifle_MX_Base_F: Rifle_Base_F {
+ /* MX */
+ class arifle_MX_Base_F: Rifle_Base_F {
+ class WeaponSlotsInfo;
+ };
+
+ class arifle_MXC_F: arifle_MX_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
- class MuzzleSlot: MuzzleSlot {
- compatibleItems[] += {"ACE_muzzle_mzls_H"};
+ class MuzzleSlot: asdg_MuzzleSlot_762 {
+ class compatibleItems: compatibleItems {
+ ACE_muzzle_mzls_H = 1;
+ ACE_muzzle_mzls_B = 0;
+ };
+ };
+ };
+ };
+ class arifle_MX_F: arifle_MX_Base_F {
+ class WeaponSlotsInfo: WeaponSlotsInfo {
+ class MuzzleSlot: asdg_MuzzleSlot_762 {
+ class compatibleItems: compatibleItems {
+ ACE_muzzle_mzls_H = 1;
+ ACE_muzzle_mzls_B = 0;
+ };
+ };
+ };
+ };
+ class arifle_MX_GL_F: arifle_MX_Base_F {
+ class WeaponSlotsInfo: WeaponSlotsInfo {
+ class MuzzleSlot: asdg_MuzzleSlot_762 {
+ class compatibleItems: compatibleItems {
+ ACE_muzzle_mzls_H = 1;
+ ACE_muzzle_mzls_B = 0;
+ };
};
};
};
-
class arifle_MX_SW_F: arifle_MX_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
- class MuzzleSlot: MuzzleSlot {
- // Shit is broken again
- //compatibleItems[] += {"ACE_muzzle_mzls_H"};
- compatibleItems[] = {"muzzle_snds_H","muzzle_snds_H_SW","ACE_muzzle_mzls_H"};
+ class MuzzleSlot: asdg_MuzzleSlot_762MG {
+ class compatibleItems: compatibleItems {
+ ACE_muzzle_mzls_H = 1;
+ ACE_muzzle_mzls_B = 0;
+ };
+ };
+ };
+ };
+ class arifle_MXM_F: arifle_MX_Base_F {
+ class WeaponSlotsInfo: WeaponSlotsInfo {
+ class MuzzleSlot: asdg_MuzzleSlot_762 {
+ class compatibleItems: compatibleItems {
+ ACE_muzzle_mzls_H = 1;
+ ACE_muzzle_mzls_B = 0;
+ };
};
};
};
@@ -62,41 +103,49 @@ class CfgWeapons {
/* Katiba */
- class arifle_katiba_Base_F: Rifle_Base_F {
+ class arifle_Katiba_Base_F: Rifle_Base_F {
+ class WeaponSlotsInfo;
+ };
+ class arifle_Katiba_F: arifle_Katiba_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
- class MuzzleSlot: MuzzleSlot {
- compatibleItems[] += {"ACE_muzzle_mzls_H"};
+ class MuzzleSlot: asdg_MuzzleSlot_762 {
+ class compatibleItems: compatibleItems {
+ ACE_muzzle_mzls_H = 1;
+ ACE_muzzle_mzls_B = 0;
+ };
+ };
+ };
+ };
+ class arifle_Katiba_C_F: arifle_Katiba_Base_F {
+ class WeaponSlotsInfo: WeaponSlotsInfo {
+ class MuzzleSlot: asdg_MuzzleSlot_762 {
+ class compatibleItems: compatibleItems {
+ ACE_muzzle_mzls_H = 1;
+ ACE_muzzle_mzls_B = 0;
+ };
+ };
+ };
+ };
+ class arifle_Katiba_GL_F: arifle_Katiba_Base_F {
+ class WeaponSlotsInfo: WeaponSlotsInfo {
+ class MuzzleSlot: asdg_MuzzleSlot_762 {
+ class compatibleItems: compatibleItems {
+ ACE_muzzle_mzls_H = 1;
+ ACE_muzzle_mzls_B = 0;
+ };
};
};
};
/* Other */
-
- class Rifle_Long_Base_F: Rifle_Base_F {
- class WeaponSlotsInfo;
- };
-
- class DMR_01_base_F: Rifle_Long_Base_F {
- class WeaponSlotsInfo: WeaponSlotsInfo {
- class MuzzleSlot: MuzzleSlot {
- compatibleItems[] += {"ACE_muzzle_mzls_B"};
- };
- };
- };
-
class LMG_Mk200_F: Rifle_Long_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
- class MuzzleSlot: MuzzleSlot {
- compatibleItems[] += {"ACE_muzzle_mzls_H"};
- };
- };
- };
-
- class LMG_Zafir_F: Rifle_Long_Base_F {
- class WeaponSlotsInfo: WeaponSlotsInfo {
- class MuzzleSlot: MuzzleSlot {
- compatibleItems[] += {"ACE_muzzle_mzls_B"};
+ class MuzzleSlot: asdg_MuzzleSlot_762MG {
+ class compatibleItems: compatibleItems {
+ ACE_muzzle_mzls_H = 1;
+ ACE_muzzle_mzls_B = 0;
+ };
};
};
};
diff --git a/addons/fonts/CfgFontFamilies.hpp b/addons/fonts/CfgFontFamilies.hpp
index 963a35fa8e..80c8114624 100644
--- a/addons/fonts/CfgFontFamilies.hpp
+++ b/addons/fonts/CfgFontFamilies.hpp
@@ -2,38 +2,38 @@ class CfgFontFamilies
{
class PixelSplitterBold
{
- fonts[] = { PATHTOF(PixelSplitterBold\PixelSplitterBold6),
- PATHTOF(PixelSplitterBold\PixelSplitterBold7),
- PATHTOF(PixelSplitterBold\PixelSplitterBold8),
- PATHTOF(PixelSplitterBold\PixelSplitterBold9),
- PATHTOF(PixelSplitterBold\PixelSplitterBold10),
- PATHTOF(PixelSplitterBold\PixelSplitterBold11),
- PATHTOF(PixelSplitterBold\PixelSplitterBold12),
- PATHTOF(PixelSplitterBold\PixelSplitterBold13),
- PATHTOF(PixelSplitterBold\PixelSplitterBold14),
- PATHTOF(PixelSplitterBold\PixelSplitterBold15),
- PATHTOF(PixelSplitterBold\PixelSplitterBold16),
- PATHTOF(PixelSplitterBold\PixelSplitterBold17),
- PATHTOF(PixelSplitterBold\PixelSplitterBold18),
- PATHTOF(PixelSplitterBold\PixelSplitterBold19),
- PATHTOF(PixelSplitterBold\PixelSplitterBold20),
- PATHTOF(PixelSplitterBold\PixelSplitterBold21),
- PATHTOF(PixelSplitterBold\PixelSplitterBold22),
- PATHTOF(PixelSplitterBold\PixelSplitterBold23),
- PATHTOF(PixelSplitterBold\PixelSplitterBold24),
- PATHTOF(PixelSplitterBold\PixelSplitterBold25),
- PATHTOF(PixelSplitterBold\PixelSplitterBold26),
- PATHTOF(PixelSplitterBold\PixelSplitterBold27),
- PATHTOF(PixelSplitterBold\PixelSplitterBold28),
- PATHTOF(PixelSplitterBold\PixelSplitterBold29),
- PATHTOF(PixelSplitterBold\PixelSplitterBold30),
- PATHTOF(PixelSplitterBold\PixelSplitterBold31),
- PATHTOF(PixelSplitterBold\PixelSplitterBold34),
- PATHTOF(PixelSplitterBold\PixelSplitterBold35),
- PATHTOF(PixelSplitterBold\PixelSplitterBold37),
- PATHTOF(PixelSplitterBold\PixelSplitterBold46)
+ fonts[] = { QPATHTOF(PixelSplitterBold\PixelSplitterBold6),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold7),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold8),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold9),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold10),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold11),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold12),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold13),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold14),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold15),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold16),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold17),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold18),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold19),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold20),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold21),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold22),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold23),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold24),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold25),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold26),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold27),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold28),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold29),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold30),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold31),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold34),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold35),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold37),
+ QPATHTOF(PixelSplitterBold\PixelSplitterBold46)
};
spaceWidth = 0.5;
spacing = 0.065;
};
-};
\ No newline at end of file
+};
diff --git a/addons/frag/functions/fnc_addTrack.sqf b/addons/frag/functions/fnc_addTrack.sqf
index 680dc31c37..922e37e719 100644
--- a/addons/frag/functions/fnc_addTrack.sqf
+++ b/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;
diff --git a/addons/frag/functions/fnc_frago.sqf b/addons/frag/functions/fnc_frago.sqf
index 8c72ae8bac..64e82b6f83 100644
--- a/addons/frag/functions/fnc_frago.sqf
+++ b/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);
\ No newline at end of file
diff --git a/addons/frag/functions/fnc_spallHP.sqf b/addons/frag/functions/fnc_spallHP.sqf
index 3756bb1416..09008c97cb 100644
--- a/addons/frag/functions/fnc_spallHP.sqf
+++ b/addons/frag/functions/fnc_spallHP.sqf
@@ -21,7 +21,7 @@ if ((_this select 0) <= (count GVAR(spallHPData))) then {
// diag_log text format["%1: %2", _forEachIndex, _x];
// } forEach _hp;
// } forEach (_this select 1);
- [DFUNC(doSpall), [_this, _forEachIndex]] call EFUNC(common,execNextFrame);
+ [DFUNC(doSpall), [_this, _forEachIndex]] call CBA_fnc_execNextFrame;
// player sideChat "WEEE";
} forEach (_this select 1);
};
diff --git a/addons/frag/functions/fnc_spallTrack.sqf b/addons/frag/functions/fnc_spallTrack.sqf
index afe4bc1931..3a02d2bd04 100644
--- a/addons/frag/functions/fnc_spallTrack.sqf
+++ b/addons/frag/functions/fnc_spallTrack.sqf
@@ -22,7 +22,7 @@ if (count _intersectsWith > 0) then {
if(!(_x in _foundObjects)) then {
// diag_log text format["Adding HP: %1", _x];
_index = (count GVAR(spallHPData));
- _hpId = _x addEventHandler ["hitPart", compile format["[%1, _this] call " + QUOTE(FUNC(spallHP)), _index]];
+ _hpId = _x addEventHandler ["hitPart", compile format["[%1, _this] call " + QFUNC(spallHP), _index]];
_foundObjects set[(count _foundObjects), _x];
_foundObjectHPIds set[(count _foundObjectHPIds), _hpId];
_data = [_hpId, _x, typeOf _round, _round, _curPos, _velocity, 0, _foundObjects, _foundObjectHPIds];
diff --git a/addons/gestures/CfgVehicles.hpp b/addons/gestures/CfgVehicles.hpp
index 8294f43759..2c099bcc45 100644
--- a/addons/gestures/CfgVehicles.hpp
+++ b/addons/gestures/CfgVehicles.hpp
@@ -9,7 +9,7 @@ class CfgVehicles {
statement = "";
showDisabled = 1;
priority = 3.5;
- icon = PATHTOF(UI\gestures_ca.paa);
+ icon = QPATHTOF(UI\gestures_ca.paa);
class GVAR(Advance) {
displayName = CSTRING(Advance);
diff --git a/addons/gestures/XEH_missionDisplayLoad.sqf b/addons/gestures/XEH_missionDisplayLoad.sqf
index 17ddf32557..856f361d3a 100644
--- a/addons/gestures/XEH_missionDisplayLoad.sqf
+++ b/addons/gestures/XEH_missionDisplayLoad.sqf
@@ -25,7 +25,7 @@ _display displayAddEventHandler ["KeyDown", {
};
TRACE_2("Reloading, blocking gestures",_weapon,_duration);
- [{GVAR(ReloadMutex) = true;}, [], _duration] call EFUNC(common,waitAndExecute);
+ [{GVAR(ReloadMutex) = true;}, [], _duration] call CBA_fnc_waitAndExecute;
};
};
false
diff --git a/addons/gestures/cfgMovesBasic.hpp b/addons/gestures/cfgMovesBasic.hpp
index 50a835abe6..30e2d4d2dd 100644
--- a/addons/gestures/cfgMovesBasic.hpp
+++ b/addons/gestures/cfgMovesBasic.hpp
@@ -126,75 +126,75 @@ class CfgGesturesMale {
};
class GVAR(forward): GVAR(Base) {
- file = QUOTE(PATHTOF(anim\ace_forward.rtm));
+ file = QPATHTOF(anim\ace_forward.rtm);
speed = 1;
};
class GVAR(forwardStandLowered): GVAR(forward) {
- file = QUOTE(PATHTOF(anim\ace_forward_stand_lowered.rtm));
+ file = QPATHTOF(anim\ace_forward_stand_lowered.rtm);
};
class GVAR(freeze): GVAR(forward) {
- file = QUOTE(PATHTOF(anim\ace_freeze.rtm));
+ file = QPATHTOF(anim\ace_freeze.rtm);
speed = 0.6;
};
class GVAR(freezeStandLowered): GVAR(freeze) {
- file = QUOTE(PATHTOF(anim\ace_freeze_stand_lowered.rtm));
+ file = QPATHTOF(anim\ace_freeze_stand_lowered.rtm);
};
class GVAR(cover): GVAR(forward) {
- file = QUOTE(PATHTOF(anim\ace_cover.rtm));
+ file = QPATHTOF(anim\ace_cover.rtm);
speed = 0.8;
};
class GVAR(coverStandLowered): GVAR(cover) {
- file = QUOTE(PATHTOF(anim\ace_cover_stand_lowered.rtm));
+ file = QPATHTOF(anim\ace_cover_stand_lowered.rtm);
};
class GVAR(regroup): GVAR(forward) {
- file = QUOTE(PATHTOF(anim\ace_regroup.rtm));
+ file = QPATHTOF(anim\ace_regroup.rtm);
speed = 0.8;
};
class GVAR(regroupStandLowered): GVAR(regroup) {
- file = QUOTE(PATHTOF(anim\ace_regroup_stand_lowered.rtm));
+ file = QPATHTOF(anim\ace_regroup_stand_lowered.rtm);
};
class GVAR(engage): GVAR(forward) {
- file = QUOTE(PATHTOF(anim\ace_engage.rtm));
+ file = QPATHTOF(anim\ace_engage.rtm);
speed = 0.9;
};
class GVAR(engageStandLowered): GVAR(engage) {
- file = QUOTE(PATHTOF(anim\ace_engage_stand_lowered.rtm));
+ file = QPATHTOF(anim\ace_engage_stand_lowered.rtm);
};
class GVAR(point): GVAR(forward) {
- file = QUOTE(PATHTOF(anim\ace_point.rtm));
+ file = QPATHTOF(anim\ace_point.rtm);
speed = 0.8;
};
class GVAR(pointStandLowered): GVAR(point) {
- file = QUOTE(PATHTOF(anim\ace_point_stand_lowered.rtm));
+ file = QPATHTOF(anim\ace_point_stand_lowered.rtm);
};
class GVAR(hold): GVAR(forward) {
- file = QUOTE(PATHTOF(anim\ace_hold.rtm));
+ file = QPATHTOF(anim\ace_hold.rtm);
speed = 0.8;
};
class GVAR(holdStandLowered): GVAR(hold) {
- file = QUOTE(PATHTOF(anim\ace_hold_stand_lowered.rtm));
+ file = QPATHTOF(anim\ace_hold_stand_lowered.rtm);
};
class GVAR(warning): GVAR(forward) {
- file = QUOTE(PATHTOF(anim\ace_warning.rtm));
+ file = QPATHTOF(anim\ace_warning.rtm);
speed = 0.8;
};
class GVAR(warningStandLowered): GVAR(warning) {
- file = QUOTE(PATHTOF(anim\ace_warning_stand_lowered.rtm));
+ file = QPATHTOF(anim\ace_warning_stand_lowered.rtm);
};
};
};
diff --git a/addons/gforces/config.cpp b/addons/gforces/config.cpp
index 79a2a850ed..27767c266d 100644
--- a/addons/gforces/config.cpp
+++ b/addons/gforces/config.cpp
@@ -12,6 +12,7 @@ class CfgPatches {
};
};
+#include "ACE_Settings.hpp"
#include "CfgEventHandlers.hpp"
#include "CfgWeapons.hpp"
#include "CfgVehicles.hpp"
diff --git a/addons/gforces/functions/fnc_pfhUpdateGForces.sqf b/addons/gforces/functions/fnc_pfhUpdateGForces.sqf
index dc6f11ee39..7909f3d0ee 100644
--- a/addons/gforces/functions/fnc_pfhUpdateGForces.sqf
+++ b/addons/gforces/functions/fnc_pfhUpdateGForces.sqf
@@ -14,8 +14,8 @@
#include "script_component.hpp"
// Update the g-forces at constant mission time intervals (taking accTime into account)
-if ((ACE_time - GVAR(lastUpdateTime)) < INTERVAL) exitWith {};
-GVAR(lastUpdateTime) = ACE_time;
+if ((CBA_missionTime - GVAR(lastUpdateTime)) < INTERVAL) exitWith {};
+GVAR(lastUpdateTime) = CBA_missionTime;
if (isNull ACE_player || !(alive ACE_player)) exitWith {};
diff --git a/addons/goggles/XEH_postInit.sqf b/addons/goggles/XEH_postInit.sqf
index ac7386ccdb..c4f76d7f1f 100644
--- a/addons/goggles/XEH_postInit.sqf
+++ b/addons/goggles/XEH_postInit.sqf
@@ -90,9 +90,9 @@ GVAR(OldGlasses) = "";
_unit setVariable ["ACE_EyesDamaged", false];
- }, _this, 5] call EFUNC(common,waitAndExecute);
+ }, _this, 5] call CBA_fnc_waitAndExecute;
- }, _unit, 25] call EFUNC(common,waitAndExecute);
+ }, _unit, 25] call CBA_fnc_waitAndExecute;
}] call CBA_fnc_addEventHandler;
diff --git a/addons/goggles/config.cpp b/addons/goggles/config.cpp
index 409f114b98..db193cd94e 100644
--- a/addons/goggles/config.cpp
+++ b/addons/goggles/config.cpp
@@ -15,8 +15,8 @@ class CfgPatches {
#include "CfgEventHandlers.hpp"
-#define COMBAT_GOGGLES ACE_Overlay = QUOTE(PATHTOF(textures\HUD\CombatGoggles.paa)); \
- ACE_OverlayCracked = QUOTE(PATHTOF(textures\HUD\CombatGogglesCracked.paa)); \
+#define COMBAT_GOGGLES ACE_Overlay = QPATHTOF(textures\HUD\CombatGoggles.paa); \
+ ACE_OverlayCracked = QPATHTOF(textures\HUD\CombatGogglesCracked.paa); \
ACE_Resistance = 2; \
ACE_Protection = 1;
@@ -26,10 +26,10 @@ class CfgGlasses {
ACE_TintAmount=0;
ACE_Overlay = "";
ACE_OverlayDirt = "A3\Ui_f\data\igui\rsctitles\HealthTextures\dust_upper_ca.paa";
- ACE_OverlayCracked = QUOTE(PATHTOF(textures\HUD\Cracked.paa));
+ ACE_OverlayCracked = QPATHTOF(textures\HUD\Cracked.paa);
ACE_Resistance = 0;
ACE_Protection = 0;
- ACE_DustPath = QUOTE(PATHTOF(textures\fx\dust\%1.paa));
+ ACE_DustPath = QPATHTOF(textures\fx\dust\%1.paa);
};
class G_Combat:None {
@@ -37,8 +37,8 @@ class CfgGlasses {
};
class G_Diving {
- ACE_Overlay = QUOTE(PATHTOF(textures\HUD\DivingGoggles.paa));
- ACE_OverlayCracked = QUOTE(PATHTOF(textures\HUD\DivingGogglesCracked.paa));
+ ACE_Overlay = QPATHTOF(textures\HUD\DivingGoggles.paa);
+ ACE_OverlayCracked = QPATHTOF(textures\HUD\DivingGogglesCracked.paa);
ACE_Resistance = 2;
ACE_Protection = 1;
};
@@ -209,7 +209,7 @@ class CfgGesturesMale {
class States {
class GestureFreezeStand;
class GestureWipeFace: GestureFreezeStand {
- file = QUOTE(PATHTOF(anim\WipeGlasses.rtm));
+ file = QPATHTOF(anim\WipeGlasses.rtm);
canPullTrigger = 0;
};
};
diff --git a/addons/goggles/functions/fnc_applyDustEffect.sqf b/addons/goggles/functions/fnc_applyDustEffect.sqf
index 944b98f127..9921bfdfd9 100644
--- a/addons/goggles/functions/fnc_applyDustEffect.sqf
+++ b/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);
@@ -71,7 +71,7 @@ GVAR(DustHandler) = [{
if (GVAR(DustHandler) == -1) then {
GVAR(PostProcessEyes) ppEffectEnable false
};
- }, [], 2] call EFUNC(common,waitAndExecute);
+ }, [], 2] call CBA_fnc_waitAndExecute;
[GVAR(DustHandler)] call CBA_fnc_removePerFrameHandler;
GVAR(DustHandler) = -1;
diff --git a/addons/goggles/functions/fnc_applyRotorWashEffect.sqf b/addons/goggles/functions/fnc_applyRotorWashEffect.sqf
index bc8d0bafbf..7a883ab7e7 100644
--- a/addons/goggles/functions/fnc_applyRotorWashEffect.sqf
+++ b/addons/goggles/functions/fnc_applyRotorWashEffect.sqf
@@ -50,7 +50,7 @@ if !(_rotorWash select 0) exitWith {
if (GVAR(DustHandler) == -1) then {
GVAR(PostProcessEyes) ppEffectEnable false;
}
- }, [], 2] call EFUNC(common,waitAndExecute);
+ }, [], 2] call CBA_fnc_waitAndExecute;
[GVAR(DustHandler)] call CBA_fnc_removePerFrameHandler;
GVAR(DustHandler) = -1;
diff --git a/addons/goggles/functions/fnc_clearGlasses.sqf b/addons/goggles/functions/fnc_clearGlasses.sqf
index e7d5584938..f1622c8680 100644
--- a/addons/goggles/functions/fnc_clearGlasses.sqf
+++ b/addons/goggles/functions/fnc_clearGlasses.sqf
@@ -34,7 +34,7 @@ if ((stance _unit != "PRONE") && {primaryWeapon _unit != ""} && {currentWeapon _
if (cameraView == "INTERNAL") then {
addCamShake [5, 1.75, 2];
};
-}, [], 0.3] call EFUNC(common,waitAndExecute);
+}, [], 0.3] call CBA_fnc_waitAndExecute;
call FUNC(removeDirtEffect);
call FUNC(removeRainEffect);
diff --git a/addons/goggles/functions/fnc_handleFired.sqf b/addons/goggles/functions/fnc_handleFired.sqf
index dcfcc51bec..066bc040f7 100644
--- a/addons/goggles/functions/fnc_handleFired.sqf
+++ b/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 {
diff --git a/addons/grenades/CfgAmmo.hpp b/addons/grenades/CfgAmmo.hpp
index 5aa33284c8..a5971044f9 100644
--- a/addons/grenades/CfgAmmo.hpp
+++ b/addons/grenades/CfgAmmo.hpp
@@ -81,7 +81,7 @@ class CfgAmmo {
class ACE_G_M84: SmokeShell {
GVAR(flashbang) = 1;
- model = PATHTOF(models\ACE_m84_thrown.p3d);
+ model = QPATHTOF(models\ACE_m84_thrown.p3d);
dangerRadiusHit = -1;
suppressionRadiusHit = 20;
typicalSpeed = 22;
diff --git a/addons/grenades/CfgMagazines.hpp b/addons/grenades/CfgMagazines.hpp
index 16dd9929ff..d1d9127fa4 100644
--- a/addons/grenades/CfgMagazines.hpp
+++ b/addons/grenades/CfgMagazines.hpp
@@ -59,8 +59,8 @@ class CfgMagazines {
displayname = CSTRING(M84_Name);
descriptionshort = CSTRING(M84_Description);
displayNameShort = "M84";
- model = PATHTOF(models\ACE_m84.p3d);
- picture = PATHTOF(UI\ACE_m84_x_ca.paa);
+ model = QPATHTOF(models\ACE_m84.p3d);
+ picture = QPATHTOF(UI\ACE_m84_x_ca.paa);
ammo = "ACE_G_M84";
mass = 4;
};
diff --git a/addons/grenades/functions/fnc_flare.sqf b/addons/grenades/functions/fnc_flare.sqf
index 74360e39b9..be2b4ce952 100644
--- a/addons/grenades/functions/fnc_flare.sqf
+++ b/addons/grenades/functions/fnc_flare.sqf
@@ -36,4 +36,4 @@ _light setLightDayLight true;
_light lightAttachObject [_projectile, [0,0,0]];
//_light attachTo [_projectile, [0,0,0]];
-[{deleteVehicle _this}, _light, _timeToLive, 1] call EFUNC(common,waitAndExecute);
+[{deleteVehicle _this}, _light, _timeToLive, 1] call CBA_fnc_waitAndExecute;
diff --git a/addons/grenades/functions/fnc_flashbangExplosionEH.sqf b/addons/grenades/functions/fnc_flashbangExplosionEH.sqf
index c708f3a3cf..0d0779ccef 100644
--- a/addons/grenades/functions/fnc_flashbangExplosionEH.sqf
+++ b/addons/grenades/functions/fnc_flashbangExplosionEH.sqf
@@ -36,8 +36,8 @@ if (hasInterface) then {
[{
params ["_light"];
deleteVehicle _light;
- }, [_light], 0.2] call EFUNC(common,waitAndExecute);
- }, [_light], 0.1] call EFUNC(common,waitAndExecute);
+ }, [_light], 0.2] call CBA_fnc_waitAndExecute;
+ }, [_light], 0.1] call CBA_fnc_waitAndExecute;
};
// Affect local AI
@@ -67,7 +67,7 @@ _affected = _affected - [ACE_player];
};
_unit setSkill (skill _unit * 50);
- }, [_x], 7 * _strength] call EFUNC(common,waitAndExecute);
+ }, [_x], 7 * _strength] call CBA_fnc_waitAndExecute;
};
} count _affected;
@@ -126,12 +126,12 @@ if (hasInterface && {!isNull ACE_player} && {alive ACE_player}) then {
GVAR(flashbangPPEffectCC) ppEffectAdjust [1,1,0,[1,1,1,0],[0,0,0,1],[0,0,0,0]];
GVAR(flashbangPPEffectCC) ppEffectCommit (10 * _strength);
- }, [_strength], 7 * _strength] call EFUNC(common,waitAndExecute);
+ }, [_strength], 7 * _strength] call CBA_fnc_waitAndExecute;
//FULLRECOVERY - end effect
[{
GVAR(flashbangPPEffectCC) ppEffectEnable false;
- }, [], 17 * _strength] call EFUNC(common,waitAndExecute);
+ }, [], 17 * _strength] call CBA_fnc_waitAndExecute;
};
if (_strength > 0.2) then {
diff --git a/addons/grenades/functions/fnc_throwGrenade.sqf b/addons/grenades/functions/fnc_throwGrenade.sqf
index 284c573c2e..e603dd8743 100644
--- a/addons/grenades/functions/fnc_throwGrenade.sqf
+++ b/addons/grenades/functions/fnc_throwGrenade.sqf
@@ -32,7 +32,7 @@ if (local _unit) then {
if (getNumber (_config >> QGVAR(flashbang)) == 1) then {
private _fuzeTime = getNumber (_config >> "explosionTime");
- [FUNC(flashbangThrownFuze), [_projectile], _fuzeTime] call EFUNC(common,waitAndExecute);
+ [FUNC(flashbangThrownFuze), [_projectile], _fuzeTime] call CBA_fnc_waitAndExecute;
};
};
@@ -42,7 +42,7 @@ if (getNumber (_config >> QGVAR(flare)) == 1) then {
private _color = getArray (_config >> QGVAR(color));
private _intensity = _color deleteAt 3;
- [FUNC(flare), [_projectile, _color, _intensity, _timeToLive], _fuzeTime, 0] call EFUNC(common,waitAndExecute);
+ [FUNC(flare), [_projectile, _color, _intensity, _timeToLive], _fuzeTime, 0] call CBA_fnc_waitAndExecute;
};
// handle throw modes
diff --git a/addons/hearing/CfgSounds.hpp b/addons/hearing/CfgSounds.hpp
index 0a1bc82ed1..6df1b39193 100644
--- a/addons/hearing/CfgSounds.hpp
+++ b/addons/hearing/CfgSounds.hpp
@@ -1,34 +1,34 @@
class CfgSounds {
class ACE_EarRinging_Weak {
- sound[] = {QUOTE(PATHTOF(sounds\ACE_earringing_weak.wav)),8,1.7};
+ sound[] = {QPATHTOF(sounds\ACE_earringing_weak.wav),8,1.7};
titles[] = {};
};
class ACE_EarRinging_Medium {
- sound[] = {QUOTE(PATHTOF(sounds\ACE_earringing_medium.wav)),8,1.7};
+ sound[] = {QPATHTOF(sounds\ACE_earringing_medium.wav),8,1.7};
titles[] = {};
};
class ACE_EarRinging_Heavy {
- sound[] = {QUOTE(PATHTOF(sounds\ACE_earringing_heavy.wav)),8,1.7};
+ sound[] = {QPATHTOF(sounds\ACE_earringing_heavy.wav),8,1.7};
titles[] = {};
};
class ACE_Combat_Deafness_Heavy {
- sound[] = {QUOTE(PATHTOF(sounds\deafness.ogg)),8,1};
+ sound[] = {QPATHTOF(sounds\deafness.ogg),8,1};
titles[] = {};
};
class ACE_Combat_Deafness_Medium {
- sound[] = {QUOTE(PATHTOF(sounds\deafness.ogg)),3,1};
+ sound[] = {QPATHTOF(sounds\deafness.ogg),3,1};
titles[] = {};
};
class ACE_Combat_Deafness_Heavy_NoRing {
- sound[] = {QUOTE(PATHTOF(sounds\deafness_noring.ogg)),8,1};
+ sound[] = {QPATHTOF(sounds\deafness_noring.ogg),8,1};
titles[] = {};
};
class ACE_Combat_Deafness_Medium_NoRing {
- sound[] = {QUOTE(PATHTOF(sounds\deafness_noring.ogg)),3,1};
+ sound[] = {QPATHTOF(sounds\deafness_noring.ogg),3,1};
titles[] = {};
};
class ACE_Ring_Backblast {
- sound[] = {QUOTE(PATHTOF(sounds\backblast_ring.ogg)),1,1};
+ sound[] = {QPATHTOF(sounds\backblast_ring.ogg),1,1};
titles[] = {};
};
};
diff --git a/addons/hearing/CfgVehicles.hpp b/addons/hearing/CfgVehicles.hpp
index 17dec1641b..760ed95a03 100644
--- a/addons/hearing/CfgVehicles.hpp
+++ b/addons/hearing/CfgVehicles.hpp
@@ -10,7 +10,7 @@ class CfgVehicles {
statement = QUOTE( [_player] call FUNC(putInEarPlugs) );
showDisabled = 0;
priority = 2.5;
- icon = PATHTOF(UI\ACE_earplugs_x_ca.paa);
+ icon = QPATHTOF(UI\ACE_earplugs_x_ca.paa);
};
class ACE_RemoveEarplugs {
displayName = CSTRING(EarPlugs_Off);
@@ -19,7 +19,7 @@ class CfgVehicles {
statement = QUOTE( [_player] call FUNC(removeEarPlugs) );
showDisabled = 0;
priority = 2.5;
- icon = PATHTOF(UI\ACE_earplugs_x_ca.paa);
+ icon = QPATHTOF(UI\ACE_earplugs_x_ca.paa);
};
};
};
@@ -100,7 +100,7 @@ class CfgVehicles {
scope = 2;
isGlobal = 1;
isSingular = 1;
- icon = PATHTOF(UI\Icon_Module_Hearing_ca.paa);
+ icon = QPATHTOF(UI\Icon_Module_Hearing_ca.paa);
class Arguments {
class EnableCombatDeafness {
displayName = CSTRING(EnableCombatDeafness_DisplayName);
diff --git a/addons/hearing/CfgWeapons.hpp b/addons/hearing/CfgWeapons.hpp
index af7b7d4cb3..c063c0e896 100644
--- a/addons/hearing/CfgWeapons.hpp
+++ b/addons/hearing/CfgWeapons.hpp
@@ -5,8 +5,8 @@ class CfgWeapons {
class ACE_EarPlugs: ACE_ItemCore {
displayName = CSTRING(EarPlugs_Name);
descriptionShort = CSTRING(EarPlugs_Description);
- model = QUOTE(PATHTOF(data\ace_earplugs.p3d));
- picture = PATHTOF(UI\ACE_earplugs_x_ca.paa);
+ model = QPATHTOF(data\ace_earplugs.p3d);
+ picture = QPATHTOF(UI\ACE_earplugs_x_ca.paa);
scope = 2;
class ItemInfo: InventoryItem_Base_F {
mass = 1;
diff --git a/addons/hearing/functions/fnc_updateVolume.sqf b/addons/hearing/functions/fnc_updateVolume.sqf
index 2212bd6222..01ab58ef76 100644
--- a/addons/hearing/functions/fnc_updateVolume.sqf
+++ b/addons/hearing/functions/fnc_updateVolume.sqf
@@ -33,8 +33,8 @@ if (!_justUpdateVolume) then {
if (GVAR(deafnessDV) - GVAR(deafnessPrior) > 1 ||
GVAR(deafnessDV) > 10) then {
- if (ACE_time - GVAR(time3) < 3) exitWith {};
- GVAR(time3) = ACE_time;
+ if (CBA_missionTime - GVAR(time3) < 3) exitWith {};
+ GVAR(time3) = CBA_missionTime;
if (GVAR(deafnessDV) > 19.75) then {
playSound (["ACE_Combat_Deafness_Heavy", "ACE_Combat_Deafness_Heavy_NoRing"] select GVAR(DisableEarRinging));
diff --git a/addons/hitreactions/functions/fnc_fallDown.sqf b/addons/hitreactions/functions/fnc_fallDown.sqf
index 9ed43ae14f..03484438eb 100644
--- a/addons/hitreactions/functions/fnc_fallDown.sqf
+++ b/addons/hitreactions/functions/fnc_fallDown.sqf
@@ -31,7 +31,7 @@ if (_unit == ACE_player) then {
};
// play scream sound
-if (!isNil QUOTE(EFUNC(medical,playInjuredSound))) then {
+if (!isNil QEFUNC(medical,playInjuredSound)) then {
[_unit] call EFUNC(medical,playInjuredSound);
};
diff --git a/addons/huntir/CfgAmmo.hpp b/addons/huntir/CfgAmmo.hpp
index 33328094b2..a9cd260d0f 100644
--- a/addons/huntir/CfgAmmo.hpp
+++ b/addons/huntir/CfgAmmo.hpp
@@ -1,7 +1,7 @@
class CfgAmmo {
class FlareBase;
class F_HuntIR: FlareBase {
- model = PATHTOF(data\ace_m1070_armed.p3d);
+ model = QPATHTOF(data\ace_m1070_armed.p3d);
lightColor[] = {0, 0, 0, 0};
smokeColor[] = {0, 0, 0, 0};
timeToLive = 6;
@@ -26,6 +26,7 @@ class CfgAmmo {
soundHit6[] = {"",3.16228,1,2000};
soundHit7[] = {"",3.16228,1,2000};
soundHit8[] = {"",3.16228,1,2000};
+ SoundSetExplosion[] = {};
multiSoundHit[] = {};
class HitEffects {};
soundFakeFall0[] = {"",3.16228,1,1000};
diff --git a/addons/huntir/CfgMagazines.hpp b/addons/huntir/CfgMagazines.hpp
index c11f81a98c..62ae785333 100644
--- a/addons/huntir/CfgMagazines.hpp
+++ b/addons/huntir/CfgMagazines.hpp
@@ -5,7 +5,7 @@ class CfgMagazines {
displayName = CSTRING(magazine_displayName);
displayNameShort = "HuntIR";
descriptionShort = "";
- picture = PATHTOF(data\m_m1070_ca.paa);
+ picture = QPATHTOF(data\m_m1070_ca.paa);
ammo = "F_HuntIR";
};
};
diff --git a/addons/huntir/CfgVehicles.hpp b/addons/huntir/CfgVehicles.hpp
index 3b6486aaf7..cd5054a2da 100644
--- a/addons/huntir/CfgVehicles.hpp
+++ b/addons/huntir/CfgVehicles.hpp
@@ -10,7 +10,7 @@ class CfgVehicles {
statement = QUOTE(call FUNC(huntir));
showDisabled = 0;
priority = 2;
- icon = PATHTOF(UI\w_huntir_monitor_ca.paa);
+ icon = QPATHTOF(UI\w_huntir_monitor_ca.paa);
exceptions[] = {};
};
};
@@ -23,7 +23,7 @@ class CfgVehicles {
castDriverShadow = 0;
destrType = "DestructDefault";
displayName = "HuntIR";
- model = PATHTOF(data\huntir.p3d);
+ model = QPATHTOF(data\huntir.p3d);
scope = 1;
soundCrash[] = {"", db-30, 1 };
soundEnviron[] = {"z\ace\addons\apl\sounds\padak_let", 0.316228, 1, 80};
@@ -73,7 +73,7 @@ class CfgVehicles {
class ReammoBox_F;
class ACE_HuntIR_Box: ReammoBox_F {
- model = PATHTOF(data\ace_huntirbox.p3d);
+ model = QPATHTOF(data\ace_huntirbox.p3d);
displayName = $STR_DN_ACE_HUNTIRBOX;
class TransportItems {
MACRO_ADDITEM(ACE_HuntIR_monitor,5);
diff --git a/addons/huntir/CfgWeapons.hpp b/addons/huntir/CfgWeapons.hpp
index 6d74cbfba9..979fc8875c 100644
--- a/addons/huntir/CfgWeapons.hpp
+++ b/addons/huntir/CfgWeapons.hpp
@@ -6,9 +6,9 @@ class CfgWeapons {
class ACE_HuntIR_monitor: ACE_ItemCore {
scope = 2;
displayName = CSTRING(monitor_displayName);
- picture = PATHTOF(UI\w_huntir_monitor_ca.paa);
+ picture = QPATHTOF(UI\w_huntir_monitor_ca.paa);
descriptionShort = CSTRING(monitor_displayName);
- model = PATHTOF(data\ace_huntir_monitor.p3d);
+ model = QPATHTOF(data\ace_huntir_monitor.p3d);
class ItemInfo: InventoryItem_Base_F {
mass = 20;
diff --git a/addons/huntir/Dialog.hpp b/addons/huntir/Dialog.hpp
index ca1e85466b..745bef8dc3 100644
--- a/addons/huntir/Dialog.hpp
+++ b/addons/huntir/Dialog.hpp
@@ -154,7 +154,7 @@ class ace_huntir_cam_dialog {
w = __W;
h = __H + 0.2;
border = 0;
- text = PATHTOF(UI\ace_huntir_monitor_on.paa);
+ text = QPATHTOF(UI\ace_huntir_monitor_on.paa);
};
class CAM_HEIGHT {
type = CT_STATIC;
@@ -311,7 +311,7 @@ class ace_huntir_cam_dialog_off: ace_huntir_cam_dialog_inactive {
class RIGHT_BORDER: RIGHT_BORDER {};
class PRESS_HELP: PRESS_HELP {};
class HELP_DIALOG: HELP_DIALOG {};
- class CAM_BG: CAM_BG { text = PATHTOF(UI\ace_huntir_monitor_off.paa); };
+ class CAM_BG: CAM_BG { text = QPATHTOF(UI\ace_huntir_monitor_off.paa); };
};
//ACTIVE PARA CAMERA DIALOG
class ace_huntir_help_dialog: ace_huntir_cam_dialog {
diff --git a/addons/huntir/functions/fnc_cam.sqf b/addons/huntir/functions/fnc_cam.sqf
index 2eb7611a6a..80d5e33043 100644
--- a/addons/huntir/functions/fnc_cam.sqf
+++ b/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)];
diff --git a/addons/huntir/functions/fnc_handleFired.sqf b/addons/huntir/functions/fnc_handleFired.sqf
index 551b9975b6..9a122c3f61 100644
--- a/addons/huntir/functions/fnc_handleFired.sqf
+++ b/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"];
@@ -50,5 +50,5 @@ if (!hasInterface) exitWith {};
_huntir setVectorUp [0, 0, 1];
};
}, 0, [_huntir]] call CBA_fnc_addPerFrameHandler;
- }, [getPosATL _projectile vectorAdd [0, 0, 50]], 2, 0] call EFUNC(common,waitAndExecute);
-}, [_projectile], 5, 0] call EFUNC(common,waitAndExecute);
+ }, [getPosATL _projectile vectorAdd [0, 0, 50]], 2, 0] call CBA_fnc_waitAndExecute;
+}, [_projectile], 5, 0] call CBA_fnc_waitAndExecute;
diff --git a/addons/huntir/functions/fnc_huntir.sqf b/addons/huntir/functions/fnc_huntir.sqf
index e06ada87ea..72a0ecee64 100644
--- a/addons/huntir/functions/fnc_huntir.sqf
+++ b/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 {
@@ -90,9 +90,9 @@ createDialog "ace_huntir_cam_dialog_off";
GVAR(done) = true;
closedialog 0;
HUNTIR_BACKGROUND_LAYER_ID cutText ["", "PLAIN"];
- }, [], 3, 0] call EFUNC(common,waitAndExecute);
+ }, [], 3, 0] call CBA_fnc_waitAndExecute;
};
};
}, __TYPE_WRITER_DELAY, []] call CBA_fnc_addPerFrameHandler;
- }, [], 0.5, 0] call EFUNC(common,waitAndExecute);
-}, [], 1, 0] call EFUNC(common,waitAndExecute);
+ }, [], 0.5, 0] call CBA_fnc_waitAndExecute;
+}, [], 1, 0] call CBA_fnc_waitAndExecute;
diff --git a/addons/interact_menu/XEH_preInit.sqf b/addons/interact_menu/XEH_preInit.sqf
index fae8843a4e..8711f8c180 100644
--- a/addons/interact_menu/XEH_preInit.sqf
+++ b/addons/interact_menu/XEH_preInit.sqf
@@ -27,7 +27,7 @@ GVAR(keyDownSelfAction) = false;
GVAR(keyDownTime) = 0;
GVAR(openedMenuType) = -1;
-GVAR(lastTime) = ACE_diagTime;
+GVAR(lastTime) = diag_tickTime;
GVAR(rotationAngle) = 0;
GVAR(selectedAction) = [[],[]];
@@ -43,8 +43,8 @@ GVAR(lastPath) = [];
GVAR(expanded) = false;
-GVAR(startHoverTime) = ACE_diagTime;
-GVAR(expandedTime) = ACE_diagTime;
+GVAR(startHoverTime) = diag_tickTime;
+GVAR(expandedTime) = diag_tickTime;
// reset on mission load
addMissionEventHandler ["Loaded", {
diff --git a/addons/interact_menu/functions/fnc_keyDown.sqf b/addons/interact_menu/functions/fnc_keyDown.sqf
index 58fc4fbed9..ab9969a994 100644
--- a/addons/interact_menu/functions/fnc_keyDown.sqf
+++ b/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;
};
diff --git a/addons/interact_menu/functions/fnc_render.sqf b/addons/interact_menu/functions/fnc_render.sqf
index 1efe9bcf4d..a05ad79670 100644
--- a/addons/interact_menu/functions/fnc_render.sqf
+++ b/addons/interact_menu/functions/fnc_render.sqf
@@ -51,12 +51,12 @@ 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;
GVAR(rotationAngle) = (GVAR(rotationAngle) + (270*_delta)) mod 360;
- [_sPos, format [QUOTE(PATHTOF(ui\selector%1.paa)), floor (((abs GVAR(rotationAngle)) mod 90) / 6)]] call FUNC(renderSelector);
+ [_sPos, format [QPATHTOF(ui\selector%1.paa), floor (((abs GVAR(rotationAngle)) mod 90) / 6)]] call FUNC(renderSelector);
_foundTarget = true;
GVAR(actionSelected) = true;
@@ -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 {
- GVAR(startHoverTime) = ACE_diagTime;
+ if(_misMatch && {diag_tickTime-GVAR(expandedTime) > linearConversion [0, 2, GVAR(menuAnimationSpeed), 0.25, 0.08333333]}) then {
+ 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);
diff --git a/addons/interact_menu/functions/fnc_renderActionPoints.sqf b/addons/interact_menu/functions/fnc_renderActionPoints.sqf
index c99688564a..d3df02ca40 100644
--- a/addons/interact_menu/functions/fnc_renderActionPoints.sqf
+++ b/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];
@@ -128,7 +128,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 {
diff --git a/addons/interact_menu/functions/fnc_renderMenu.sqf b/addons/interact_menu/functions/fnc_renderMenu.sqf
index 6abb980620..f975db17f1 100644
--- a/addons/interact_menu/functions/fnc_renderMenu.sqf
+++ b/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));
- _scaleY = _scaleY * (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 * (((diag_tickTime - GVAR(expandedTime)) * linearConversion [0, 2, GVAR(menuAnimationSpeed), 8, 16]) min 1));
};
private _target = _actionObject;
diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp
index 437b84c3a6..dae66a9558 100644
--- a/addons/interaction/CfgVehicles.hpp
+++ b/addons/interaction/CfgVehicles.hpp
@@ -11,7 +11,7 @@ class CfgVehicles {
scope = 2;
isGlobal = 1;
isSingular = 1;
- icon = PATHTOF(UI\Icon_Module_Interaction_ca.paa);
+ icon = QPATHTOF(UI\Icon_Module_Interaction_ca.paa);
class Arguments {
class EnableTeamManagement {
displayName = CSTRING(EnableTeamManagement_DisplayName);
@@ -68,14 +68,14 @@ class CfgVehicles {
statement = "";
showDisabled = 0;
priority = 3.2;
- icon = PATHTOF(UI\team\team_management_ca.paa);
+ icon = QPATHTOF(UI\team\team_management_ca.paa);
class ACE_AssignTeamRed {
displayName = CSTRING(AssignTeamRed);
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam));
statement = QUOTE([ARR_2(_target,'RED')] call DFUNC(joinTeam));
showDisabled = 1;
- icon = PATHTOF(UI\team\team_red_ca.paa);
+ icon = QPATHTOF(UI\team\team_red_ca.paa);
priority = 2.4;
};
class ACE_AssignTeamGreen {
@@ -83,7 +83,7 @@ class CfgVehicles {
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam));
statement = QUOTE([ARR_2(_target,'GREEN')] call DFUNC(joinTeam));
showDisabled = 1;
- icon = PATHTOF(UI\team\team_green_ca.paa);
+ icon = QPATHTOF(UI\team\team_green_ca.paa);
priority = 2.3;
};
class ACE_AssignTeamBlue {
@@ -91,7 +91,7 @@ class CfgVehicles {
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam));
statement = QUOTE([ARR_2(_target,'BLUE')] call DFUNC(joinTeam));
showDisabled = 1;
- icon = PATHTOF(UI\team\team_blue_ca.paa);
+ icon = QPATHTOF(UI\team\team_blue_ca.paa);
priority = 2.2;
};
class ACE_AssignTeamYellow {
@@ -99,7 +99,7 @@ class CfgVehicles {
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam));
statement = QUOTE([ARR_2(_target,'YELLOW')] call DFUNC(joinTeam));
showDisabled = 1;
- icon = PATHTOF(UI\team\team_yellow_ca.paa);
+ icon = QPATHTOF(UI\team\team_yellow_ca.paa);
priority = 2.1;
};
class ACE_UnassignTeam {
@@ -107,7 +107,7 @@ class CfgVehicles {
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam) && {assignedTeam _target != 'MAIN'});
statement = QUOTE([ARR_2(_target,'MAIN')] call DFUNC(joinTeam));
showDisabled = 1;
- icon = PATHTOF(UI\team\team_white_ca.paa);
+ icon = QPATHTOF(UI\team\team_white_ca.paa);
priority = 2.5;
};
};
@@ -118,7 +118,7 @@ class CfgVehicles {
statement = QUOTE([_player] joinSilent group _target);
showDisabled = 0;
priority = 2.6;
- icon = PATHTOF(UI\team\team_management_ca.paa);
+ icon = QPATHTOF(UI\team\team_management_ca.paa);
};
class ACE_GetDown {
displayName = CSTRING(GetDown);
@@ -223,7 +223,7 @@ class CfgVehicles {
statement = "";
showDisabled = 1;
priority = 3.2;
- icon = PATHTOF(UI\team\team_management_ca.paa);
+ icon = QPATHTOF(UI\team\team_management_ca.paa);
class ACE_JoinTeamRed {
displayName = CSTRING(JoinTeamRed);
@@ -232,7 +232,7 @@ class CfgVehicles {
statement = QUOTE([ARR_2(_player,'RED')] call DFUNC(joinTeam));
showDisabled = 1;
priority = 2.4;
- icon = PATHTOF(UI\team\team_red_ca.paa);
+ icon = QPATHTOF(UI\team\team_red_ca.paa);
};
class ACE_JoinTeamGreen {
displayName = CSTRING(JoinTeamGreen);
@@ -241,7 +241,7 @@ class CfgVehicles {
statement = QUOTE([ARR_2(_player,'GREEN')] call DFUNC(joinTeam));
showDisabled = 1;
priority = 2.3;
- icon = PATHTOF(UI\team\team_green_ca.paa);
+ icon = QPATHTOF(UI\team\team_green_ca.paa);
};
class ACE_JoinTeamBlue {
displayName = CSTRING(JoinTeamBlue);
@@ -250,7 +250,7 @@ class CfgVehicles {
statement = QUOTE([ARR_2(_player,'BLUE')] call DFUNC(joinTeam));
showDisabled = 1;
priority = 2.2;
- icon = PATHTOF(UI\team\team_blue_ca.paa);
+ icon = QPATHTOF(UI\team\team_blue_ca.paa);
};
class ACE_JoinTeamYellow {
displayName = CSTRING(JoinTeamYellow);
@@ -259,7 +259,7 @@ class CfgVehicles {
statement = QUOTE([ARR_2(_player,'YELLOW')] call DFUNC(joinTeam));
showDisabled = 1;
priority = 2.1;
- icon = PATHTOF(UI\team\team_yellow_ca.paa);
+ icon = QPATHTOF(UI\team\team_yellow_ca.paa);
};
class ACE_LeaveTeam {
displayName = CSTRING(LeaveTeam);
@@ -268,7 +268,7 @@ class CfgVehicles {
statement = QUOTE([ARR_2(_player,'MAIN')] call DFUNC(joinTeam));
showDisabled = 1;
priority = 2.5;
- icon = PATHTOF(UI\team\team_white_ca.paa);
+ icon = QPATHTOF(UI\team\team_white_ca.paa);
};
class ACE_BecomeLeader {
displayName = CSTRING(BecomeLeader);
@@ -277,7 +277,7 @@ class CfgVehicles {
statement = QUOTE(_this call DFUNC(doBecomeLeader));
showDisabled = 1;
priority = 1.0;
- icon = PATHTOF(UI\team\team_white_ca.paa);
+ icon = QPATHTOF(UI\team\team_white_ca.paa);
};
class ACE_LeaveGroup {
displayName = CSTRING(LeaveGroup);
@@ -286,7 +286,7 @@ class CfgVehicles {
statement = QUOTE(_oldGroup = units group _player; _newGroup = createGroup side _player; [_player] joinSilent _newGroup; {_player reveal _x} forEach _oldGroup;);
showDisabled = 1;
priority = 1.2;
- icon = PATHTOF(UI\team\team_management_ca.paa);
+ icon = QPATHTOF(UI\team\team_management_ca.paa);
};
};
diff --git a/addons/interaction/RscTitles.hpp b/addons/interaction/RscTitles.hpp
index d03d3e0f36..71070b1715 100644
--- a/addons/interaction/RscTitles.hpp
+++ b/addons/interaction/RscTitles.hpp
@@ -170,7 +170,7 @@ class RscTitles {
class controls {
class SelectIcon: RscInteractionHelperIcon{
idc = 1200;
- text = PATHTOF(UI\mouse_left_ca.paa);
+ text = QPATHTOF(UI\mouse_left_ca.paa);
y = 17.5 * GUI_GRID_H;
};
class SelectText: RscInteractionText{
@@ -180,7 +180,7 @@ class RscTitles {
};
class GoBackIcon: RscInteractionHelperIcon{
idc = 1201;
- text = PATHTOF(UI\mouse_right_ca.paa);
+ text = QPATHTOF(UI\mouse_right_ca.paa);
y = 19.5 * GUI_GRID_H;
};
class GoBackText: RscInteractionText{
@@ -190,7 +190,7 @@ class RscTitles {
};
class ScrollIcon: RscInteractionHelperIcon{
idc = 1202;
- text = PATHTOF(UI\mouse_scroll_ca.paa);
+ text = QPATHTOF(UI\mouse_scroll_ca.paa);
y = 18.5 * GUI_GRID_H;
};
class ScrollText: RscInteractionText{
diff --git a/addons/interaction/functions/fnc_addPassengersActions.sqf b/addons/interaction/functions/fnc_addPassengersActions.sqf
index 8ee95b7eb9..7b8ad69ee0 100644
--- a/addons/interaction/functions/fnc_addPassengersActions.sqf
+++ b/addons/interaction/functions/fnc_addPassengersActions.sqf
@@ -34,7 +34,7 @@ _actions = [];
] select (([driver _vehicle, gunner _vehicle, commander _vehicle] find _unit) + 1);
if (_unit getVariable [QEGVAR(captives,isHandcuffed), false]) then {
- _icon = QUOTE(PATHTOEF(captives,UI\handcuff_ca.paa));
+ _icon = QPATHTOEF(captives,UI\handcuff_ca.paa);
};
_actions pushBack [
diff --git a/addons/interaction/functions/fnc_openDoor.sqf b/addons/interaction/functions/fnc_openDoor.sqf
index b2249d1589..180c01fba9 100644
--- a/addons/interaction/functions/fnc_openDoor.sqf
+++ b/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;
diff --git a/addons/inventory/functions/fnc_inventoryDisplayLoad.sqf b/addons/inventory/functions/fnc_inventoryDisplayLoad.sqf
index ab23701760..0e1daa4a52 100644
--- a/addons/inventory/functions/fnc_inventoryDisplayLoad.sqf
+++ b/addons/inventory/functions/fnc_inventoryDisplayLoad.sqf
@@ -53,7 +53,7 @@ _filter ctrlAddEventHandler ["LBSelChanged", {_this call FUNC(onLBSelChanged)}];
// readd "All" filter to last position and select it
_index = _filter lbAdd _nameAll;
_filter lbSetCurSel _index;
-}, [_filter]] call EFUNC(common,execNextFrame);
+}, [_filter]] call CBA_fnc_execNextFrame;
// monitor changes that can happen and force our update
private _dummyControl = _display ctrlCreate ["RscMapControl", -1];
diff --git a/addons/inventory/functions/fnc_onLBSelChanged.sqf b/addons/inventory/functions/fnc_onLBSelChanged.sqf
index 61e4b12b10..5ae49049fe 100644
--- a/addons/inventory/functions/fnc_onLBSelChanged.sqf
+++ b/addons/inventory/functions/fnc_onLBSelChanged.sqf
@@ -24,4 +24,4 @@ GVAR(selectedFilterIndex) = _index;
params ["_display"];
[_display] call FUNC(forceItemListUpdate);
-}, [ctrlParent _filter]] call EFUNC(common,execNextFrame);
+}, [ctrlParent _filter]] call CBA_fnc_execNextFrame;
diff --git a/addons/javelin/CfgVehicles.hpp b/addons/javelin/CfgVehicles.hpp
index 74863ef08f..37023a8bd6 100644
--- a/addons/javelin/CfgVehicles.hpp
+++ b/addons/javelin/CfgVehicles.hpp
@@ -18,7 +18,7 @@ class CfgVehicles {
magazines[] = {"1Rnd_GAT_missiles","1Rnd_GAT_missiles","1Rnd_GAT_missiles","1Rnd_GAT_missiles"};
turretInfoType = "ACE_RscOptics_javelin";
- gunnerOpticsModel = PATHTOF(data\reticle_titan.p3d);
+ gunnerOpticsModel = QPATHTOF(data\reticle_titan.p3d);
opticsZoomMin = 0.08333;
opticsZoomMax = 0.04167;
opticsZoomInit = 0.08333;
@@ -36,7 +36,7 @@ class CfgVehicles {
magazines[] = {"1Rnd_GAT_missiles","1Rnd_GAT_missiles","1Rnd_GAT_missiles","1Rnd_GAT_missiles"};
turretInfoType = "ACE_RscOptics_javelin";
- gunnerOpticsModel = PATHTOF(data\reticle_titan.p3d);
+ gunnerOpticsModel = QPATHTOF(data\reticle_titan.p3d);
opticsZoomMin = 0.08333;
opticsZoomMax = 0.04167;
opticsZoomInit = 0.08333;
@@ -54,7 +54,7 @@ class CfgVehicles {
magazines[] = {"1Rnd_GAT_missiles","1Rnd_GAT_missiles","1Rnd_GAT_missiles","1Rnd_GAT_missiles"};
turretInfoType = "ACE_RscOptics_javelin";
- gunnerOpticsModel = PATHTOF(data\reticle_titan.p3d);
+ gunnerOpticsModel = QPATHTOF(data\reticle_titan.p3d);
opticsZoomMin = 0.08333;
opticsZoomMax = 0.04167;
opticsZoomInit = 0.08333;
diff --git a/addons/javelin/CfgWeapons.hpp b/addons/javelin/CfgWeapons.hpp
index 1e32752145..b60f887396 100644
--- a/addons/javelin/CfgWeapons.hpp
+++ b/addons/javelin/CfgWeapons.hpp
@@ -15,7 +15,7 @@ class CfgWeapons {
class GVAR(Titan_Static) : missiles_titan_at {
GVAR(enabled) = 1;
weaponInfoType = "ACE_RscOptics_javelin";
- modelOptics = PATHTOF(data\reticle_titan.p3d);
+ modelOptics = QPATHTOF(data\reticle_titan.p3d);
canLock = 0;
magazines[] = {"1Rnd_GAT_missiles"};
@@ -31,7 +31,7 @@ class CfgWeapons {
class launch_B_Titan_short_F: launch_Titan_short_base {
GVAR(enabled) = 1;
weaponInfoType = "ACE_RscOptics_javelin";
- modelOptics = PATHTOF(data\reticle_titan.p3d);
+ modelOptics = QPATHTOF(data\reticle_titan.p3d);
canLock = 0;
@@ -41,7 +41,7 @@ class CfgWeapons {
class launch_I_Titan_short_F: launch_Titan_short_base {
GVAR(enabled) = 1;
weaponInfoType = "ACE_RscOptics_javelin";
- modelOptics = PATHTOF(data\reticle_titan.p3d);
+ modelOptics = QPATHTOF(data\reticle_titan.p3d);
canLock = 0;
@@ -51,7 +51,7 @@ class CfgWeapons {
class launch_O_Titan_short_F: launch_Titan_short_base {
GVAR(enabled) = 1;
weaponInfoType = "ACE_RscOptics_javelin";
- modelOptics = PATHTOF(data\reticle_titan.p3d);
+ modelOptics = QPATHTOF(data\reticle_titan.p3d);
canLock = 0;
@@ -62,7 +62,7 @@ class CfgWeapons {
class launch_Titan_short_F: launch_Titan_short_base {
GVAR(enabled) = 1;
weaponInfoType = "ACE_RscOptics_javelin";
- modelOptics = PATHTOF(data\reticle_titan.p3d);
+ modelOptics = QPATHTOF(data\reticle_titan.p3d);
canLock = 0;
diff --git a/addons/javelin/RscInGameUI.hpp b/addons/javelin/RscInGameUI.hpp
index d3fff71db0..f60533de45 100644
--- a/addons/javelin/RscInGameUI.hpp
+++ b/addons/javelin/RscInGameUI.hpp
@@ -306,7 +306,7 @@ class RscInGameUI {
};
class OpticsBorders: RscPicture {
idc = 699105;
- text = PATHTOF(data\javelin_ui_border_ca.paa);
+ text = QPATHTOF(data\javelin_ui_border_ca.paa);
colorText[] = {0,0,0,1};
x = "((SafezoneW -(3.1/4)*SafezoneH)/2) - SafezoneX";
y = "0.15*SafezoneH-SafezoneY";
diff --git a/addons/javelin/functions/fnc_onOpticDraw.sqf b/addons/javelin/functions/fnc_onOpticDraw.sqf
index 67e337291b..6608b13ecc 100644
--- a/addons/javelin/functions/fnc_onOpticDraw.sqf
+++ b/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);
};
};
@@ -193,12 +193,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;
@@ -240,9 +240,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;
@@ -274,9 +274,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);
@@ -303,7 +303,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];
diff --git a/addons/javelin/functions/fnc_onOpticLoad.sqf b/addons/javelin/functions/fnc_onOpticLoad.sqf
index cb4eac74f9..85624712e3 100644
--- a/addons/javelin/functions/fnc_onOpticLoad.sqf
+++ b/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
diff --git a/addons/kestrel4500/CfgVehicles.hpp b/addons/kestrel4500/CfgVehicles.hpp
index 9ca6510928..ccc4fa3bd2 100644
--- a/addons/kestrel4500/CfgVehicles.hpp
+++ b/addons/kestrel4500/CfgVehicles.hpp
@@ -9,7 +9,7 @@ class CfgVehicles {
statement = QUOTE(call FUNC(createKestrelDialog));
showDisabled = 0;
priority = 0.1;
- icon = QUOTE(PATHTOF(UI\Kestrel4500_Icon.paa));
+ icon = QPATHTOF(UI\Kestrel4500_Icon.paa);
exceptions[] = {"notOnMap", "isNotInside", "isNotSitting"};
class GVAR(show) {
displayName = CSTRING(ShowKestrel);
@@ -17,7 +17,7 @@ class CfgVehicles {
statement = QUOTE(call FUNC(displayKestrel));
showDisabled = 0;
priority = 0.2;
- icon = QUOTE(PATHTOF(UI\Kestrel4500_Icon.paa));
+ icon = QPATHTOF(UI\Kestrel4500_Icon.paa);
exceptions[] = {"notOnMap", "isNotInside", "isNotSitting"};
};
class GVAR(hide) {
@@ -26,7 +26,7 @@ class CfgVehicles {
statement = QUOTE(call FUNC(displayKestrel));
showDisabled = 0;
priority = 0.3;
- icon = QUOTE(PATHTOF(UI\Kestrel4500_Icon.paa));
+ icon = QPATHTOF(UI\Kestrel4500_Icon.paa);
exceptions[] = {"notOnMap", "isNotInside", "isNotSitting"};
};
};
diff --git a/addons/kestrel4500/CfgWeapons.hpp b/addons/kestrel4500/CfgWeapons.hpp
index c31b736ac6..8b318994a2 100644
--- a/addons/kestrel4500/CfgWeapons.hpp
+++ b/addons/kestrel4500/CfgWeapons.hpp
@@ -8,8 +8,8 @@ class CfgWeapons {
scope = 2;
displayName = CSTRING(Name);
descriptionShort = CSTRING(Description);
- model = PATHTOF(data\kestrel4500.p3d);
- picture = PATHTOF(UI\Kestrel4500.paa);
+ model = QPATHTOF(data\kestrel4500.p3d);
+ picture = QPATHTOF(UI\Kestrel4500.paa);
icon = "iconObject_circle";
mapSize = 0.034;
diff --git a/addons/kestrel4500/RscTitles.hpp b/addons/kestrel4500/RscTitles.hpp
index 7046918935..276e8c4392 100644
--- a/addons/kestrel4500/RscTitles.hpp
+++ b/addons/kestrel4500/RscTitles.hpp
@@ -348,25 +348,25 @@ class RscTitles {
fadeout = 0;
class controls {
class Preload_0 {
- text = PATHTOF(UI\Kestrel4500_0.paa);
+ text = QPATHTOF(UI\Kestrel4500_0.paa);
};
class Preload_1 {
- text = PATHTOF(UI\Kestrel4500_1.paa);
+ text = QPATHTOF(UI\Kestrel4500_1.paa);
};
class Preload_2 {
- text = PATHTOF(UI\Kestrel4500_2.paa);
+ text = QPATHTOF(UI\Kestrel4500_2.paa);
};
class Preload_3 {
- text = PATHTOF(UI\Kestrel4500_3.paa);
+ text = QPATHTOF(UI\Kestrel4500_3.paa);
};
class Preload_4 {
- text = PATHTOF(UI\Kestrel4500_4.paa);
+ text = QPATHTOF(UI\Kestrel4500_4.paa);
};
class Preload_5 {
- text = PATHTOF(UI\Kestrel4500_5.paa);
+ text = QPATHTOF(UI\Kestrel4500_5.paa);
};
class Preload_6 {
- text = PATHTOF(UI\Kestrel4500_6.paa);
+ text = QPATHTOF(UI\Kestrel4500_6.paa);
};
};
};
diff --git a/addons/kestrel4500/XEH_postInit.sqf b/addons/kestrel4500/XEH_postInit.sqf
index f22fc2228f..9511041bd2 100644
--- a/addons/kestrel4500/XEH_postInit.sqf
+++ b/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;
diff --git a/addons/kestrel4500/functions/fnc_buttonPressed.sqf b/addons/kestrel4500/functions/fnc_buttonPressed.sqf
index 83c471092a..a051f6b1b6 100644
--- a/addons/kestrel4500/functions/fnc_buttonPressed.sqf
+++ b/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;
};
};
};
diff --git a/addons/kestrel4500/functions/fnc_displayKestrel.sqf b/addons/kestrel4500/functions/fnc_displayKestrel.sqf
index 64d06fea1c..28de70a13d 100644
--- a/addons/kestrel4500/functions/fnc_displayKestrel.sqf
+++ b/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 {
- GVAR(updateTimer) = ACE_diagTime + 1;
+ if (diag_tickTime > GVAR(updateTimer)) then {
+ GVAR(updateTimer) = diag_tickTime + 1;
private ["_outputData"];
_outputData = [] call FUNC(generateOutputData);
@@ -126,7 +126,7 @@ GVAR(Overlay) = true;
};
call FUNC(updateImpellerState);
- __ctrlKestrel4500 ctrlSetText format [QUOTE(PATHTOF(UI\Kestrel4500_%1.paa)), floor(GVAR(ImpellerState) % 7)];
+ __ctrlKestrel4500 ctrlSetText format [QPATHTOF(UI\Kestrel4500_%1.paa), floor(GVAR(ImpellerState) % 7)];
}, 0.01, []] call CBA_fnc_addPerFrameHandler;
diff --git a/addons/kestrel4500/functions/fnc_generateOutputData.sqf b/addons/kestrel4500/functions/fnc_generateOutputData.sqf
index 016baebef7..c3bce5efa2 100644
--- a/addons/kestrel4500/functions/fnc_generateOutputData.sqf
+++ b/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"];
diff --git a/addons/kestrel4500/initKeybinds.sqf b/addons/kestrel4500/initKeybinds.sqf
index 581ab1a1ae..8c99271970 100644
--- a/addons/kestrel4500/initKeybinds.sqf
+++ b/addons/kestrel4500/initKeybinds.sqf
@@ -56,4 +56,4 @@ _closeCode = {
closeDialog 0;
};
};
-[(localize LSTRING(Name)), QUOTE(PATHTOF(UI\Kestrel4500.paa)), _conditonCode, _toggleCode, _closeCode] call EFUNC(common,deviceKeyRegisterNew);
+[(localize LSTRING(Name)), QPATHTOF(UI\Kestrel4500.paa), _conditonCode, _toggleCode, _closeCode] call EFUNC(common,deviceKeyRegisterNew);
diff --git a/addons/laser/functions/fnc_laserOn.sqf b/addons/laser/functions/fnc_laserOn.sqf
index 617492b614..b6e3258b90 100644
--- a/addons/laser/functions/fnc_laserOn.sqf
+++ b/addons/laser/functions/fnc_laserOn.sqf
@@ -1,23 +1,23 @@
-/*
- * Author: Nou
- * Turn a laser designator on.
- *
- * Arguments:
- * 0: Emitter