diff --git a/addons/explosives/CfgACE_Triggers.hpp b/addons/explosives/CfgACE_Triggers.hpp index eb3df6a906..15707c685c 100644 --- a/addons/explosives/CfgACE_Triggers.hpp +++ b/addons/explosives/CfgACE_Triggers.hpp @@ -10,28 +10,28 @@ class CfgACE_Triggers { */ class Command { displayName = $STR_ACE_Explosives_clacker_displayName; - picture = "\ACE_Explosives\Data\UI\Clacker.paa"; + picture = QUOTE( PATHTOF(Data\UI\Clacker.paa) ); onPlace = QUOTE( _this call FUNC(AddClacker);false ); requires[] = {"ACE_Clacker"}; }; class MK16_Transmitter:Command { displayName = $STR_ACE_Explosives_MK16_displayName; - picture = "\ACE_Explosives\Data\UI\MK16_Reciever_ca.paa"; + picture = QUOTE( PATHTOF(Data\UI\MK16_Reciever_ca.paa) ); requires[] = {"ACE_M26_Clacker"}; }; class DeadManSwitch:Command { displayName = $STR_ACE_Explosives_DeadManSwitch_displayName; - picture = "\ACE_Explosives\Data\UI\DeadmanSwitch.paa"; + picture = QUOTE( PATHTOF(Data\UI\DeadmanSwitch.paa) ); requires[] = {"ACE_DeadManSwitch"}; }; class PressurePlate { displayName = $STR_ACE_Explosives_PressurePlate; - picture = "ACE_Explosives\data\UI\PressurePlate.paa"; + picture = QUOTE( PATHTOF(Data\UI\PressurePlate.paa) ); onPlace = "_dist=GetNumber(ConfigFile >> 'CfgMagazines' >> (_this select 2) >> 'ACE_Triggers' >> 'PressurePlate' >> 'digDistance');_ex=_this select 1;_ex setPosATL ((getPosATL _ex) vectorDiff ((VectorUp _ex) vectorCrossProduct [0,0,_dist]));false"; }; class IRSensor { displayName = $STR_ACE_Explosives_IRSensor; - picture = "ACE_Explosives\data\UI\PressurePlate.paa"; + picture = QUOTE( PATHTOF(Data\UI\PressurePlate.paa) ); onPlace = "false"; }; class Timer { @@ -42,7 +42,7 @@ class CfgACE_Triggers { }; class Tripwire { displayName = $STR_ACE_Explosives_TripWire; - picture = "ACE_Explosives\data\UI\Tripwire.paa"; + picture = QUOTE( PATHTOF(Data\UI\Tripwire.paa) ); onPlace = "false"; }; }; diff --git a/addons/explosives/CfgModule.hpp b/addons/explosives/CfgModule.hpp index 6dd23fea86..2480086461 100644 --- a/addons/explosives/CfgModule.hpp +++ b/addons/explosives/CfgModule.hpp @@ -6,7 +6,7 @@ class ACE_ModuleExplosive: Module_F { function = QUOTE( FUNC(module) ); scope = 2; isGlobal = 1; - icon = "\ACE_Explosives\UI\IconExplosives_ca.paa"; + icon = QUOTE( PATHTOF(UI\IconExplosives_ca.paa) ); class Arguments { class RequireSpecialist { displayName = "Require specialists?"; diff --git a/addons/explosives/CfgVehicles.hpp b/addons/explosives/CfgVehicles.hpp index 40863cf917..9db2590306 100644 --- a/addons/explosives/CfgVehicles.hpp +++ b/addons/explosives/CfgVehicles.hpp @@ -15,7 +15,7 @@ class CfgVehicles { exceptions[] = {"ACE_Interaction_isNotSwimming"}; \ showDisabled = 1; priority = 4; - icon = "ACE_Explosives\UI\Explosives_Menu_ca.paa"; + icon = QUOTE( PATHTOF(UI\Explosives_Menu_ca.paa) ); subMenu[] = {"ACE_Explosives", 1}; hotkey = "X"; //Sub-menu items @@ -25,7 +25,7 @@ class CfgVehicles { statement = QUOTE( [_player] call FUNC(openTransmitterUI); ); exceptions[] = {"ACE_Interaction_isNotSwimming"}; \ showDisabled = 1; - icon = "ACE_Explosives\UI\Explosives_Menu_ca.paa"; + icon = QUOTE( PATHTOF(UI\Explosives_Menu_ca.paa) ); priority = 2; hotkey = "T"; }; @@ -35,7 +35,7 @@ class CfgVehicles { statement = QUOTE( [_player] call FUNC(openPlaceUI); ); exceptions[] = {"ACE_Interaction_isNotSwimming"}; \ showDisabled = 1; - icon = "ACE_Explosives\UI\Place_Explosive_ca.paa"; + icon = QUOTE( PATHTOF(UI\Place_Explosive_ca.paa) ); priority = 1; hotkey = "P"; }; @@ -45,7 +45,7 @@ class CfgVehicles { statement = QUOTE( [_player, EGVAR(Interaction, Target)] call FUNC(startDefuse); ); exceptions[] = {"ACE_Interaction_isNotSwimming"}; \ showDisabled = 0; - icon = "ACE_Explosives\UI\Defuse_ca.paa"; + icon = QUOTE( PATHTOF(UI\Defuse_ca.paa) ); priority = 0.8; hotkey = "F"; }; diff --git a/addons/explosives/CfgWeapons.hpp b/addons/explosives/CfgWeapons.hpp index 97332ed8f6..20553b2373 100644 --- a/addons/explosives/CfgWeapons.hpp +++ b/addons/explosives/CfgWeapons.hpp @@ -11,7 +11,7 @@ class CfgWeapons { scope = 2; displayName = $STR_ACE_Explosives_clacker_displayName; descriptionShort = $STR_ACE_Explosives_clacker_description; - picture = "\ACE_Explosives\Data\UI\Clacker.paa"; + picture = QUOTE( PATHTOF(Data\UI\Clacker.paa) ); model = "\A3\weapons_F\ammo\mag_univ.p3d"; ACE_Range = 250; ACE_Detonator = 1; @@ -23,14 +23,14 @@ class CfgWeapons { }; class ACE_M26_Clacker: ACE_Clacker { displayName = $STR_ACE_Explosives_M26_displayName; - picture = "\ACE_Explosives\Data\UI\MK26_Transmitter_ca.paa"; + picture = QUOTE( PATHTOF(Data\UI\MK26_Transmitter_ca.paa) ); ACE_Range = 5000; }; class ACE_DefusalKit: ACE_ItemCore { scope = 2; displayName = $STR_ACE_Explosives_DefusalKit_displayName; descriptionShort = $STR_ACE_Explosives_DefusalKit_description; - picture = "\ACE_Explosives\Data\UI\Pliers.paa"; + picture = QUOTE( PATHTOF(Data\UI\Pliers.paa) ); model = "\A3\Structures_F\Items\Tools\Pliers_F.p3d"; class ItemInfo: ACE_ExplosiveItem { @@ -42,7 +42,7 @@ class CfgWeapons { scope = 2; displayName = $STR_ACE_Explosives_DeadManSwitch_displayName; descriptionShort = $STR_ACE_Explosives_DeadManSwitch_description; - picture = "\ACE_Explosives\Data\UI\DeadmanSwitch.paa"; + picture = QUOTE( PATHTOF(Data\UI\DeadmanSwitch.paa) ); model = "\A3\weapons_F\ammo\mag_univ.p3d"; ACE_Range = 100; ACE_Detonator = 1; diff --git a/addons/explosives/functions/fnc_addClacker.sqf b/addons/explosives/functions/fnc_addClacker.sqf index c1f7b51c46..bbe1af1eb2 100644 --- a/addons/explosives/functions/fnc_addClacker.sqf +++ b/addons/explosives/functions/fnc_addClacker.sqf @@ -19,7 +19,7 @@ Example: [_unit, _explosive, "SatchelCharge_Remote_Mag", [ConfigFile >> "CfgACE_Triggers" >> "Command"]] call ACE_Explosives_fnc_AddClacker; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" private ["_unit", "_explosive", "_clacker", "_config", "_magazineClass", "_requiredItems", "_hasRequired"]; _unit = _this select 0; _explosive = _this select 1; diff --git a/addons/explosives/functions/fnc_canDefuse.sqf b/addons/explosives/functions/fnc_canDefuse.sqf index 5d8830571b..9d08d795f6 100644 --- a/addons/explosives/functions/fnc_canDefuse.sqf +++ b/addons/explosives/functions/fnc_canDefuse.sqf @@ -15,7 +15,7 @@ Example: [player] call ACE_Explosives_fnc_CanDefuse; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" private "_unit"; _unit = _this select 0; if (vehicle _unit != _unit || {!("ACE_DefusalKit" in (items _unit))}) exitWith {false}; diff --git a/addons/explosives/functions/fnc_defuseExplosive.sqf b/addons/explosives/functions/fnc_defuseExplosive.sqf index 243e6b44e0..f61821782a 100644 --- a/addons/explosives/functions/fnc_defuseExplosive.sqf +++ b/addons/explosives/functions/fnc_defuseExplosive.sqf @@ -16,7 +16,7 @@ Example: [player, ACE_Interaction_Target] call ACE_Explosives_fnc_defuseExplosive; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" private ["_unit", "_explosive"]; _unit = _this select 0; _explosive = _this select 1; diff --git a/addons/explosives/functions/fnc_detonateExplosive.sqf b/addons/explosives/functions/fnc_detonateExplosive.sqf index 9443be6bc1..459a4a9451 100644 --- a/addons/explosives/functions/fnc_detonateExplosive.sqf +++ b/addons/explosives/functions/fnc_detonateExplosive.sqf @@ -21,7 +21,7 @@ // Clacker [player, 100, [Explosive, 1]] call ACE_Explosives_fnc_detonateExplosive; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" private ["_item","_result", "_ignoreRange", "_unit", "_range"]; _unit = _this select 0; _range = _this select 1; diff --git a/addons/explosives/functions/fnc_getDetonators.sqf b/addons/explosives/functions/fnc_getDetonators.sqf index 77549c0e3b..40829c747e 100644 --- a/addons/explosives/functions/fnc_getDetonators.sqf +++ b/addons/explosives/functions/fnc_getDetonators.sqf @@ -16,7 +16,7 @@ Example: _detonators = [player] call ACE_Explosives_fnc_getDetonators; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" private ["_unit", "_items", "_result", "_config"]; _unit = _this select 0; _items = (items _unit); diff --git a/addons/explosives/functions/fnc_getPlacedExplosives.sqf b/addons/explosives/functions/fnc_getPlacedExplosives.sqf index 0343b76521..d7297b9bb6 100644 --- a/addons/explosives/functions/fnc_getPlacedExplosives.sqf +++ b/addons/explosives/functions/fnc_getPlacedExplosives.sqf @@ -17,7 +17,7 @@ _allExplosives = [player] call ACE_Explosives_fnc_getPlacedExplosives; _deadmanExplosives = [player, "DeadManSwitch"] call ACE_Explosives_fnc_getPlacedExplosives; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" private ["_unit", "_clackerList", "_adjustedList", "_list", "_filter"]; _unit = _this select 0; _filter = nil; diff --git a/addons/explosives/functions/fnc_handleScrollWheel.sqf b/addons/explosives/functions/fnc_handleScrollWheel.sqf index 12c31911e6..d42bf02276 100644 --- a/addons/explosives/functions/fnc_handleScrollWheel.sqf +++ b/addons/explosives/functions/fnc_handleScrollWheel.sqf @@ -16,7 +16,7 @@ Example: 1.2 call ACE_Explosives_fnc_HandleScrollWheel; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" private ["_obj"]; if (isNull(GVAR(Setup)) || {ACE_Modifier == 0} || !GVAR(pfeh_running)) exitWith {false}; _this = _this * 5; diff --git a/addons/explosives/functions/fnc_hasExplosives.sqf b/addons/explosives/functions/fnc_hasExplosives.sqf index 79596b1b1e..43313f0139 100644 --- a/addons/explosives/functions/fnc_hasExplosives.sqf +++ b/addons/explosives/functions/fnc_hasExplosives.sqf @@ -15,7 +15,7 @@ Example: _hasExplosives = [player] call ACE_Explosives_fnc_hasExplosives; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" private ["_unit", "_result", "_magazines"]; _result = false; _unit = _this select 0; diff --git a/addons/explosives/functions/fnc_hasPlacedExplosives.sqf b/addons/explosives/functions/fnc_hasPlacedExplosives.sqf index ad6f29a02e..69c2b4eebf 100644 --- a/addons/explosives/functions/fnc_hasPlacedExplosives.sqf +++ b/addons/explosives/functions/fnc_hasPlacedExplosives.sqf @@ -15,5 +15,5 @@ Example: _hasPLacedExplosives = [player] call ACE_Explosives_fnc_hasPlacedExplosives; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" (count (_this call FUNC(getPlacedExplosives)) > 0) diff --git a/addons/explosives/functions/fnc_module.sqf b/addons/explosives/functions/fnc_module.sqf index e4186edf4e..44e3cf5321 100644 --- a/addons/explosives/functions/fnc_module.sqf +++ b/addons/explosives/functions/fnc_module.sqf @@ -15,7 +15,7 @@ Example: */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" if !(isServer) exitWith {}; _logic = _this select 0; _activated = _this select 2; diff --git a/addons/explosives/functions/fnc_openDetonateUI.sqf b/addons/explosives/functions/fnc_openDetonateUI.sqf index 1073bcb5fa..8b5f206d82 100644 --- a/addons/explosives/functions/fnc_openDetonateUI.sqf +++ b/addons/explosives/functions/fnc_openDetonateUI.sqf @@ -16,7 +16,7 @@ Example: [player, "ACE_M26_Clacker"] call ACE_Explosives_fnc_openDetonateUI; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" private ["_unit","_result", "_item"]; call EFUNC(Interaction,hideMenu); _unit = _this select 0; diff --git a/addons/explosives/functions/fnc_openPlaceUI.sqf b/addons/explosives/functions/fnc_openPlaceUI.sqf index fa14a108fc..6961bef808 100644 --- a/addons/explosives/functions/fnc_openPlaceUI.sqf +++ b/addons/explosives/functions/fnc_openPlaceUI.sqf @@ -15,7 +15,7 @@ Example: [player] call ACE_Explosives_fnc_openPlaceUI; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" private ["_unit","_mags", "_item", "_index", "_actions"]; _unit = _this select 0; call FUNC(place_Cancel); @@ -53,7 +53,7 @@ _actions = [localize "STR_ACE_Explosives_PlaceMenu", localize "STR_ACE_Explosive }, { call EFUNC(Interaction,hideMenu); - if !(profileNamespace getVariable ["ACE_Interaction_AutoCloseMenu", false]) then { + if !(profileNamespace getVariable [QUOTE( EGVAR(Interaction, AutoCloseMenu) ), false]) then { "ACE_Explosives" call EFUNC(Interaction,openMenuSelf); }; } diff --git a/addons/explosives/functions/fnc_openTimerSetUI.sqf b/addons/explosives/functions/fnc_openTimerSetUI.sqf index dda771f98d..955a25fea4 100644 --- a/addons/explosives/functions/fnc_openTimerSetUI.sqf +++ b/addons/explosives/functions/fnc_openTimerSetUI.sqf @@ -15,7 +15,7 @@ Example: [player] call ACE_Explosives_fnc_openTimerSetUI; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" private ["_mag"]; _mag = _this select 0; createDialog "RscACE_SelectTimeUI"; diff --git a/addons/explosives/functions/fnc_openTransmitterUI.sqf b/addons/explosives/functions/fnc_openTransmitterUI.sqf index 6929ffc82c..fcd305d9bd 100644 --- a/addons/explosives/functions/fnc_openTransmitterUI.sqf +++ b/addons/explosives/functions/fnc_openTransmitterUI.sqf @@ -15,7 +15,7 @@ Example: [player] call ACE_Explosives_fnc_openTransmitterUI; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" private ["_items", "_unit", "_count", "_actions", "_config"]; _unit = _this select 0; _items = (items _unit); @@ -45,7 +45,7 @@ if (count _detonators == 0) then { }, { call EFUNC(Interaction,hideMenu); - if !(profileNamespace getVariable ["ACE_Interaction_AutoCloseMenu", false]) then { + if !(profileNamespace getVariable [QUOTE( EGVAR(Interaction, AutoCloseMenu) ), false]) then { "ACE_Explosives" call EFUNC(Interaction,openMenuSelf); }; } diff --git a/addons/explosives/functions/fnc_openTriggerSelectionUI.sqf b/addons/explosives/functions/fnc_openTriggerSelectionUI.sqf index 7a87cb062e..95d882cb6c 100644 --- a/addons/explosives/functions/fnc_openTriggerSelectionUI.sqf +++ b/addons/explosives/functions/fnc_openTriggerSelectionUI.sqf @@ -15,7 +15,7 @@ Example: [lbData [8866, lbCurSel 8866]] call ACE_Explosives_fnc_openTriggerSelectionUI; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" private ["_magazine", "_hasRequiredItems","_triggerTypes", "_actions", "_detonators", "_required", "_magTriggers"]; _magazine = _this select 0; _detonators = [ACE_player] call FUNC(getDetonators); diff --git a/addons/explosives/functions/fnc_placeExplosive.sqf b/addons/explosives/functions/fnc_placeExplosive.sqf index c059798867..823ac700b6 100644 --- a/addons/explosives/functions/fnc_placeExplosive.sqf +++ b/addons/explosives/functions/fnc_placeExplosive.sqf @@ -21,7 +21,7 @@ Example: _explosive = [player, player modelToWorld [0,0.5, 0.1], 134, "SatchelCharge_Remote_Mag", "Command", []] call ACE_Explosives_fnc_PlaceExplosive; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" private ["_pos", "_dir", "_magazineClass", "_ammo", "_triggerSpecificVars", "_unit", "_triggerConfig", "_explosive"]; _unit = _this select 0; _pos = _this select 1; diff --git a/addons/explosives/functions/fnc_place_Approve.sqf b/addons/explosives/functions/fnc_place_Approve.sqf index 38cf9f5788..88635341fb 100644 --- a/addons/explosives/functions/fnc_place_Approve.sqf +++ b/addons/explosives/functions/fnc_place_Approve.sqf @@ -16,7 +16,7 @@ Example: call ACE_Explosives_fnc_Place_Approve; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" if (GVAR(pfeh_running)) then { [QGVAR(Placement),"OnEachFrame"] call BIS_fnc_removeStackedEventHandler; GVAR(pfeh_running) = false; diff --git a/addons/explosives/functions/fnc_place_Cancel.sqf b/addons/explosives/functions/fnc_place_Cancel.sqf index 57a270023c..f06d7e5584 100644 --- a/addons/explosives/functions/fnc_place_Cancel.sqf +++ b/addons/explosives/functions/fnc_place_Cancel.sqf @@ -16,7 +16,7 @@ Example: call ACE_Explosives_fnc_Place_Cancel; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" if (GVAR(pfeh_running)) then { [QGVAR(Placement),"OnEachFrame"] call BIS_fnc_removeStackedEventHandler; GVAR(pfeh_running) = false; diff --git a/addons/explosives/functions/fnc_selectTrigger.sqf b/addons/explosives/functions/fnc_selectTrigger.sqf index 8009cb1c9d..33fa771b20 100644 --- a/addons/explosives/functions/fnc_selectTrigger.sqf +++ b/addons/explosives/functions/fnc_selectTrigger.sqf @@ -16,7 +16,7 @@ Example: ["SatchelCharge_Remote_Mag","Timer"] call ACE_Explosives_fnc_selectTrigger; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" private ["_magazine","_trigger"]; closeDialog 0; _magazine = _this select 0; diff --git a/addons/explosives/functions/fnc_setPosition.sqf b/addons/explosives/functions/fnc_setPosition.sqf index a4cba8a107..a915da08df 100644 --- a/addons/explosives/functions/fnc_setPosition.sqf +++ b/addons/explosives/functions/fnc_setPosition.sqf @@ -18,7 +18,7 @@ Example: [_explosive, 150, 90] call ACE_Explosives_fnc_SetPos; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" private "_ex"; _ex=_this select 0; _ex setDir (_this select 1); diff --git a/addons/explosives/functions/fnc_setupExplosive.sqf b/addons/explosives/functions/fnc_setupExplosive.sqf index dcb30415c4..2a1ece30fd 100644 --- a/addons/explosives/functions/fnc_setupExplosive.sqf +++ b/addons/explosives/functions/fnc_setupExplosive.sqf @@ -19,7 +19,7 @@ Example: [player, "SatchelCharge_Remote_Mag", "Command"] call ACE_Explosives_fnc_SetupExplosive; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" private ["_unit", "_class", "_config", "_timer"]; _unit = _this select 0; _class = _this select 1; diff --git a/addons/explosives/functions/fnc_startDefuse.sqf b/addons/explosives/functions/fnc_startDefuse.sqf index 77964b3224..2106f3f842 100644 --- a/addons/explosives/functions/fnc_startDefuse.sqf +++ b/addons/explosives/functions/fnc_startDefuse.sqf @@ -16,7 +16,7 @@ Example: [player, ACE_Interaction_Target] call ACE_Explosives_fnc_StartDefuse; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" private ["_unit","_target"]; _unit = _this select 0; _target = _this select 1; diff --git a/addons/explosives/functions/fnc_startTimer.sqf b/addons/explosives/functions/fnc_startTimer.sqf index 61a0fc5246..2fc0e20dfc 100644 --- a/addons/explosives/functions/fnc_startTimer.sqf +++ b/addons/explosives/functions/fnc_startTimer.sqf @@ -17,7 +17,7 @@ Example: [_explosive, 10] call ACE_Explosives_fnc_startTimer; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" _this spawn { // TODO: use scheduled delay execution private ["_explosive", "_timer"]; _explosive = _this select 0; diff --git a/addons/explosives/functions/fnc_triggerType.sqf b/addons/explosives/functions/fnc_triggerType.sqf index dead725a7a..ad6029d426 100644 --- a/addons/explosives/functions/fnc_triggerType.sqf +++ b/addons/explosives/functions/fnc_triggerType.sqf @@ -16,7 +16,7 @@ Example: _supports = ["SatchelCharge_Remote_Mag"] call ACE_Explosives_fnc_TriggerType; */ -#include "script_component.hpp" +#include "\z\ace\explosives\script_component.hpp" private "_result"; _result = []; _config = getArray (ConfigFile >> "CfgMagazines" >> (_this select 0) >> "ACE_Triggers" >> "SupportedTriggers");