From 5fe33fb1dbf74aa36ee26d1cb37d937cf56d2106 Mon Sep 17 00:00:00 2001 From: commy2 Date: Fri, 10 Apr 2015 05:56:19 +0200 Subject: [PATCH] rename cfgAce_Triggers to ACE_Triggers --- addons/explosives/{CfgACE_Triggers.hpp => CfgTriggers.hpp} | 4 ++-- addons/explosives/config.cpp | 2 +- addons/explosives/functions/fnc_addClacker.sqf | 2 +- addons/explosives/functions/fnc_addDetonateActions.sqf | 2 +- addons/explosives/functions/fnc_getPlacedExplosives.sqf | 4 ++-- addons/explosives/functions/fnc_placeExplosive.sqf | 2 +- addons/explosives/functions/fnc_selectTrigger.sqf | 2 +- addons/explosives/functions/fnc_triggerType.sqf | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) rename addons/explosives/{CfgACE_Triggers.hpp => CfgTriggers.hpp} (96%) diff --git a/addons/explosives/CfgACE_Triggers.hpp b/addons/explosives/CfgTriggers.hpp similarity index 96% rename from addons/explosives/CfgACE_Triggers.hpp rename to addons/explosives/CfgTriggers.hpp index 6319444cb2..9c33246cd8 100644 --- a/addons/explosives/CfgACE_Triggers.hpp +++ b/addons/explosives/CfgTriggers.hpp @@ -1,10 +1,10 @@ -class CfgACE_Triggers { +class ACE_Triggers { /* onPlace parameters: 0: OBJECT - unit placing 1: OBJECT - Placed explosive 2: STRING - Magazine classname 3: ARRAY - vars -Last Index: CfgACE_Triggers config of trigger type. +Last Index: ACE_Triggers config of trigger type. onSetup parameters: 0: STRING - Magazine Classname */ diff --git a/addons/explosives/config.cpp b/addons/explosives/config.cpp index 9652c38dd2..3dcf295b87 100644 --- a/addons/explosives/config.cpp +++ b/addons/explosives/config.cpp @@ -18,7 +18,7 @@ class CfgPatches { #include "CfgMagazines.hpp" #include "CfgWeapons.hpp" #include "CfgVehicles.hpp" -#include "CfgACE_Triggers.hpp" +#include "CfgTriggers.hpp" #include "ExplosivesUI.hpp" class CfgActions { diff --git a/addons/explosives/functions/fnc_addClacker.sqf b/addons/explosives/functions/fnc_addClacker.sqf index 1e12b79d62..7e3529f931 100644 --- a/addons/explosives/functions/fnc_addClacker.sqf +++ b/addons/explosives/functions/fnc_addClacker.sqf @@ -12,7 +12,7 @@ * None * * Example: - * [player, _explosive, "SatchelCharge_Remote_Mag", [ConfigFile >> "CfgACE_Triggers" >> "Command"]] call ACE_Explosives_fnc_addClacker; + * [player, _explosive, "SatchelCharge_Remote_Mag", [ConfigFile >> "ACE_Triggers" >> "Command"]] call ACE_Explosives_fnc_addClacker; * * Public: Yes */ diff --git a/addons/explosives/functions/fnc_addDetonateActions.sqf b/addons/explosives/functions/fnc_addDetonateActions.sqf index 8c6cfb4d0c..5081040233 100644 --- a/addons/explosives/functions/fnc_addDetonateActions.sqf +++ b/addons/explosives/functions/fnc_addDetonateActions.sqf @@ -24,7 +24,7 @@ _result = [_unit] call FUNC(getPlacedExplosives); _children = []; { if (!isNull(_x select 0)) then { - _required = getArray (ConfigFile >> "CfgACE_Triggers" >> (_x select 4) >> "requires"); + _required = getArray (ConfigFile >> "ACE_Triggers" >> (_x select 4) >> "requires"); if (_detonator in _required) then { _item = ConfigFile >> "CfgMagazines" >> (_x select 3); diff --git a/addons/explosives/functions/fnc_getPlacedExplosives.sqf b/addons/explosives/functions/fnc_getPlacedExplosives.sqf index 9b40002bbe..1164972047 100644 --- a/addons/explosives/functions/fnc_getPlacedExplosives.sqf +++ b/addons/explosives/functions/fnc_getPlacedExplosives.sqf @@ -20,7 +20,7 @@ private ["_unit", "_clackerList", "_adjustedList", "_list", "_filter"]; _unit = _this select 0; _filter = nil; if (count _this > 1) then { - _filter = ConfigFile >> "CfgACE_Triggers" >> (_this select 1); + _filter = ConfigFile >> "ACE_Triggers" >> (_this select 1); }; _clackerList = []; _adjustedList = false; @@ -31,7 +31,7 @@ _list = []; _clackerList set [_foreachIndex, "X"]; _adjustedList = true; } else { - if (isNil "_filter" || {(ConfigFile >> "CfgACE_Triggers" >> (_x select 4)) == _filter}) then { + if (isNil "_filter" || {(ConfigFile >> "ACE_Triggers" >> (_x select 4)) == _filter}) then { _list pushBack _x; }; }; diff --git a/addons/explosives/functions/fnc_placeExplosive.sqf b/addons/explosives/functions/fnc_placeExplosive.sqf index 90997fd2ad..228e8eef23 100644 --- a/addons/explosives/functions/fnc_placeExplosive.sqf +++ b/addons/explosives/functions/fnc_placeExplosive.sqf @@ -33,7 +33,7 @@ if (isNil "_triggerConfig") exitWith { }; _magazineTrigger = ConfigFile >> "CfgMagazines" >> _magazineClass >> "ACE_Triggers" >> _triggerConfig; -_triggerConfig = ConfigFile >> "CfgACE_Triggers" >> _triggerConfig; +_triggerConfig = ConfigFile >> "ACE_Triggers" >> _triggerConfig; if (isNil "_triggerConfig") exitWith { diag_log format ["ACE_Explosives: Error config not found in PlaceExplosive: %1", _this]; diff --git a/addons/explosives/functions/fnc_selectTrigger.sqf b/addons/explosives/functions/fnc_selectTrigger.sqf index 48f7f3f199..53bc8b66cb 100644 --- a/addons/explosives/functions/fnc_selectTrigger.sqf +++ b/addons/explosives/functions/fnc_selectTrigger.sqf @@ -19,7 +19,7 @@ private ["_config"]; EXPLODE_3_PVT(_this,_explosive,_magazine,_trigger); -_config = ConfigFile >> "CfgACE_Triggers" >> _trigger; +_config = ConfigFile >> "ACE_Triggers" >> _trigger; // If the onSetup function returns true, it is handled elsewhere if (isText(_config >> "onSetup") && {[_explosive,_magazine] call compile getText (_config >> "onSetup")}) exitWith {}; diff --git a/addons/explosives/functions/fnc_triggerType.sqf b/addons/explosives/functions/fnc_triggerType.sqf index 8ebcbf6699..fc6a0b90c1 100644 --- a/addons/explosives/functions/fnc_triggerType.sqf +++ b/addons/explosives/functions/fnc_triggerType.sqf @@ -6,7 +6,7 @@ * 0: Explosive magazine * * Return Value: - * Supported triggers as CfgACE_Triggers config entries + * Supported triggers as ACE_Triggers config entries * * Example: * _supports = ["SatchelCharge_Remote_Mag"] call ACE_Explosives_fnc_TriggerType @@ -20,6 +20,6 @@ _config = getArray (ConfigFile >> "CfgMagazines" >> (_this select 0) >> "ACE_Tri _count = count _config; for "_index" from 0 to (_count - 1) do { - _result set [_index, ConfigFile >> "CfgACE_Triggers" >> (_config select _index)]; + _result set [_index, ConfigFile >> "ACE_Triggers" >> (_config select _index)]; }; _result