From b1d54a1907703b7752b6e1ce2a6764016647a193 Mon Sep 17 00:00:00 2001 From: lambdatiger Date: Thu, 11 Jan 2024 14:01:50 -0600 Subject: [PATCH] Fixed names and updated formatting --- addons/frag/XEH_postInit.sqf | 2 +- addons/frag/XEH_preInit.sqf | 4 ++-- addons/frag/XEH_preStart.sqf | 2 +- addons/frag/config.cpp | 2 +- addons/frag/functions/fnc_addBlackList.sqf | 2 +- addons/frag/functions/fnc_dev_addRound.sqf | 2 +- addons/frag/functions/fnc_dev_clearTraces.sqf | 2 +- addons/frag/functions/fnc_dev_drawTrace.sqf | 2 +- addons/frag/functions/fnc_dev_fired.sqf | 2 +- addons/frag/functions/fnc_dev_fragCalcDump.sqf | 2 +- addons/frag/functions/fnc_dev_sphereDraw.sqf | 2 +- addons/frag/functions/fnc_dev_switchUnitHandle.sqf | 2 +- addons/frag/functions/fnc_dev_trackHitBox.sqf | 2 +- addons/frag/functions/fnc_dev_trackObj.sqf | 2 +- addons/frag/functions/fnc_doFrag.sqf | 2 +- addons/frag/functions/fnc_doFragRandom.sqf | 2 +- addons/frag/functions/fnc_doFragTargeted.sqf | 2 +- addons/frag/functions/fnc_doReflections.sqf | 2 +- addons/frag/functions/fnc_doSpall.sqf | 2 +- addons/frag/functions/fnc_getFragInfo.sqf | 2 +- addons/frag/functions/fnc_getMaterialInfo.sqf | 6 +++--- addons/frag/functions/fnc_initBlackList.sqf | 2 +- addons/frag/functions/fnc_initMaterialCache.sqf | 4 ++-- addons/frag/functions/fnc_initRound.sqf | 2 +- addons/frag/functions/fnc_shouldFrag.sqf | 2 +- addons/frag/functions/fnc_shouldSpall.sqf | 2 +- addons/frag/functions/script_component.hpp | 1 - 27 files changed, 30 insertions(+), 31 deletions(-) delete mode 100644 addons/frag/functions/script_component.hpp diff --git a/addons/frag/XEH_postInit.sqf b/addons/frag/XEH_postInit.sqf index 063060551b..a6e97c85db 100644 --- a/addons/frag/XEH_postInit.sqf +++ b/addons/frag/XEH_postInit.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" ["CBA_settingsInitialized", { if (isServer) then { diff --git a/addons/frag/XEH_preInit.sqf b/addons/frag/XEH_preInit.sqf index 0356a4e739..1db6baf311 100644 --- a/addons/frag/XEH_preInit.sqf +++ b/addons/frag/XEH_preInit.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" ADDON = false; @@ -7,7 +7,7 @@ PREP_RECOMPILE_START; PREP_RECOMPILE_END; -GVAR(materialSpallCache) = createHashMap; +GVAR(spallMaterialCache) = createHashMap; GVAR(spallRoundCache) = createHashMap; GVAR(lastSpallTime) = -2; diff --git a/addons/frag/XEH_preStart.sqf b/addons/frag/XEH_preStart.sqf index 022888575e..32f7ab0ead 100644 --- a/addons/frag/XEH_preStart.sqf +++ b/addons/frag/XEH_preStart.sqf @@ -1,3 +1,3 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" #include "XEH_PREP.hpp" diff --git a/addons/frag/config.cpp b/addons/frag/config.cpp index f3b409dbd0..3728090f43 100644 --- a/addons/frag/config.cpp +++ b/addons/frag/config.cpp @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" class CfgPatches { class ADDON { diff --git a/addons/frag/functions/fnc_addBlackList.sqf b/addons/frag/functions/fnc_addBlackList.sqf index 3308351064..9e912ecd2c 100644 --- a/addons/frag/functions/fnc_addBlackList.sqf +++ b/addons/frag/functions/fnc_addBlackList.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Jaynus, NouberNou, Lambda.Tiger * Adds a round to the blacklist (will be ignored). diff --git a/addons/frag/functions/fnc_dev_addRound.sqf b/addons/frag/functions/fnc_dev_addRound.sqf index 332f2e8dc3..b8d7a27b23 100644 --- a/addons/frag/functions/fnc_dev_addRound.sqf +++ b/addons/frag/functions/fnc_dev_addRound.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Lambda.Tiger * This function adds a round to be traced diff --git a/addons/frag/functions/fnc_dev_clearTraces.sqf b/addons/frag/functions/fnc_dev_clearTraces.sqf index eabdeaeb31..27cd0fe4b6 100644 --- a/addons/frag/functions/fnc_dev_clearTraces.sqf +++ b/addons/frag/functions/fnc_dev_clearTraces.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Lambda.Tiger * Cleares all dev spheres and traces diff --git a/addons/frag/functions/fnc_dev_drawTrace.sqf b/addons/frag/functions/fnc_dev_drawTrace.sqf index 72fd7cd452..f2500e89ad 100644 --- a/addons/frag/functions/fnc_dev_drawTrace.sqf +++ b/addons/frag/functions/fnc_dev_drawTrace.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Lambda.Tiger * Per frame function to draw all dev traces diff --git a/addons/frag/functions/fnc_dev_fired.sqf b/addons/frag/functions/fnc_dev_fired.sqf index 3570035bb2..842ba0a1e2 100644 --- a/addons/frag/functions/fnc_dev_fired.sqf +++ b/addons/frag/functions/fnc_dev_fired.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Lambda.Tiger * Add fired rounds to dev track. diff --git a/addons/frag/functions/fnc_dev_fragCalcDump.sqf b/addons/frag/functions/fnc_dev_fragCalcDump.sqf index d95f622d47..90a2aa6607 100644 --- a/addons/frag/functions/fnc_dev_fragCalcDump.sqf +++ b/addons/frag/functions/fnc_dev_fragCalcDump.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Lambda.Tiger, based on fnc_dev_debugAmmo by "ACE-Team" * Dumps all ammo types to see if there's any reason to spawn fragments diff --git a/addons/frag/functions/fnc_dev_sphereDraw.sqf b/addons/frag/functions/fnc_dev_sphereDraw.sqf index b578138e1d..0484f0ff8d 100644 --- a/addons/frag/functions/fnc_dev_sphereDraw.sqf +++ b/addons/frag/functions/fnc_dev_sphereDraw.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Lambda.Tiger * Add a colored sphere at a specified point diff --git a/addons/frag/functions/fnc_dev_switchUnitHandle.sqf b/addons/frag/functions/fnc_dev_switchUnitHandle.sqf index 6c05a13699..2c73a3b8c0 100644 --- a/addons/frag/functions/fnc_dev_switchUnitHandle.sqf +++ b/addons/frag/functions/fnc_dev_switchUnitHandle.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Lambda.Tiger * Handle for debug actions when switching units diff --git a/addons/frag/functions/fnc_dev_trackHitBox.sqf b/addons/frag/functions/fnc_dev_trackHitBox.sqf index 2d42657b57..51df83d6e0 100644 --- a/addons/frag/functions/fnc_dev_trackHitBox.sqf +++ b/addons/frag/functions/fnc_dev_trackHitBox.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Lambda.Tiger * Add a hitbox outline to an object diff --git a/addons/frag/functions/fnc_dev_trackObj.sqf b/addons/frag/functions/fnc_dev_trackObj.sqf index 34f927dd98..8221067ec1 100644 --- a/addons/frag/functions/fnc_dev_trackObj.sqf +++ b/addons/frag/functions/fnc_dev_trackObj.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Lambda.Tiger * This function adds an object to have it's course tracked (every frame). diff --git a/addons/frag/functions/fnc_doFrag.sqf b/addons/frag/functions/fnc_doFrag.sqf index 5b6d5b5d4d..e3cf7d153c 100644 --- a/addons/frag/functions/fnc_doFrag.sqf +++ b/addons/frag/functions/fnc_doFrag.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Jaynus, NouberNou, Lambda.Tiger * This function handles creating both random and targeted fragments as well diff --git a/addons/frag/functions/fnc_doFragRandom.sqf b/addons/frag/functions/fnc_doFragRandom.sqf index f095e3fd43..5d9405e08f 100644 --- a/addons/frag/functions/fnc_doFragRandom.sqf +++ b/addons/frag/functions/fnc_doFragRandom.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Jaynus, NouberNou, Lambda.Tiger * This function creates fragments randomly spreading out from an explosion to diff --git a/addons/frag/functions/fnc_doFragTargeted.sqf b/addons/frag/functions/fnc_doFragTargeted.sqf index f0fa8019ef..1c5ec735d5 100644 --- a/addons/frag/functions/fnc_doFragTargeted.sqf +++ b/addons/frag/functions/fnc_doFragTargeted.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Jaynus, NouberNou, Lambda.Tiger * This function creates fragments targeted at specific entities, up to diff --git a/addons/frag/functions/fnc_doReflections.sqf b/addons/frag/functions/fnc_doReflections.sqf index 7b16385d75..023a283e81 100644 --- a/addons/frag/functions/fnc_doReflections.sqf +++ b/addons/frag/functions/fnc_doReflections.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: ACE-Team * Dev things diff --git a/addons/frag/functions/fnc_doSpall.sqf b/addons/frag/functions/fnc_doSpall.sqf index 5a30c0bb74..f77e072f67 100644 --- a/addons/frag/functions/fnc_doSpall.sqf +++ b/addons/frag/functions/fnc_doSpall.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Jaynus, NouberNou, Lambda.Tiger, * This function creates spalling if the hit slowed the speed down enough. diff --git a/addons/frag/functions/fnc_getFragInfo.sqf b/addons/frag/functions/fnc_getFragInfo.sqf index d34da54155..72f7da9805 100644 --- a/addons/frag/functions/fnc_getFragInfo.sqf +++ b/addons/frag/functions/fnc_getFragInfo.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Jaynus, NouberNou, Lambda.Tiger * This function returns fragmentation parameters for a specific diff --git a/addons/frag/functions/fnc_getMaterialInfo.sqf b/addons/frag/functions/fnc_getMaterialInfo.sqf index 34d401a1a2..e670b79159 100644 --- a/addons/frag/functions/fnc_getMaterialInfo.sqf +++ b/addons/frag/functions/fnc_getMaterialInfo.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Lambda.Tiger * This function returns a classification of material type based @@ -18,7 +18,7 @@ params ["_surfType"]; -private _material = GVAR(materialSpallCache) get _surfType; +private _material = GVAR(spallMaterialCache) get _surfType; TRACE_2("materialCache",_surfType,_material); if !(isNil "_material") exitWith { @@ -52,7 +52,7 @@ _material = switch (true) do { default { "ground" }; }; -GVAR(materialSpallCache) set [_surfType, _material]; +GVAR(spallMaterialCache) set [_surfType, _material]; TRACE_2("materialCacheSet",_surfType,_material); _material \ No newline at end of file diff --git a/addons/frag/functions/fnc_initBlackList.sqf b/addons/frag/functions/fnc_initBlackList.sqf index b67c0a31d9..6ba2a7066f 100644 --- a/addons/frag/functions/fnc_initBlackList.sqf +++ b/addons/frag/functions/fnc_initBlackList.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Lambda.Tiger * Adds setting defined blacklisted rounds to blacklist diff --git a/addons/frag/functions/fnc_initMaterialCache.sqf b/addons/frag/functions/fnc_initMaterialCache.sqf index d0cdc0e833..4aae38d7c3 100644 --- a/addons/frag/functions/fnc_initMaterialCache.sqf +++ b/addons/frag/functions/fnc_initMaterialCache.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Lambda.Tiger * For performance, we load a bunch of vanilla materials preemptively @@ -15,7 +15,7 @@ * Public: No */ -GVAR(materialSpallCache) = createHashMapFromArray [ +GVAR(spallMaterialCache) = createHashMapFromArray [ ["a3\data_f\penetration\armour.bisurf","metal"], ["a3\data_f\penetration\armour_plate.bisurf","metal"], ["a3\data_f\penetration\armour_plate_100mm.bisurf","metal"], diff --git a/addons/frag/functions/fnc_initRound.sqf b/addons/frag/functions/fnc_initRound.sqf index 14502036c5..a9c692e7f4 100644 --- a/addons/frag/functions/fnc_initRound.sqf +++ b/addons/frag/functions/fnc_initRound.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Lambda.Tiger * This function adds rounds using their config init EH diff --git a/addons/frag/functions/fnc_shouldFrag.sqf b/addons/frag/functions/fnc_shouldFrag.sqf index 1a5a92c119..f40d94bb9f 100644 --- a/addons/frag/functions/fnc_shouldFrag.sqf +++ b/addons/frag/functions/fnc_shouldFrag.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Lambda.Tiger * This function checks whether an ammunition type should cause fragmentation diff --git a/addons/frag/functions/fnc_shouldSpall.sqf b/addons/frag/functions/fnc_shouldSpall.sqf index 8eae8a81a5..9813481b1f 100644 --- a/addons/frag/functions/fnc_shouldSpall.sqf +++ b/addons/frag/functions/fnc_shouldSpall.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Lambda.Tiger * This function checks whether an ammunition type should cause spalling diff --git a/addons/frag/functions/script_component.hpp b/addons/frag/functions/script_component.hpp deleted file mode 100644 index 8312313751..0000000000 --- a/addons/frag/functions/script_component.hpp +++ /dev/null @@ -1 +0,0 @@ -#include "\z\ace\addons\frag\script_component.hpp" \ No newline at end of file