From ab8530d5aa19787c2fcecd4234519dbfd43c80e2 Mon Sep 17 00:00:00 2001 From: jonpas Date: Thu, 7 Dec 2023 04:25:17 +0100 Subject: [PATCH] Tools - Add HEMTT SQF support --- .hemtt/project.toml | 5 ++--- addons/acre/XEH_preInit.sqf | 2 +- addons/acre/{initSettings.sqf => initSettings.inc.sqf} | 2 +- ...ingsChannelNames.sqf => initSettingsChannelNames.inc.sqf} | 0 addons/ai_disembark/XEH_preInit.sqf | 2 +- .../ai_disembark/{initSettings.sqf => initSettings.inc.sqf} | 0 addons/back_to_game/XEH_preInit.sqf | 2 +- .../back_to_game/{initSettings.sqf => initSettings.inc.sqf} | 0 addons/fatigue/XEH_preInit.sqf | 2 +- addons/fatigue/{initSettings.sqf => initSettings.inc.sqf} | 0 addons/friendly_fire/XEH_preInit.sqf | 2 +- .../friendly_fire/{initSettings.sqf => initSettings.inc.sqf} | 0 addons/grass/XEH_preInit.sqf | 2 +- addons/grass/{initSettings.sqf => initSettings.inc.sqf} | 0 addons/insurgents/XEH_preInit.sqf | 2 +- addons/insurgents/{initSettings.sqf => initSettings.inc.sqf} | 0 addons/pointing/XEH_postInit.sqf | 2 +- addons/pointing/XEH_preInit.sqf | 2 +- addons/pointing/{initKeybinds.sqf => initKeybinds.inc.sqf} | 0 addons/pointing/{initSettings.sqf => initSettings.inc.sqf} | 0 addons/remotesensors/XEH_preInit.sqf | 2 +- .../remotesensors/{initSettings.sqf => initSettings.inc.sqf} | 0 addons/respawn/XEH_preInit.sqf | 2 +- addons/respawn/{initSettings.sqf => initSettings.inc.sqf} | 0 addons/safestart/XEH_preInit.sqf | 2 +- addons/safestart/{initSettings.sqf => initSettings.inc.sqf} | 0 addons/spectator/XEH_preInit.sqf | 2 +- addons/spectator/{initSettings.sqf => initSettings.inc.sqf} | 0 addons/tagging/XEH_preInit.sqf | 2 +- addons/tagging/{initSettings.sqf => initSettings.inc.sqf} | 0 addons/towing/XEH_preInit.sqf | 2 +- addons/towing/{initSettings.sqf => initSettings.inc.sqf} | 0 32 files changed, 18 insertions(+), 19 deletions(-) rename addons/acre/{initSettings.sqf => initSettings.inc.sqf} (97%) rename addons/acre/{initSettingsChannelNames.sqf => initSettingsChannelNames.inc.sqf} (100%) rename addons/ai_disembark/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/back_to_game/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/fatigue/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/friendly_fire/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/grass/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/insurgents/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/pointing/{initKeybinds.sqf => initKeybinds.inc.sqf} (100%) rename addons/pointing/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/remotesensors/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/respawn/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/safestart/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/spectator/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/tagging/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/towing/{initSettings.sqf => initSettings.inc.sqf} (100%) diff --git a/.hemtt/project.toml b/.hemtt/project.toml index 0c2309e6..9a156161 100644 --- a/.hemtt/project.toml +++ b/.hemtt/project.toml @@ -19,11 +19,10 @@ author = "ArmaForces" [version] path = "addons/main/script_version.hpp" +# Unused in HEMTT v1.11 or higher, kept for backwards compatibility [asc] exclude = [ - "initSettings.sqf", - "initKeybinds.sqf", - "initSettingsChannelNames.sqf", + ".inc.sqf", ] [hemtt.launch] diff --git a/addons/acre/XEH_preInit.sqf b/addons/acre/XEH_preInit.sqf index 1be61b4d..d26f6a05 100644 --- a/addons/acre/XEH_preInit.sqf +++ b/addons/acre/XEH_preInit.sqf @@ -7,7 +7,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" // Add arsenal category if (EGVAR(common,aceArsenal) && {GVAR(addArsenalCategory)}) then { diff --git a/addons/acre/initSettings.sqf b/addons/acre/initSettings.inc.sqf similarity index 97% rename from addons/acre/initSettings.sqf rename to addons/acre/initSettings.inc.sqf index e32e44e0..6da0d9a1 100644 --- a/addons/acre/initSettings.sqf +++ b/addons/acre/initSettings.inc.sqf @@ -81,4 +81,4 @@ if (EGVAR(common,aceArsenal)) then { ] call CBA_fnc_addSetting; }; -#include "initSettingsChannelNames.sqf" +#include "initSettingsChannelNames.inc.sqf" diff --git a/addons/acre/initSettingsChannelNames.sqf b/addons/acre/initSettingsChannelNames.inc.sqf similarity index 100% rename from addons/acre/initSettingsChannelNames.sqf rename to addons/acre/initSettingsChannelNames.inc.sqf diff --git a/addons/ai_disembark/XEH_preInit.sqf b/addons/ai_disembark/XEH_preInit.sqf index ad5e92fd..54578b5a 100644 --- a/addons/ai_disembark/XEH_preInit.sqf +++ b/addons/ai_disembark/XEH_preInit.sqf @@ -5,7 +5,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ["CAManBase", "GetOutMan", { _this call FUNC(onDisembark); diff --git a/addons/ai_disembark/initSettings.sqf b/addons/ai_disembark/initSettings.inc.sqf similarity index 100% rename from addons/ai_disembark/initSettings.sqf rename to addons/ai_disembark/initSettings.inc.sqf diff --git a/addons/back_to_game/XEH_preInit.sqf b/addons/back_to_game/XEH_preInit.sqf index eb14b64e..a9976e4a 100644 --- a/addons/back_to_game/XEH_preInit.sqf +++ b/addons/back_to_game/XEH_preInit.sqf @@ -5,7 +5,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" if (hasInterface) then { GVAR(teleport) = false; // Used as flag for teleportation agreement diff --git a/addons/back_to_game/initSettings.sqf b/addons/back_to_game/initSettings.inc.sqf similarity index 100% rename from addons/back_to_game/initSettings.sqf rename to addons/back_to_game/initSettings.inc.sqf diff --git a/addons/fatigue/XEH_preInit.sqf b/addons/fatigue/XEH_preInit.sqf index 00c4bd6a..6706cf8d 100644 --- a/addons/fatigue/XEH_preInit.sqf +++ b/addons/fatigue/XEH_preInit.sqf @@ -5,6 +5,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/fatigue/initSettings.sqf b/addons/fatigue/initSettings.inc.sqf similarity index 100% rename from addons/fatigue/initSettings.sqf rename to addons/fatigue/initSettings.inc.sqf diff --git a/addons/friendly_fire/XEH_preInit.sqf b/addons/friendly_fire/XEH_preInit.sqf index 1d0ec583..fafb9c5d 100644 --- a/addons/friendly_fire/XEH_preInit.sqf +++ b/addons/friendly_fire/XEH_preInit.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" ADDON = false; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/friendly_fire/initSettings.sqf b/addons/friendly_fire/initSettings.inc.sqf similarity index 100% rename from addons/friendly_fire/initSettings.sqf rename to addons/friendly_fire/initSettings.inc.sqf diff --git a/addons/grass/XEH_preInit.sqf b/addons/grass/XEH_preInit.sqf index 00c4bd6a..6706cf8d 100644 --- a/addons/grass/XEH_preInit.sqf +++ b/addons/grass/XEH_preInit.sqf @@ -5,6 +5,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/grass/initSettings.sqf b/addons/grass/initSettings.inc.sqf similarity index 100% rename from addons/grass/initSettings.sqf rename to addons/grass/initSettings.inc.sqf diff --git a/addons/insurgents/XEH_preInit.sqf b/addons/insurgents/XEH_preInit.sqf index ce90def2..daf685f1 100644 --- a/addons/insurgents/XEH_preInit.sqf +++ b/addons/insurgents/XEH_preInit.sqf @@ -5,7 +5,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" GVAR(randomGear) = createHashMap; diff --git a/addons/insurgents/initSettings.sqf b/addons/insurgents/initSettings.inc.sqf similarity index 100% rename from addons/insurgents/initSettings.sqf rename to addons/insurgents/initSettings.inc.sqf diff --git a/addons/pointing/XEH_postInit.sqf b/addons/pointing/XEH_postInit.sqf index 1cc435c5..88b42335 100644 --- a/addons/pointing/XEH_postInit.sqf +++ b/addons/pointing/XEH_postInit.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" -#include "initKeybinds.sqf" +#include "initKeybinds.inc.sqf" if (IS_MOD_LOADED(diwako_dui_radar)) then { [QGVAR(pointed), { diff --git a/addons/pointing/XEH_preInit.sqf b/addons/pointing/XEH_preInit.sqf index 00c4bd6a..6706cf8d 100644 --- a/addons/pointing/XEH_preInit.sqf +++ b/addons/pointing/XEH_preInit.sqf @@ -5,6 +5,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/pointing/initKeybinds.sqf b/addons/pointing/initKeybinds.inc.sqf similarity index 100% rename from addons/pointing/initKeybinds.sqf rename to addons/pointing/initKeybinds.inc.sqf diff --git a/addons/pointing/initSettings.sqf b/addons/pointing/initSettings.inc.sqf similarity index 100% rename from addons/pointing/initSettings.sqf rename to addons/pointing/initSettings.inc.sqf diff --git a/addons/remotesensors/XEH_preInit.sqf b/addons/remotesensors/XEH_preInit.sqf index 1d0ec583..fafb9c5d 100644 --- a/addons/remotesensors/XEH_preInit.sqf +++ b/addons/remotesensors/XEH_preInit.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" ADDON = false; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/remotesensors/initSettings.sqf b/addons/remotesensors/initSettings.inc.sqf similarity index 100% rename from addons/remotesensors/initSettings.sqf rename to addons/remotesensors/initSettings.inc.sqf diff --git a/addons/respawn/XEH_preInit.sqf b/addons/respawn/XEH_preInit.sqf index ec517bbb..5e0ed816 100644 --- a/addons/respawn/XEH_preInit.sqf +++ b/addons/respawn/XEH_preInit.sqf @@ -5,7 +5,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" if (hasInterface) then { // Save current time delay in case it changes (to adjust remaining respawn time) diff --git a/addons/respawn/initSettings.sqf b/addons/respawn/initSettings.inc.sqf similarity index 100% rename from addons/respawn/initSettings.sqf rename to addons/respawn/initSettings.inc.sqf diff --git a/addons/safestart/XEH_preInit.sqf b/addons/safestart/XEH_preInit.sqf index 48249755..07a7b2e4 100644 --- a/addons/safestart/XEH_preInit.sqf +++ b/addons/safestart/XEH_preInit.sqf @@ -5,7 +5,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" [QGVAR(enableSafety), { params ["_player"]; diff --git a/addons/safestart/initSettings.sqf b/addons/safestart/initSettings.inc.sqf similarity index 100% rename from addons/safestart/initSettings.sqf rename to addons/safestart/initSettings.inc.sqf diff --git a/addons/spectator/XEH_preInit.sqf b/addons/spectator/XEH_preInit.sqf index 00c4bd6a..6706cf8d 100644 --- a/addons/spectator/XEH_preInit.sqf +++ b/addons/spectator/XEH_preInit.sqf @@ -5,6 +5,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/spectator/initSettings.sqf b/addons/spectator/initSettings.inc.sqf similarity index 100% rename from addons/spectator/initSettings.sqf rename to addons/spectator/initSettings.inc.sqf diff --git a/addons/tagging/XEH_preInit.sqf b/addons/tagging/XEH_preInit.sqf index 1d0ec583..fafb9c5d 100644 --- a/addons/tagging/XEH_preInit.sqf +++ b/addons/tagging/XEH_preInit.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" ADDON = false; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/tagging/initSettings.sqf b/addons/tagging/initSettings.inc.sqf similarity index 100% rename from addons/tagging/initSettings.sqf rename to addons/tagging/initSettings.inc.sqf diff --git a/addons/towing/XEH_preInit.sqf b/addons/towing/XEH_preInit.sqf index 785751b8..4984be96 100644 --- a/addons/towing/XEH_preInit.sqf +++ b/addons/towing/XEH_preInit.sqf @@ -3,6 +3,6 @@ ADDON = false; if (!EGVAR(common,aceTowing)) exitWith {}; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/towing/initSettings.sqf b/addons/towing/initSettings.inc.sqf similarity index 100% rename from addons/towing/initSettings.sqf rename to addons/towing/initSettings.inc.sqf