From 0e09d5de672d81a60fcd8140ab1452c0d0b6ed66 Mon Sep 17 00:00:00 2001 From: Garth L-H de Wet Date: Tue, 13 Jan 2015 23:21:31 +0200 Subject: [PATCH] Added the function's script_component.hpp that includes the correct file. To reduce potential pain areas if a rename occurs. --- addons/explosives/functions/fnc_addClacker.sqf | 2 +- addons/explosives/functions/fnc_canDefuse.sqf | 2 +- addons/explosives/functions/fnc_canDetonate.sqf | 2 +- addons/explosives/functions/fnc_defuseExplosive.sqf | 2 +- addons/explosives/functions/fnc_detonateExplosive.sqf | 2 +- addons/explosives/functions/fnc_getDetonators.sqf | 2 +- addons/explosives/functions/fnc_getPlacedExplosives.sqf | 2 +- addons/explosives/functions/fnc_handleScrollWheel.sqf | 2 +- addons/explosives/functions/fnc_hasExplosives.sqf | 2 +- addons/explosives/functions/fnc_hasPlacedExplosives.sqf | 2 +- addons/explosives/functions/fnc_module.sqf | 2 +- addons/explosives/functions/fnc_openDetonateUI.sqf | 2 +- addons/explosives/functions/fnc_openPlaceUI.sqf | 2 +- addons/explosives/functions/fnc_openTimerSetUI.sqf | 2 +- addons/explosives/functions/fnc_openTransmitterUI.sqf | 2 +- addons/explosives/functions/fnc_openTriggerSelectionUI.sqf | 2 +- addons/explosives/functions/fnc_placeExplosive.sqf | 2 +- addons/explosives/functions/fnc_place_Approve.sqf | 2 +- addons/explosives/functions/fnc_place_Cancel.sqf | 2 +- addons/explosives/functions/fnc_selectTrigger.sqf | 2 +- addons/explosives/functions/fnc_setPosition.sqf | 2 +- addons/explosives/functions/fnc_setupExplosive.sqf | 2 +- addons/explosives/functions/fnc_startDefuse.sqf | 2 +- addons/explosives/functions/fnc_startTimer.sqf | 2 +- addons/explosives/functions/fnc_triggerType.sqf | 2 +- addons/explosives/functions/script_component.hpp | 1 + 26 files changed, 26 insertions(+), 25 deletions(-) create mode 100644 addons/explosives/functions/script_component.hpp diff --git a/addons/explosives/functions/fnc_addClacker.sqf b/addons/explosives/functions/fnc_addClacker.sqf index bbe1af1eb2..c1f7b51c46 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 "\z\ace\explosives\script_component.hpp" +#include "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 f145d85f93..bdc934e43b 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 "\z\ace\explosives\script_component.hpp" +#include "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_canDetonate.sqf b/addons/explosives/functions/fnc_canDetonate.sqf index 85a93c267d..672dc4ca1a 100644 --- a/addons/explosives/functions/fnc_canDetonate.sqf +++ b/addons/explosives/functions/fnc_canDetonate.sqf @@ -15,7 +15,7 @@ BOOLEAN - if the unit has explosives and detonators. Example: [player] call ACE_Explosives_fnc_canDetonate; */ -#include "\z\ace\explosives\script_component.hpp" +#include "script_component.hpp" private "_unit"; _unit = _this select 0; diff --git a/addons/explosives/functions/fnc_defuseExplosive.sqf b/addons/explosives/functions/fnc_defuseExplosive.sqf index f61821782a..243e6b44e0 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 "\z\ace\explosives\script_component.hpp" +#include "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 459a4a9451..9443be6bc1 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 "\z\ace\explosives\script_component.hpp" +#include "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 40829c747e..77549c0e3b 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 "\z\ace\explosives\script_component.hpp" +#include "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 d7297b9bb6..0343b76521 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 "\z\ace\explosives\script_component.hpp" +#include "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 d42bf02276..12c31911e6 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 "\z\ace\explosives\script_component.hpp" +#include "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 43313f0139..79596b1b1e 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 "\z\ace\explosives\script_component.hpp" +#include "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 69c2b4eebf..ad6f29a02e 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 "\z\ace\explosives\script_component.hpp" +#include "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 8381e55b42..415b537266 100644 --- a/addons/explosives/functions/fnc_module.sqf +++ b/addons/explosives/functions/fnc_module.sqf @@ -15,7 +15,7 @@ Example: */ -#include "\z\ace\explosives\script_component.hpp" +#include "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 8b5f206d82..1073bcb5fa 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 "\z\ace\explosives\script_component.hpp" +#include "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 b9404b5663..6153a4ab2e 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 "\z\ace\explosives\script_component.hpp" +#include "script_component.hpp" private ["_unit","_mags", "_item", "_index", "_actions"]; _unit = _this select 0; call FUNC(place_Cancel); diff --git a/addons/explosives/functions/fnc_openTimerSetUI.sqf b/addons/explosives/functions/fnc_openTimerSetUI.sqf index 955a25fea4..dda771f98d 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 "\z\ace\explosives\script_component.hpp" +#include "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 3d1e19063b..ffa1aa1fde 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 "\z\ace\explosives\script_component.hpp" +#include "script_component.hpp" private ["_items", "_unit", "_count", "_actions", "_config"]; _unit = _this select 0; _items = (items _unit); diff --git a/addons/explosives/functions/fnc_openTriggerSelectionUI.sqf b/addons/explosives/functions/fnc_openTriggerSelectionUI.sqf index 72c2c54012..e20c0f29e8 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 "\z\ace\explosives\script_component.hpp" +#include "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 2d945757d5..a0adef1241 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 "\z\ace\explosives\script_component.hpp" +#include "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 67f985ff14..f75d1a5fcc 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 "\z\ace\explosives\script_component.hpp" +#include "script_component.hpp" if (GVAR(pfeh_running)) then { [QGVAR(Placement),"OnEachFrame"] call CALLSTACK(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 e3bf212e21..44fa3dd432 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 "\z\ace\explosives\script_component.hpp" +#include "script_component.hpp" if (GVAR(pfeh_running)) then { [QGVAR(Placement),"OnEachFrame"] call CALLSTACK(BIS_fnc_removeStackedEventHandler); GVAR(pfeh_running) = false; diff --git a/addons/explosives/functions/fnc_selectTrigger.sqf b/addons/explosives/functions/fnc_selectTrigger.sqf index 33fa771b20..8009cb1c9d 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 "\z\ace\explosives\script_component.hpp" +#include "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 9e51e8f7b0..b195bf0562 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 "\z\ace\explosives\script_component.hpp" +#include "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 570fc71b22..fdbcb66a2a 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 "\z\ace\explosives\script_component.hpp" +#include "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 a44b03ae22..abc44a6475 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 "\z\ace\explosives\script_component.hpp" +#include "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 cd7cdffeca..89a618463f 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 "\z\ace\explosives\script_component.hpp" +#include "script_component.hpp" [{ private ["_explosive"]; _explosive = _this select 0; diff --git a/addons/explosives/functions/fnc_triggerType.sqf b/addons/explosives/functions/fnc_triggerType.sqf index ad6029d426..dead725a7a 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 "\z\ace\explosives\script_component.hpp" +#include "script_component.hpp" private "_result"; _result = []; _config = getArray (ConfigFile >> "CfgMagazines" >> (_this select 0) >> "ACE_Triggers" >> "SupportedTriggers"); diff --git a/addons/explosives/functions/script_component.hpp b/addons/explosives/functions/script_component.hpp new file mode 100644 index 0000000000..438330c587 --- /dev/null +++ b/addons/explosives/functions/script_component.hpp @@ -0,0 +1 @@ +#include "\z\ace\addons\explosives\script_component.hpp"