From 464ab0cefb5714a7d404ca7923fb1e19abd74556 Mon Sep 17 00:00:00 2001 From: BrettMayson Date: Wed, 6 Dec 2023 21:20:47 -0600 Subject: [PATCH] Tools - Add HEMTT SQF support and fix commas are not semicolons (#9663) Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> Co-authored-by: PabstMirror Co-authored-by: jonpas --- .hemtt/project.toml | 6 ++---- addons/advanced_ballistics/XEH_postInit.sqf | 2 +- addons/advanced_ballistics/XEH_preInit.sqf | 2 +- ...{initKeybinds.sqf => initKeybinds.inc.sqf} | 0 ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/advanced_fatigue/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/advanced_throwing/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/ai/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/arsenal/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 .../missions/Arsenal.VR/XEH_postInit.sqf | 2 +- addons/artillerytables/XEH_postInit.sqf | 4 ++-- addons/artillerytables/XEH_preInit.sqf | 2 +- ...{checkConfigs.sqf => checkConfigs.inc.sqf} | 0 ...{showShotInfo.sqf => showShotInfo.inc.sqf} | 0 ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/atragmx/XEH_postInit.sqf | 2 +- ...{initKeybinds.sqf => initKeybinds.inc.sqf} | 0 addons/attach/functions/fnc_detach.sqf | 2 +- ...atTextStatement_magazineMuzzleVelocity.sqf | 2 +- ...statTextStatement_weaponMuzzleVelocity.sqf | 2 +- addons/captives/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/cargo/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/casings/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/common/XEH_preInit.sqf | 2 +- addons/common/functions/fnc_checkFiles.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/cookoff/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/csw/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/dagr/XEH_postInit.sqf | 2 +- ...{initKeybinds.sqf => initKeybinds.inc.sqf} | 0 addons/dragging/XEH_postInit.sqf | 2 +- addons/dragging/XEH_preInit.sqf | 2 +- ...{initKeybinds.sqf => initKeybinds.inc.sqf} | 0 ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/explosives/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/fastroping/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/fcs/XEH_postInit.sqf | 2 +- ...{initKeybinds.sqf => initKeybinds.inc.sqf} | 0 addons/field_rations/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/finger/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/fire/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/fortify/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/frag/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/gestures/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/gforces/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/goggles/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/grenades/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/gunbag/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/headless/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/hearing/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/hitreactions/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/interact_menu/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/interaction/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/inventory/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/javelin/XEH_clientInit.sqf | 2 +- ...{initKeybinds.sqf => initKeybinds.inc.sqf} | 0 addons/kestrel4500/XEH_postInit.sqf | 2 +- ...{initKeybinds.sqf => initKeybinds.inc.sqf} | 0 addons/laser/XEH_postInit.sqf | 2 +- addons/laser/XEH_preInit.sqf | 2 +- ...{initKeybinds.sqf => initKeybinds.inc.sqf} | 0 ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/magazinerepack/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/map/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/map_gestures/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/maptools/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/marker_flags/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/markers/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/medical/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/medical_ai/XEH_postInit.sqf | 2 +- addons/medical_ai/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 ...{stateMachine.sqf => stateMachine.inc.sqf} | 0 addons/medical_blood/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/medical_damage/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/medical_engine/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/medical_feedback/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/medical_gui/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/medical_statemachine/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/medical_status/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/medical_treatment/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/microdagr/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/mk6mortar/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/nametags/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/nightvision/XEH_preInit.sqf | 2 +- addons/nightvision/functions/fnc_pfeh.sqf | 4 ++-- ...{initSettings.sqf => initSettings.inc.sqf} | 4 ++-- addons/noradio/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/novehicleclanlogo/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 2 +- addons/optionsmenu/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/overheating/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/overpressure/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/parachute/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/pylons/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/quickmount/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/rangecard/XEH_postInit.sqf | 2 +- ...{initKeybinds.sqf => initKeybinds.inc.sqf} | 0 addons/rearm/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/refuel/XEH_preInit.sqf | 2 +- addons/refuel/functions/fnc_makeJerryCan.sqf | 21 ++++++++++++------- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/reload/XEH_postInit.sqf | 2 +- addons/reload/XEH_preInit.sqf | 2 +- ...{initKeybinds.sqf => initKeybinds.inc.sqf} | 0 ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/reloadlaunchers/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/repair/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/respawn/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/scopes/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/sitting/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/spectator/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/switchunits/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/tagging/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/towing/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/trenches/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/ui/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/vector/XEH_postInit.sqf | 2 +- ...{initKeybinds.sqf => initKeybinds.inc.sqf} | 0 addons/vehicle_damage/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/vehiclelock/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/vehicles/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/viewdistance/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/viewports/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/viewrestriction/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/volume/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/weaponselect/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/weather/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/winddeflection/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/yardage450/XEH_postInit.sqf | 2 +- ...{initKeybinds.sqf => initKeybinds.inc.sqf} | 0 addons/zeus/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 sqfc.json | 5 +---- tools/sqf_linter.py | 6 +----- tools/sqfvmChecker.py | 5 +---- 210 files changed, 129 insertions(+), 134 deletions(-) rename addons/advanced_ballistics/{initKeybinds.sqf => initKeybinds.inc.sqf} (100%) rename addons/advanced_ballistics/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/advanced_fatigue/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/advanced_throwing/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/ai/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/arsenal/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/artillerytables/dev/{checkConfigs.sqf => checkConfigs.inc.sqf} (100%) rename addons/artillerytables/dev/{showShotInfo.sqf => showShotInfo.inc.sqf} (100%) rename addons/artillerytables/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/atragmx/{initKeybinds.sqf => initKeybinds.inc.sqf} (100%) rename addons/captives/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/cargo/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/casings/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/common/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/cookoff/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/csw/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/dagr/{initKeybinds.sqf => initKeybinds.inc.sqf} (100%) rename addons/dragging/{initKeybinds.sqf => initKeybinds.inc.sqf} (100%) rename addons/dragging/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/explosives/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/fastroping/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/fcs/{initKeybinds.sqf => initKeybinds.inc.sqf} (100%) rename addons/field_rations/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/finger/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/fire/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/fortify/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/frag/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/gestures/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/gforces/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/goggles/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/grenades/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/gunbag/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/headless/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/hearing/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/hitreactions/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/interact_menu/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/interaction/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/inventory/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/javelin/{initKeybinds.sqf => initKeybinds.inc.sqf} (100%) rename addons/kestrel4500/{initKeybinds.sqf => initKeybinds.inc.sqf} (100%) rename addons/laser/{initKeybinds.sqf => initKeybinds.inc.sqf} (100%) rename addons/laser/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/magazinerepack/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/map/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/map_gestures/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/maptools/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/marker_flags/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/markers/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/medical/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/medical_ai/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/medical_ai/{stateMachine.sqf => stateMachine.inc.sqf} (100%) rename addons/medical_blood/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/medical_damage/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/medical_engine/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/medical_feedback/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/medical_gui/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/medical_statemachine/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/medical_status/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/medical_treatment/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/microdagr/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/mk6mortar/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/nametags/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/nightvision/{initSettings.sqf => initSettings.inc.sqf} (98%) rename addons/noradio/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/novehicleclanlogo/{initSettings.sqf => initSettings.inc.sqf} (90%) rename addons/optionsmenu/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/overheating/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/overpressure/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/parachute/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/pylons/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/quickmount/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/rangecard/{initKeybinds.sqf => initKeybinds.inc.sqf} (100%) rename addons/rearm/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/refuel/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/reload/{initKeybinds.sqf => initKeybinds.inc.sqf} (100%) rename addons/reload/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/reloadlaunchers/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/repair/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/respawn/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/scopes/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/sitting/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/spectator/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/switchunits/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/tagging/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/towing/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/trenches/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/ui/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/vector/{initKeybinds.sqf => initKeybinds.inc.sqf} (100%) rename addons/vehicle_damage/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/vehiclelock/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/vehicles/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/viewdistance/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/viewports/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/viewrestriction/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/volume/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/weaponselect/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/weather/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/winddeflection/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/yardage450/{initKeybinds.sqf => initKeybinds.inc.sqf} (100%) rename addons/zeus/{initSettings.sqf => initSettings.inc.sqf} (100%) diff --git a/.hemtt/project.toml b/.hemtt/project.toml index 59a26f40b0..60cff33c2d 100644 --- a/.hemtt/project.toml +++ b/.hemtt/project.toml @@ -18,14 +18,12 @@ include = [ [version] git_hash = 0 +# Unused in HEMTT v1.11 or higher, kept for backwards compatibility [asc] enabled = true exclude = [ - "/initsettings.sqf", - "/initkeybinds.sqf", - "/xeh_prep.sqf", + ".inc.sqf", "/dev/", - "medical_ai/statemachine.sqf", "common/functions/fnc_dummy.sqf", "zeus/functions/fnc_zeusAttributes.sqf", ] diff --git a/addons/advanced_ballistics/XEH_postInit.sqf b/addons/advanced_ballistics/XEH_postInit.sqf index 9ff22efe95..e6417f9a02 100644 --- a/addons/advanced_ballistics/XEH_postInit.sqf +++ b/addons/advanced_ballistics/XEH_postInit.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" -#include "initKeybinds.sqf" +#include "initKeybinds.inc.sqf" GVAR(currentbulletID) = -1; diff --git a/addons/advanced_ballistics/XEH_preInit.sqf b/addons/advanced_ballistics/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/advanced_ballistics/XEH_preInit.sqf +++ b/addons/advanced_ballistics/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/advanced_ballistics/initKeybinds.sqf b/addons/advanced_ballistics/initKeybinds.inc.sqf similarity index 100% rename from addons/advanced_ballistics/initKeybinds.sqf rename to addons/advanced_ballistics/initKeybinds.inc.sqf diff --git a/addons/advanced_ballistics/initSettings.sqf b/addons/advanced_ballistics/initSettings.inc.sqf similarity index 100% rename from addons/advanced_ballistics/initSettings.sqf rename to addons/advanced_ballistics/initSettings.inc.sqf diff --git a/addons/advanced_fatigue/XEH_preInit.sqf b/addons/advanced_fatigue/XEH_preInit.sqf index edbd421f8d..643b7b0be0 100644 --- a/addons/advanced_fatigue/XEH_preInit.sqf +++ b/addons/advanced_fatigue/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" GVAR(staminaBarWidth) = 10 * (((safezoneW / safezoneH) min 1.2) / 40); GVAR(dutyList) = createHashMap; diff --git a/addons/advanced_fatigue/initSettings.sqf b/addons/advanced_fatigue/initSettings.inc.sqf similarity index 100% rename from addons/advanced_fatigue/initSettings.sqf rename to addons/advanced_fatigue/initSettings.inc.sqf diff --git a/addons/advanced_throwing/XEH_preInit.sqf b/addons/advanced_throwing/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/advanced_throwing/XEH_preInit.sqf +++ b/addons/advanced_throwing/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/advanced_throwing/initSettings.sqf b/addons/advanced_throwing/initSettings.inc.sqf similarity index 100% rename from addons/advanced_throwing/initSettings.sqf rename to addons/advanced_throwing/initSettings.inc.sqf diff --git a/addons/ai/XEH_preInit.sqf b/addons/ai/XEH_preInit.sqf index 5ec0849ff9..b8b036fb31 100644 --- a/addons/ai/XEH_preInit.sqf +++ b/addons/ai/XEH_preInit.sqf @@ -11,6 +11,6 @@ if (isServer) then { GVAR(assignNVGstate) = false; }; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/ai/initSettings.sqf b/addons/ai/initSettings.inc.sqf similarity index 100% rename from addons/ai/initSettings.sqf rename to addons/ai/initSettings.inc.sqf diff --git a/addons/arsenal/XEH_preInit.sqf b/addons/arsenal/XEH_preInit.sqf index 34299c1871..df4da91338 100644 --- a/addons/arsenal/XEH_preInit.sqf +++ b/addons/arsenal/XEH_preInit.sqf @@ -9,7 +9,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" // Arsenal events [QGVAR(statsToggle), { diff --git a/addons/arsenal/initSettings.sqf b/addons/arsenal/initSettings.inc.sqf similarity index 100% rename from addons/arsenal/initSettings.sqf rename to addons/arsenal/initSettings.inc.sqf diff --git a/addons/arsenal/missions/Arsenal.VR/XEH_postInit.sqf b/addons/arsenal/missions/Arsenal.VR/XEH_postInit.sqf index 9f4b0aa538..207039f8ae 100644 --- a/addons/arsenal/missions/Arsenal.VR/XEH_postInit.sqf +++ b/addons/arsenal/missions/Arsenal.VR/XEH_postInit.sqf @@ -82,7 +82,7 @@ cba_diagnostic_projectileMaxLines = 10; _x hideObject false; } forEach allMissionObjects ""; - private _unit = objNull, + private _unit = objNull; // Update VR unit gear { diff --git a/addons/artillerytables/XEH_postInit.sqf b/addons/artillerytables/XEH_postInit.sqf index 6bc444d700..4f0e203208 100644 --- a/addons/artillerytables/XEH_postInit.sqf +++ b/addons/artillerytables/XEH_postInit.sqf @@ -31,6 +31,6 @@ }] call CBA_fnc_addEventHandler; #ifdef DEBUG_MODE_FULL -#include "dev\showShotInfo.sqf" -#include "dev\checkConfigs.sqf" +#include "dev\showShotInfo.inc.sqf" +#include "dev\checkConfigs.inc.sqf" #endif diff --git a/addons/artillerytables/XEH_preInit.sqf b/addons/artillerytables/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/artillerytables/XEH_preInit.sqf +++ b/addons/artillerytables/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/artillerytables/dev/checkConfigs.sqf b/addons/artillerytables/dev/checkConfigs.inc.sqf similarity index 100% rename from addons/artillerytables/dev/checkConfigs.sqf rename to addons/artillerytables/dev/checkConfigs.inc.sqf diff --git a/addons/artillerytables/dev/showShotInfo.sqf b/addons/artillerytables/dev/showShotInfo.inc.sqf similarity index 100% rename from addons/artillerytables/dev/showShotInfo.sqf rename to addons/artillerytables/dev/showShotInfo.inc.sqf diff --git a/addons/artillerytables/initSettings.sqf b/addons/artillerytables/initSettings.inc.sqf similarity index 100% rename from addons/artillerytables/initSettings.sqf rename to addons/artillerytables/initSettings.inc.sqf diff --git a/addons/atragmx/XEH_postInit.sqf b/addons/atragmx/XEH_postInit.sqf index 9034016212..62d45555b1 100644 --- a/addons/atragmx/XEH_postInit.sqf +++ b/addons/atragmx/XEH_postInit.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" -#include "initKeybinds.sqf" +#include "initKeybinds.inc.sqf" GVAR(active) = false; GVAR(initialised) = false; diff --git a/addons/atragmx/initKeybinds.sqf b/addons/atragmx/initKeybinds.inc.sqf similarity index 100% rename from addons/atragmx/initKeybinds.sqf rename to addons/atragmx/initKeybinds.inc.sqf diff --git a/addons/attach/functions/fnc_detach.sqf b/addons/attach/functions/fnc_detach.sqf index 2ae30f5663..ec87f96dd0 100644 --- a/addons/attach/functions/fnc_detach.sqf +++ b/addons/attach/functions/fnc_detach.sqf @@ -16,7 +16,7 @@ * Public: No */ -params ["_attachToVehicle","_unit"], +params ["_attachToVehicle","_unit"]; TRACE_2("params",_attachToVehicle,_unit); private _attachedList = _attachToVehicle getVariable [QGVAR(attached), []]; diff --git a/addons/ballistics/functions/fnc_statTextStatement_magazineMuzzleVelocity.sqf b/addons/ballistics/functions/fnc_statTextStatement_magazineMuzzleVelocity.sqf index 04e9f4d327..701ce544f7 100644 --- a/addons/ballistics/functions/fnc_statTextStatement_magazineMuzzleVelocity.sqf +++ b/addons/ballistics/functions/fnc_statTextStatement_magazineMuzzleVelocity.sqf @@ -48,7 +48,7 @@ if (_magIsForCurrentWeapon && {["ace_advanced_ballistics"] call EFUNC(common,isM private _barrelLengthTable = getArray (_configAmmo >> "ACE_barrelLengths"); private _abShift = [_barrelLength, _muzzleVelocityTable, _barrelLengthTable, 0] call EFUNC(advanced_ballistics,calculateBarrelLengthVelocityShift); if (_abShift != 0) then { - _abAdjustText = " [AB]", + _abAdjustText = " [AB]"; _muzzleVelocity = _abShift; }; }; diff --git a/addons/ballistics/functions/fnc_statTextStatement_weaponMuzzleVelocity.sqf b/addons/ballistics/functions/fnc_statTextStatement_weaponMuzzleVelocity.sqf index 4f6bdd0412..16ab9e2a47 100644 --- a/addons/ballistics/functions/fnc_statTextStatement_weaponMuzzleVelocity.sqf +++ b/addons/ballistics/functions/fnc_statTextStatement_weaponMuzzleVelocity.sqf @@ -44,7 +44,7 @@ if (_magazine isEqualTo "") then { private _barrelLengthTable = getArray (_configAmmo >> "ACE_barrelLengths"); private _abShift = [_barrelLength, _muzzleVelocityTable, _barrelLengthTable, 0] call EFUNC(advanced_ballistics,calculateBarrelLengthVelocityShift); if (_abShift != 0) then { - _abAdjustText = " [AB]", + _abAdjustText = " [AB]"; _muzzleVelocity = _abShift; }; }; diff --git a/addons/captives/XEH_preInit.sqf b/addons/captives/XEH_preInit.sqf index 09ea454f03..8104e55b39 100644 --- a/addons/captives/XEH_preInit.sqf +++ b/addons/captives/XEH_preInit.sqf @@ -11,6 +11,6 @@ GVAR(captivityEnabled) = false; GVAR(restraints) = keys (uiNamespace getVariable QGVAR(restraints)); GVAR(blindfolds) = keys (uiNamespace getVariable QGVAR(blindfolds)); -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/captives/initSettings.sqf b/addons/captives/initSettings.inc.sqf similarity index 100% rename from addons/captives/initSettings.sqf rename to addons/captives/initSettings.inc.sqf diff --git a/addons/cargo/XEH_preInit.sqf b/addons/cargo/XEH_preInit.sqf index ce29dc8a6e..35f2d78e45 100644 --- a/addons/cargo/XEH_preInit.sqf +++ b/addons/cargo/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" GVAR(initializedItemClasses) = []; GVAR(initializedVehicleClasses) = []; diff --git a/addons/cargo/initSettings.sqf b/addons/cargo/initSettings.inc.sqf similarity index 100% rename from addons/cargo/initSettings.sqf rename to addons/cargo/initSettings.inc.sqf diff --git a/addons/casings/XEH_preInit.sqf b/addons/casings/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/casings/XEH_preInit.sqf +++ b/addons/casings/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/casings/initSettings.sqf b/addons/casings/initSettings.inc.sqf similarity index 100% rename from addons/casings/initSettings.sqf rename to addons/casings/initSettings.inc.sqf diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf index efe9b10c0c..78c08d5e42 100644 --- a/addons/common/XEH_preInit.sqf +++ b/addons/common/XEH_preInit.sqf @@ -78,6 +78,6 @@ isHC = !hasInterface && !isDedicated; // deprecated because no tag missionNamespace setVariable ["ACE_isHC", ACE_isHC]; uiNamespace setVariable ["ACE_isHC", ACE_isHC]; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/common/functions/fnc_checkFiles.sqf b/addons/common/functions/fnc_checkFiles.sqf index a5110aee6c..8b00cad533 100644 --- a/addons/common/functions/fnc_checkFiles.sqf +++ b/addons/common/functions/fnc_checkFiles.sqf @@ -63,7 +63,7 @@ private _oldCompats = []; } forEach _addons; if (_oldAddons isNotEqualTo []) then { - _oldAddons = _oldAddons apply {"%1.pbo", _x}; + _oldAddons = _oldAddons apply { format ["%1.pbo", _x] }; private _errorMsg = ""; if (count _oldAddons > 3) then { _errorMsg = format ["The following files are outdated: %1, and %2 more.
ACE Main version is %3 from %4.
Loaded mods with outdated ACE files: %5", (_oldAddons select [0, 3]) joinString ", ", (count _oldAddons) -3, _mainVersion, _mainSource, (_oldSources joinString ", ")]; diff --git a/addons/common/initSettings.sqf b/addons/common/initSettings.inc.sqf similarity index 100% rename from addons/common/initSettings.sqf rename to addons/common/initSettings.inc.sqf diff --git a/addons/cookoff/XEH_preInit.sqf b/addons/cookoff/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/cookoff/XEH_preInit.sqf +++ b/addons/cookoff/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/cookoff/initSettings.sqf b/addons/cookoff/initSettings.inc.sqf similarity index 100% rename from addons/cookoff/initSettings.sqf rename to addons/cookoff/initSettings.inc.sqf diff --git a/addons/csw/XEH_preInit.sqf b/addons/csw/XEH_preInit.sqf index 6ecb2a0c2f..2cef0dfd2c 100644 --- a/addons/csw/XEH_preInit.sqf +++ b/addons/csw/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" GVAR(initializedStaticTypes) = []; diff --git a/addons/csw/initSettings.sqf b/addons/csw/initSettings.inc.sqf similarity index 100% rename from addons/csw/initSettings.sqf rename to addons/csw/initSettings.inc.sqf diff --git a/addons/dagr/XEH_postInit.sqf b/addons/dagr/XEH_postInit.sqf index 4c3fce167d..6996ced7f2 100644 --- a/addons/dagr/XEH_postInit.sqf +++ b/addons/dagr/XEH_postInit.sqf @@ -2,7 +2,7 @@ if (!hasInterface) exitWith {}; -#include "initKeybinds.sqf" +#include "initKeybinds.inc.sqf" GVAR(outputPFH) = -1; diff --git a/addons/dagr/initKeybinds.sqf b/addons/dagr/initKeybinds.inc.sqf similarity index 100% rename from addons/dagr/initKeybinds.sqf rename to addons/dagr/initKeybinds.inc.sqf diff --git a/addons/dragging/XEH_postInit.sqf b/addons/dragging/XEH_postInit.sqf index 815437e62d..84bcffb544 100644 --- a/addons/dragging/XEH_postInit.sqf +++ b/addons/dragging/XEH_postInit.sqf @@ -104,4 +104,4 @@ if (isNil QGVAR(maxWeightCarryRun)) then { }; }] call CBA_fnc_addEventHandler; -#include "initKeybinds.sqf" +#include "initKeybinds.inc.sqf" diff --git a/addons/dragging/XEH_preInit.sqf b/addons/dragging/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/dragging/XEH_preInit.sqf +++ b/addons/dragging/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/dragging/initKeybinds.sqf b/addons/dragging/initKeybinds.inc.sqf similarity index 100% rename from addons/dragging/initKeybinds.sqf rename to addons/dragging/initKeybinds.inc.sqf diff --git a/addons/dragging/initSettings.sqf b/addons/dragging/initSettings.inc.sqf similarity index 100% rename from addons/dragging/initSettings.sqf rename to addons/dragging/initSettings.inc.sqf diff --git a/addons/explosives/XEH_preInit.sqf b/addons/explosives/XEH_preInit.sqf index 6970d2b7f4..a6b4e97ed3 100644 --- a/addons/explosives/XEH_preInit.sqf +++ b/addons/explosives/XEH_preInit.sqf @@ -8,7 +8,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" GVAR(detonationHandlers) = []; GVAR(excludedMines) = []; diff --git a/addons/explosives/initSettings.sqf b/addons/explosives/initSettings.inc.sqf similarity index 100% rename from addons/explosives/initSettings.sqf rename to addons/explosives/initSettings.inc.sqf diff --git a/addons/fastroping/XEH_preInit.sqf b/addons/fastroping/XEH_preInit.sqf index 6d6065b323..b750275167 100644 --- a/addons/fastroping/XEH_preInit.sqf +++ b/addons/fastroping/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" if (isServer) then { ["Helicopter", "Deleted", LINKFUNC(unequipFRIES)] call CBA_fnc_addClassEventHandler; diff --git a/addons/fastroping/initSettings.sqf b/addons/fastroping/initSettings.inc.sqf similarity index 100% rename from addons/fastroping/initSettings.sqf rename to addons/fastroping/initSettings.inc.sqf diff --git a/addons/fcs/XEH_postInit.sqf b/addons/fcs/XEH_postInit.sqf index 7693fecb6c..a63b03c5d9 100644 --- a/addons/fcs/XEH_postInit.sqf +++ b/addons/fcs/XEH_postInit.sqf @@ -6,7 +6,7 @@ GVAR(position) = [0,0,0]; if (!hasInterface) exitWith {}; -#include "initKeybinds.sqf" +#include "initKeybinds.inc.sqf" ["ace_infoDisplayChanged", { if (!isNull ((_this select 0) displayCtrl 1713151)) then { diff --git a/addons/fcs/initKeybinds.sqf b/addons/fcs/initKeybinds.inc.sqf similarity index 100% rename from addons/fcs/initKeybinds.sqf rename to addons/fcs/initKeybinds.inc.sqf diff --git a/addons/field_rations/XEH_preInit.sqf b/addons/field_rations/XEH_preInit.sqf index a54da0834a..e74e4086ca 100644 --- a/addons/field_rations/XEH_preInit.sqf +++ b/addons/field_rations/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" #define ARSENAL_CATEGORY_ICON QPATHTOF(ui\icon_survival.paa) diff --git a/addons/field_rations/initSettings.sqf b/addons/field_rations/initSettings.inc.sqf similarity index 100% rename from addons/field_rations/initSettings.sqf rename to addons/field_rations/initSettings.inc.sqf diff --git a/addons/finger/XEH_preInit.sqf b/addons/finger/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/finger/XEH_preInit.sqf +++ b/addons/finger/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/finger/initSettings.sqf b/addons/finger/initSettings.inc.sqf similarity index 100% rename from addons/finger/initSettings.sqf rename to addons/finger/initSettings.inc.sqf diff --git a/addons/fire/XEH_preInit.sqf b/addons/fire/XEH_preInit.sqf index e69c115927..2fc794454d 100644 --- a/addons/fire/XEH_preInit.sqf +++ b/addons/fire/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" GVAR(burningPlants) = []; diff --git a/addons/fire/initSettings.sqf b/addons/fire/initSettings.inc.sqf similarity index 100% rename from addons/fire/initSettings.sqf rename to addons/fire/initSettings.inc.sqf diff --git a/addons/fortify/XEH_preInit.sqf b/addons/fortify/XEH_preInit.sqf index a28aee8445..382fc80566 100644 --- a/addons/fortify/XEH_preInit.sqf +++ b/addons/fortify/XEH_preInit.sqf @@ -13,6 +13,6 @@ GVAR(locations) = []; // Custom deploy handlers GVAR(deployHandlers) = []; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/fortify/initSettings.sqf b/addons/fortify/initSettings.inc.sqf similarity index 100% rename from addons/fortify/initSettings.sqf rename to addons/fortify/initSettings.inc.sqf diff --git a/addons/frag/XEH_preInit.sqf b/addons/frag/XEH_preInit.sqf index f4f59e681a..dc616917b8 100644 --- a/addons/frag/XEH_preInit.sqf +++ b/addons/frag/XEH_preInit.sqf @@ -20,6 +20,6 @@ GVAR(lastIterationIndex) = 0; GVAR(objects) = []; GVAR(arguments) = []; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/frag/initSettings.sqf b/addons/frag/initSettings.inc.sqf similarity index 100% rename from addons/frag/initSettings.sqf rename to addons/frag/initSettings.inc.sqf diff --git a/addons/gestures/XEH_preInit.sqf b/addons/gestures/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/gestures/XEH_preInit.sqf +++ b/addons/gestures/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/gestures/initSettings.sqf b/addons/gestures/initSettings.inc.sqf similarity index 100% rename from addons/gestures/initSettings.sqf rename to addons/gestures/initSettings.inc.sqf diff --git a/addons/gforces/XEH_preInit.sqf b/addons/gforces/XEH_preInit.sqf index 4987bcc61d..55e142c18b 100644 --- a/addons/gforces/XEH_preInit.sqf +++ b/addons/gforces/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" GVAR(GForces) = []; GVAR(GForces_Index) = 0; diff --git a/addons/gforces/initSettings.sqf b/addons/gforces/initSettings.inc.sqf similarity index 100% rename from addons/gforces/initSettings.sqf rename to addons/gforces/initSettings.inc.sqf diff --git a/addons/goggles/XEH_preInit.sqf b/addons/goggles/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/goggles/XEH_preInit.sqf +++ b/addons/goggles/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/goggles/initSettings.sqf b/addons/goggles/initSettings.inc.sqf similarity index 100% rename from addons/goggles/initSettings.sqf rename to addons/goggles/initSettings.inc.sqf diff --git a/addons/grenades/XEH_preInit.sqf b/addons/grenades/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/grenades/XEH_preInit.sqf +++ b/addons/grenades/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/grenades/initSettings.sqf b/addons/grenades/initSettings.inc.sqf similarity index 100% rename from addons/grenades/initSettings.sqf rename to addons/grenades/initSettings.inc.sqf diff --git a/addons/gunbag/XEH_preInit.sqf b/addons/gunbag/XEH_preInit.sqf index ad244390fa..2bb35513a2 100644 --- a/addons/gunbag/XEH_preInit.sqf +++ b/addons/gunbag/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" // restore gunbag info after respawn ["CAManBase", "respawn", { diff --git a/addons/gunbag/initSettings.sqf b/addons/gunbag/initSettings.inc.sqf similarity index 100% rename from addons/gunbag/initSettings.sqf rename to addons/gunbag/initSettings.inc.sqf diff --git a/addons/headless/XEH_preInit.sqf b/addons/headless/XEH_preInit.sqf index 3c18740cc8..bd64702f5c 100644 --- a/addons/headless/XEH_preInit.sqf +++ b/addons/headless/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" if (isServer) then { GVAR(headlessClients) = []; diff --git a/addons/headless/initSettings.sqf b/addons/headless/initSettings.inc.sqf similarity index 100% rename from addons/headless/initSettings.sqf rename to addons/headless/initSettings.inc.sqf diff --git a/addons/hearing/XEH_preInit.sqf b/addons/hearing/XEH_preInit.sqf index 5d6b275adc..2ab07c31e6 100644 --- a/addons/hearing/XEH_preInit.sqf +++ b/addons/hearing/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ["CBA_loadoutSet", { params ["_unit", "_loadout", "_extendedInfo"]; diff --git a/addons/hearing/initSettings.sqf b/addons/hearing/initSettings.inc.sqf similarity index 100% rename from addons/hearing/initSettings.sqf rename to addons/hearing/initSettings.inc.sqf diff --git a/addons/hitreactions/XEH_preInit.sqf b/addons/hitreactions/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/hitreactions/XEH_preInit.sqf +++ b/addons/hitreactions/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/hitreactions/initSettings.sqf b/addons/hitreactions/initSettings.inc.sqf similarity index 100% rename from addons/hitreactions/initSettings.sqf rename to addons/hitreactions/initSettings.inc.sqf diff --git a/addons/interact_menu/XEH_preInit.sqf b/addons/interact_menu/XEH_preInit.sqf index 0d321112f9..b60f1bb745 100644 --- a/addons/interact_menu/XEH_preInit.sqf +++ b/addons/interact_menu/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" if (!hasInterface) exitWith { ADDON = true; }; diff --git a/addons/interact_menu/initSettings.sqf b/addons/interact_menu/initSettings.inc.sqf similarity index 100% rename from addons/interact_menu/initSettings.sqf rename to addons/interact_menu/initSettings.inc.sqf diff --git a/addons/interaction/XEH_preInit.sqf b/addons/interaction/XEH_preInit.sqf index 4dd0bb13e6..c5873bcfc9 100644 --- a/addons/interaction/XEH_preInit.sqf +++ b/addons/interaction/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" DFUNC(repair_Statement) = { // moved from config because of build problems TRACE_1("repair_Statement",_this); diff --git a/addons/interaction/initSettings.sqf b/addons/interaction/initSettings.inc.sqf similarity index 100% rename from addons/interaction/initSettings.sqf rename to addons/interaction/initSettings.inc.sqf diff --git a/addons/inventory/XEH_preInit.sqf b/addons/inventory/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/inventory/XEH_preInit.sqf +++ b/addons/inventory/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/inventory/initSettings.sqf b/addons/inventory/initSettings.inc.sqf similarity index 100% rename from addons/inventory/initSettings.sqf rename to addons/inventory/initSettings.inc.sqf diff --git a/addons/javelin/XEH_clientInit.sqf b/addons/javelin/XEH_clientInit.sqf index 66d645968f..ecd80fb0ce 100644 --- a/addons/javelin/XEH_clientInit.sqf +++ b/addons/javelin/XEH_clientInit.sqf @@ -3,4 +3,4 @@ if (!hasInterface) exitWith {}; -#include "initKeybinds.sqf" +#include "initKeybinds.inc.sqf" diff --git a/addons/javelin/initKeybinds.sqf b/addons/javelin/initKeybinds.inc.sqf similarity index 100% rename from addons/javelin/initKeybinds.sqf rename to addons/javelin/initKeybinds.inc.sqf diff --git a/addons/kestrel4500/XEH_postInit.sqf b/addons/kestrel4500/XEH_postInit.sqf index 033dbafbe8..12688a6adf 100644 --- a/addons/kestrel4500/XEH_postInit.sqf +++ b/addons/kestrel4500/XEH_postInit.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" -#include "initKeybinds.sqf" +#include "initKeybinds.inc.sqf" GVAR(Menus) = ["Date", "Direction", "Wind SPD m/s", "CROSSWIND m/s", "HEADWIND m/s", "TEMP °C", "CHILL °C", "HUMIDITY %", "HEAT INDEX °C", "DEW POINT °C", "WET BULB °C", "BARO hPA", "ALTITUDE m", "DENS ALT m", "User Screen 1", "User Screen 2"]; diff --git a/addons/kestrel4500/initKeybinds.sqf b/addons/kestrel4500/initKeybinds.inc.sqf similarity index 100% rename from addons/kestrel4500/initKeybinds.sqf rename to addons/kestrel4500/initKeybinds.inc.sqf diff --git a/addons/laser/XEH_postInit.sqf b/addons/laser/XEH_postInit.sqf index ec6b6aca2d..768752bee2 100644 --- a/addons/laser/XEH_postInit.sqf +++ b/addons/laser/XEH_postInit.sqf @@ -2,7 +2,7 @@ #include "\a3\ui_f\hpp\defineDIKCodes.inc" if (hasInterface) then { -#include "initKeybinds.sqf" +#include "initKeybinds.inc.sqf" GVAR(pfID) = -1; diff --git a/addons/laser/XEH_preInit.sqf b/addons/laser/XEH_preInit.sqf index 4fe49c5db4..00049594c6 100644 --- a/addons/laser/XEH_preInit.sqf +++ b/addons/laser/XEH_preInit.sqf @@ -15,6 +15,6 @@ GVAR(laserEmitters) = createHashMap; GVAR(trackedLaserTargets) = []; GVAR(pfehID) = -1; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/laser/initKeybinds.sqf b/addons/laser/initKeybinds.inc.sqf similarity index 100% rename from addons/laser/initKeybinds.sqf rename to addons/laser/initKeybinds.inc.sqf diff --git a/addons/laser/initSettings.sqf b/addons/laser/initSettings.inc.sqf similarity index 100% rename from addons/laser/initSettings.sqf rename to addons/laser/initSettings.inc.sqf diff --git a/addons/magazinerepack/XEH_preInit.sqf b/addons/magazinerepack/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/magazinerepack/XEH_preInit.sqf +++ b/addons/magazinerepack/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/magazinerepack/initSettings.sqf b/addons/magazinerepack/initSettings.inc.sqf similarity index 100% rename from addons/magazinerepack/initSettings.sqf rename to addons/magazinerepack/initSettings.inc.sqf diff --git a/addons/map/XEH_preInit.sqf b/addons/map/XEH_preInit.sqf index 92a7e896f3..3d0df4213e 100644 --- a/addons/map/XEH_preInit.sqf +++ b/addons/map/XEH_preInit.sqf @@ -7,6 +7,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/map/initSettings.sqf b/addons/map/initSettings.inc.sqf similarity index 100% rename from addons/map/initSettings.sqf rename to addons/map/initSettings.inc.sqf diff --git a/addons/map_gestures/XEH_preInit.sqf b/addons/map_gestures/XEH_preInit.sqf index 9bf1ff814e..e603e5398a 100644 --- a/addons/map_gestures/XEH_preInit.sqf +++ b/addons/map_gestures/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" GVAR(GroupColorCfgMappingNew) = call CBA_fnc_createNamespace; diff --git a/addons/map_gestures/initSettings.sqf b/addons/map_gestures/initSettings.inc.sqf similarity index 100% rename from addons/map_gestures/initSettings.sqf rename to addons/map_gestures/initSettings.inc.sqf diff --git a/addons/maptools/XEH_preInit.sqf b/addons/maptools/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/maptools/XEH_preInit.sqf +++ b/addons/maptools/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/maptools/initSettings.sqf b/addons/maptools/initSettings.inc.sqf similarity index 100% rename from addons/maptools/initSettings.sqf rename to addons/maptools/initSettings.inc.sqf diff --git a/addons/marker_flags/XEH_preInit.sqf b/addons/marker_flags/XEH_preInit.sqf index 62febdc7cb..ed043fcb05 100644 --- a/addons/marker_flags/XEH_preInit.sqf +++ b/addons/marker_flags/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" GVAR(flagCache) = createHashMap; diff --git a/addons/marker_flags/initSettings.sqf b/addons/marker_flags/initSettings.inc.sqf similarity index 100% rename from addons/marker_flags/initSettings.sqf rename to addons/marker_flags/initSettings.inc.sqf diff --git a/addons/markers/XEH_preInit.sqf b/addons/markers/XEH_preInit.sqf index 885a0a3068..142dedb89a 100644 --- a/addons/markers/XEH_preInit.sqf +++ b/addons/markers/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" // init marker types if (isNil QGVAR(MarkersCache)) then { diff --git a/addons/markers/initSettings.sqf b/addons/markers/initSettings.inc.sqf similarity index 100% rename from addons/markers/initSettings.sqf rename to addons/markers/initSettings.inc.sqf diff --git a/addons/medical/XEH_preInit.sqf b/addons/medical/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/medical/XEH_preInit.sqf +++ b/addons/medical/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/medical/initSettings.sqf b/addons/medical/initSettings.inc.sqf similarity index 100% rename from addons/medical/initSettings.sqf rename to addons/medical/initSettings.inc.sqf diff --git a/addons/medical_ai/XEH_postInit.sqf b/addons/medical_ai/XEH_postInit.sqf index 778dafb72b..c53cb78934 100644 --- a/addons/medical_ai/XEH_postInit.sqf +++ b/addons/medical_ai/XEH_postInit.sqf @@ -19,6 +19,6 @@ _unit setVariable [QGVAR(lastSuppressed), CBA_missionTime]; }] call CBA_fnc_addClassEventHandler; - #include "stateMachine.sqf" + #include "stateMachine.inc.sqf" }] call CBA_fnc_addEventHandler; diff --git a/addons/medical_ai/XEH_preInit.sqf b/addons/medical_ai/XEH_preInit.sqf index 774ef681f3..5725d1e119 100644 --- a/addons/medical_ai/XEH_preInit.sqf +++ b/addons/medical_ai/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" // default time values for AI being ready to heal, used in fnc_isSafe if (isNil QGVAR(timeSafe_shoot)) then { GVAR(timeSafe_shoot) = 30; }; diff --git a/addons/medical_ai/initSettings.sqf b/addons/medical_ai/initSettings.inc.sqf similarity index 100% rename from addons/medical_ai/initSettings.sqf rename to addons/medical_ai/initSettings.inc.sqf diff --git a/addons/medical_ai/stateMachine.sqf b/addons/medical_ai/stateMachine.inc.sqf similarity index 100% rename from addons/medical_ai/stateMachine.sqf rename to addons/medical_ai/stateMachine.inc.sqf diff --git a/addons/medical_blood/XEH_preInit.sqf b/addons/medical_blood/XEH_preInit.sqf index 3d10086703..852b4dbe73 100644 --- a/addons/medical_blood/XEH_preInit.sqf +++ b/addons/medical_blood/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" // Damage types which do not cause blood spurts GVAR(noBloodDamageTypes) = createHashMapFromArray (call (uiNamespace getVariable QGVAR(noBloodDamageTypes))); diff --git a/addons/medical_blood/initSettings.sqf b/addons/medical_blood/initSettings.inc.sqf similarity index 100% rename from addons/medical_blood/initSettings.sqf rename to addons/medical_blood/initSettings.inc.sqf diff --git a/addons/medical_damage/XEH_preInit.sqf b/addons/medical_damage/XEH_preInit.sqf index 26445ad61a..344b9c81ee 100644 --- a/addons/medical_damage/XEH_preInit.sqf +++ b/addons/medical_damage/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" call FUNC(parseConfigForInjuries); diff --git a/addons/medical_damage/initSettings.sqf b/addons/medical_damage/initSettings.inc.sqf similarity index 100% rename from addons/medical_damage/initSettings.sqf rename to addons/medical_damage/initSettings.inc.sqf diff --git a/addons/medical_engine/XEH_preInit.sqf b/addons/medical_engine/XEH_preInit.sqf index 379b30da4b..dab2e7efe3 100644 --- a/addons/medical_engine/XEH_preInit.sqf +++ b/addons/medical_engine/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" // Define "Constants" variables (both are macros defined in script_macros_medical.hpp, look there for actual variable names) if (isNil QUOTE(SPONTANEOUS_WAKE_UP_INTERVAL)) then {SPONTANEOUS_WAKE_UP_INTERVAL = SPONTANEOUS_WAKE_UP_INTERVAL_DEFAULT}; diff --git a/addons/medical_engine/initSettings.sqf b/addons/medical_engine/initSettings.inc.sqf similarity index 100% rename from addons/medical_engine/initSettings.sqf rename to addons/medical_engine/initSettings.inc.sqf diff --git a/addons/medical_feedback/XEH_preInit.sqf b/addons/medical_feedback/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/medical_feedback/XEH_preInit.sqf +++ b/addons/medical_feedback/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/medical_feedback/initSettings.sqf b/addons/medical_feedback/initSettings.inc.sqf similarity index 100% rename from addons/medical_feedback/initSettings.sqf rename to addons/medical_feedback/initSettings.inc.sqf diff --git a/addons/medical_gui/XEH_preInit.sqf b/addons/medical_gui/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/medical_gui/XEH_preInit.sqf +++ b/addons/medical_gui/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/medical_gui/initSettings.sqf b/addons/medical_gui/initSettings.inc.sqf similarity index 100% rename from addons/medical_gui/initSettings.sqf rename to addons/medical_gui/initSettings.inc.sqf diff --git a/addons/medical_statemachine/XEH_preInit.sqf b/addons/medical_statemachine/XEH_preInit.sqf index d77d8067a8..65621f775b 100644 --- a/addons/medical_statemachine/XEH_preInit.sqf +++ b/addons/medical_statemachine/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" EGVAR(medical,STATE_MACHINE) = (configFile >> "ACE_Medical_StateMachine") call CBA_statemachine_fnc_createFromConfig; diff --git a/addons/medical_statemachine/initSettings.sqf b/addons/medical_statemachine/initSettings.inc.sqf similarity index 100% rename from addons/medical_statemachine/initSettings.sqf rename to addons/medical_statemachine/initSettings.inc.sqf diff --git a/addons/medical_status/XEH_preInit.sqf b/addons/medical_status/XEH_preInit.sqf index c6343dcb63..e3c82d5788 100644 --- a/addons/medical_status/XEH_preInit.sqf +++ b/addons/medical_status/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" // Add vanilla killed EH to unit to set correct killer ["CAManBase", "init", { diff --git a/addons/medical_status/initSettings.sqf b/addons/medical_status/initSettings.inc.sqf similarity index 100% rename from addons/medical_status/initSettings.sqf rename to addons/medical_status/initSettings.inc.sqf diff --git a/addons/medical_treatment/XEH_preInit.sqf b/addons/medical_treatment/XEH_preInit.sqf index 68b80b5d0d..bc01e267c1 100644 --- a/addons/medical_treatment/XEH_preInit.sqf +++ b/addons/medical_treatment/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" #define ARSENAL_CATEGORY_ICON (["\A3\ui_f\data\igui\cfg\actions\heal_ca.paa", QPATHTOEF(medical_gui,data\categories\bandage_fracture.paa)] select (["ace_medical_gui"] call EFUNC(common,isModLoaded))) diff --git a/addons/medical_treatment/initSettings.sqf b/addons/medical_treatment/initSettings.inc.sqf similarity index 100% rename from addons/medical_treatment/initSettings.sqf rename to addons/medical_treatment/initSettings.inc.sqf diff --git a/addons/microdagr/XEH_preInit.sqf b/addons/microdagr/XEH_preInit.sqf index b46948b0bb..610dc0ed81 100644 --- a/addons/microdagr/XEH_preInit.sqf +++ b/addons/microdagr/XEH_preInit.sqf @@ -9,6 +9,6 @@ PREP_RECOMPILE_END; //Functions that are called for each draw of the map: GVAR(miniMapDrawHandlers) = []; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/microdagr/initSettings.sqf b/addons/microdagr/initSettings.inc.sqf similarity index 100% rename from addons/microdagr/initSettings.sqf rename to addons/microdagr/initSettings.inc.sqf diff --git a/addons/mk6mortar/XEH_preInit.sqf b/addons/mk6mortar/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/mk6mortar/XEH_preInit.sqf +++ b/addons/mk6mortar/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/mk6mortar/initSettings.sqf b/addons/mk6mortar/initSettings.inc.sqf similarity index 100% rename from addons/mk6mortar/initSettings.sqf rename to addons/mk6mortar/initSettings.inc.sqf diff --git a/addons/nametags/XEH_preInit.sqf b/addons/nametags/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/nametags/XEH_preInit.sqf +++ b/addons/nametags/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/nametags/initSettings.sqf b/addons/nametags/initSettings.inc.sqf similarity index 100% rename from addons/nametags/initSettings.sqf rename to addons/nametags/initSettings.inc.sqf diff --git a/addons/nightvision/XEH_preInit.sqf b/addons/nightvision/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/nightvision/XEH_preInit.sqf +++ b/addons/nightvision/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/nightvision/functions/fnc_pfeh.sqf b/addons/nightvision/functions/fnc_pfeh.sqf index 3300a7ae28..ad484d097e 100644 --- a/addons/nightvision/functions/fnc_pfeh.sqf +++ b/addons/nightvision/functions/fnc_pfeh.sqf @@ -25,8 +25,8 @@ if (currentVisionMode _unit != 1) exitWith { GVAR(PFID) = -1; (missionNamespace getVariable [QGVAR(firedEHs), []]) params [["_firedPlayerID", -1], ["_firedPlayerVehicleID", -1]]; TRACE_2("removing fired EHs",_firedPlayerID,_firedPlayerVehicleID); - ["ace_firedPlayer", _firedPlayerID] call CBA_fnc_removeEventHandler, - ["ace_firedPlayerVehicle", _firedPlayerVehicleID] call CBA_fnc_removeEventHandler, + ["ace_firedPlayer", _firedPlayerID] call CBA_fnc_removeEventHandler; + ["ace_firedPlayerVehicle", _firedPlayerVehicleID] call CBA_fnc_removeEventHandler; }; if (EGVAR(common,OldIsCamera)) exitWith { if (GVAR(running)) then { diff --git a/addons/nightvision/initSettings.sqf b/addons/nightvision/initSettings.inc.sqf similarity index 98% rename from addons/nightvision/initSettings.sqf rename to addons/nightvision/initSettings.inc.sqf index afcc7250c9..9d11956a12 100644 --- a/addons/nightvision/initSettings.sqf +++ b/addons/nightvision/initSettings.inc.sqf @@ -19,8 +19,8 @@ GVAR(nextEffectsUpdate) = -1; (missionNamespace getVariable [QGVAR(firedEHs), []]) params [["_firedPlayerID", -1], ["_firedPlayerVehicleID", -1]]; TRACE_2("removing fired EHs",_firedPlayerID,_firedPlayerVehicleID); - ["ace_firedPlayer", _firedPlayerID] call CBA_fnc_removeEventHandler, - ["ace_firedPlayerVehicle", _firedPlayerVehicleID] call CBA_fnc_removeEventHandler, + ["ace_firedPlayer", _firedPlayerID] call CBA_fnc_removeEventHandler; + ["ace_firedPlayerVehicle", _firedPlayerVehicleID] call CBA_fnc_removeEventHandler; } else { // Start PFH if scaling was previously set to 0 if ((currentVisionMode ACE_player == 1) && {!GVAR(running)}) then { diff --git a/addons/noradio/XEH_preInit.sqf b/addons/noradio/XEH_preInit.sqf index 35b9e9ec47..75f7afa62e 100644 --- a/addons/noradio/XEH_preInit.sqf +++ b/addons/noradio/XEH_preInit.sqf @@ -27,4 +27,4 @@ if (hasInterface) then { }, true] call CBA_fnc_addPlayerEventHandler; }; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" diff --git a/addons/noradio/initSettings.sqf b/addons/noradio/initSettings.inc.sqf similarity index 100% rename from addons/noradio/initSettings.sqf rename to addons/noradio/initSettings.inc.sqf diff --git a/addons/novehicleclanlogo/XEH_preInit.sqf b/addons/novehicleclanlogo/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/novehicleclanlogo/XEH_preInit.sqf +++ b/addons/novehicleclanlogo/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/novehicleclanlogo/initSettings.sqf b/addons/novehicleclanlogo/initSettings.inc.sqf similarity index 90% rename from addons/novehicleclanlogo/initSettings.sqf rename to addons/novehicleclanlogo/initSettings.inc.sqf index 471877ca5c..ddec0e1314 100644 --- a/addons/novehicleclanlogo/initSettings.sqf +++ b/addons/novehicleclanlogo/initSettings.inc.sqf @@ -1,4 +1,4 @@ -private _category = [ELSTRING(common,ACEKeybindCategoryVehicles), LSTRING(DisplayName)],; +private _category = [ELSTRING(common,ACEKeybindCategoryVehicles), LSTRING(DisplayName)]; [ QGVAR(enabled), "CHECKBOX", diff --git a/addons/optionsmenu/XEH_preInit.sqf b/addons/optionsmenu/XEH_preInit.sqf index d25516a277..aaa0b64a03 100644 --- a/addons/optionsmenu/XEH_preInit.sqf +++ b/addons/optionsmenu/XEH_preInit.sqf @@ -11,6 +11,6 @@ if (hasInterface) then { [[format ["ACE %1", localize LSTRING(headBugFix)], localize LSTRING(headBugFixTooltip)], QGVAR(MainMenuHelperHeadBugFix)] call CBA_fnc_addPauseMenuOption; }; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/optionsmenu/initSettings.sqf b/addons/optionsmenu/initSettings.inc.sqf similarity index 100% rename from addons/optionsmenu/initSettings.sqf rename to addons/optionsmenu/initSettings.inc.sqf diff --git a/addons/overheating/XEH_preInit.sqf b/addons/overheating/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/overheating/XEH_preInit.sqf +++ b/addons/overheating/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/overheating/initSettings.sqf b/addons/overheating/initSettings.inc.sqf similarity index 100% rename from addons/overheating/initSettings.sqf rename to addons/overheating/initSettings.inc.sqf diff --git a/addons/overpressure/XEH_preInit.sqf b/addons/overpressure/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/overpressure/XEH_preInit.sqf +++ b/addons/overpressure/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/overpressure/initSettings.sqf b/addons/overpressure/initSettings.inc.sqf similarity index 100% rename from addons/overpressure/initSettings.sqf rename to addons/overpressure/initSettings.inc.sqf diff --git a/addons/parachute/XEH_preInit.sqf b/addons/parachute/XEH_preInit.sqf index cb77025b4d..d3aa4bd2d5 100644 --- a/addons/parachute/XEH_preInit.sqf +++ b/addons/parachute/XEH_preInit.sqf @@ -8,6 +8,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/parachute/initSettings.sqf b/addons/parachute/initSettings.inc.sqf similarity index 100% rename from addons/parachute/initSettings.sqf rename to addons/parachute/initSettings.inc.sqf diff --git a/addons/pylons/XEH_preInit.sqf b/addons/pylons/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/pylons/XEH_preInit.sqf +++ b/addons/pylons/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/pylons/initSettings.sqf b/addons/pylons/initSettings.inc.sqf similarity index 100% rename from addons/pylons/initSettings.sqf rename to addons/pylons/initSettings.inc.sqf diff --git a/addons/quickmount/XEH_preInit.sqf b/addons/quickmount/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/quickmount/XEH_preInit.sqf +++ b/addons/quickmount/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/quickmount/initSettings.sqf b/addons/quickmount/initSettings.inc.sqf similarity index 100% rename from addons/quickmount/initSettings.sqf rename to addons/quickmount/initSettings.inc.sqf diff --git a/addons/rangecard/XEH_postInit.sqf b/addons/rangecard/XEH_postInit.sqf index 9e60821fc1..6adc4cf2a1 100644 --- a/addons/rangecard/XEH_postInit.sqf +++ b/addons/rangecard/XEH_postInit.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" -#include "initKeybinds.sqf" +#include "initKeybinds.inc.sqf" GVAR(RangeCardOpened) = false; diff --git a/addons/rangecard/initKeybinds.sqf b/addons/rangecard/initKeybinds.inc.sqf similarity index 100% rename from addons/rangecard/initKeybinds.sqf rename to addons/rangecard/initKeybinds.inc.sqf diff --git a/addons/rearm/XEH_preInit.sqf b/addons/rearm/XEH_preInit.sqf index 10156a7d1c..4aa8cb80ad 100644 --- a/addons/rearm/XEH_preInit.sqf +++ b/addons/rearm/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" DFUNC(rearm_statement) = { // moved from config because of build problems TRACE_1("rearm_statement",_this); diff --git a/addons/rearm/initSettings.sqf b/addons/rearm/initSettings.inc.sqf similarity index 100% rename from addons/rearm/initSettings.sqf rename to addons/rearm/initSettings.inc.sqf diff --git a/addons/refuel/XEH_preInit.sqf b/addons/refuel/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/refuel/XEH_preInit.sqf +++ b/addons/refuel/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/refuel/functions/fnc_makeJerryCan.sqf b/addons/refuel/functions/fnc_makeJerryCan.sqf index 2a1bc75280..4b807756c9 100644 --- a/addons/refuel/functions/fnc_makeJerryCan.sqf +++ b/addons/refuel/functions/fnc_makeJerryCan.sqf @@ -40,7 +40,8 @@ private _action = [QGVAR(Refuel), {}, [], [0, 0, 0], - REFUEL_ACTION_DISTANCE] call EFUNC(interact_menu,createAction); + REFUEL_ACTION_DISTANCE +] call EFUNC(interact_menu,createAction); [_target, 0, ["ACE_MainActions"], _action] call EFUNC(interact_menu,addActionToObject); // Add pickup @@ -52,7 +53,8 @@ _action = [QGVAR(PickUpNozzle), {}, [], [0, 0, 0], - REFUEL_ACTION_DISTANCE] call EFUNC(interact_menu,createAction); + REFUEL_ACTION_DISTANCE +] call EFUNC(interact_menu,createAction); [_target, 0, ["ACE_MainActions", QGVAR(Refuel)], _action] call EFUNC(interact_menu,addActionToObject); // Add turnOn @@ -64,7 +66,8 @@ _action = [QGVAR(TurnOn), {}, [], [0, 0, 0], - REFUEL_ACTION_DISTANCE] call EFUNC(interact_menu,createAction); + REFUEL_ACTION_DISTANCE +] call EFUNC(interact_menu,createAction); [_target, 0, ["ACE_MainActions", QGVAR(Refuel)], _action] call EFUNC(interact_menu,addActionToObject); // Add turnOn container @@ -76,7 +79,8 @@ _action = [QGVAR(TurnOn_Container), {}, [], [0, 0, 0], - REFUEL_ACTION_DISTANCE] call EFUNC(interact_menu,createAction); + REFUEL_ACTION_DISTANCE +] call EFUNC(interact_menu,createAction); [_target, 0, ["ACE_MainActions", QGVAR(Refuel)], _action] call EFUNC(interact_menu,addActionToObject); // Add check fuel @@ -88,7 +92,8 @@ _action = [QGVAR(CheckFuel), {}, [], [0,0,0], - REFUEL_ACTION_DISTANCE] call EFUNC(interact_menu,createAction), + REFUEL_ACTION_DISTANCE +] call EFUNC(interact_menu,createAction); [_target, 0, ["ACE_MainActions", QGVAR(Refuel)], _action] call EFUNC(interact_menu,addActionToObject); // Add turnOff @@ -100,7 +105,8 @@ _action = [QGVAR(TurnOff), {}, [], [0, 0, 0], - REFUEL_ACTION_DISTANCE] call EFUNC(interact_menu,createAction); + REFUEL_ACTION_DISTANCE +] call EFUNC(interact_menu,createAction); [_target, 0, ["ACE_MainActions", QGVAR(Refuel)], _action] call EFUNC(interact_menu,addActionToObject); // Add disconnect @@ -112,5 +118,6 @@ _action = [QGVAR(Disconnect), {}, [], [0, 0, 0], - REFUEL_ACTION_DISTANCE] call EFUNC(interact_menu,createAction); + REFUEL_ACTION_DISTANCE +] call EFUNC(interact_menu,createAction); [_target, 0, ["ACE_MainActions", QGVAR(Refuel)], _action] call EFUNC(interact_menu,addActionToObject); diff --git a/addons/refuel/initSettings.sqf b/addons/refuel/initSettings.inc.sqf similarity index 100% rename from addons/refuel/initSettings.sqf rename to addons/refuel/initSettings.inc.sqf diff --git a/addons/reload/XEH_postInit.sqf b/addons/reload/XEH_postInit.sqf index 65ce1d0b4b..02dedd14c3 100644 --- a/addons/reload/XEH_postInit.sqf +++ b/addons/reload/XEH_postInit.sqf @@ -52,4 +52,4 @@ if (!hasInterface) exitWith {}; -#include "initKeybinds.sqf" +#include "initKeybinds.inc.sqf" diff --git a/addons/reload/XEH_preInit.sqf b/addons/reload/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/reload/XEH_preInit.sqf +++ b/addons/reload/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/reload/initKeybinds.sqf b/addons/reload/initKeybinds.inc.sqf similarity index 100% rename from addons/reload/initKeybinds.sqf rename to addons/reload/initKeybinds.inc.sqf diff --git a/addons/reload/initSettings.sqf b/addons/reload/initSettings.inc.sqf similarity index 100% rename from addons/reload/initSettings.sqf rename to addons/reload/initSettings.inc.sqf diff --git a/addons/reloadlaunchers/XEH_preInit.sqf b/addons/reloadlaunchers/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/reloadlaunchers/XEH_preInit.sqf +++ b/addons/reloadlaunchers/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/reloadlaunchers/initSettings.sqf b/addons/reloadlaunchers/initSettings.inc.sqf similarity index 100% rename from addons/reloadlaunchers/initSettings.sqf rename to addons/reloadlaunchers/initSettings.inc.sqf diff --git a/addons/repair/XEH_preInit.sqf b/addons/repair/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/repair/XEH_preInit.sqf +++ b/addons/repair/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/repair/initSettings.sqf b/addons/repair/initSettings.inc.sqf similarity index 100% rename from addons/repair/initSettings.sqf rename to addons/repair/initSettings.inc.sqf diff --git a/addons/respawn/XEH_preInit.sqf b/addons/respawn/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/respawn/XEH_preInit.sqf +++ b/addons/respawn/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; 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/scopes/XEH_preInit.sqf b/addons/scopes/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/scopes/XEH_preInit.sqf +++ b/addons/scopes/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/scopes/initSettings.sqf b/addons/scopes/initSettings.inc.sqf similarity index 100% rename from addons/scopes/initSettings.sqf rename to addons/scopes/initSettings.inc.sqf diff --git a/addons/sitting/XEH_preInit.sqf b/addons/sitting/XEH_preInit.sqf index 4fc8d6e9d0..e626c67e76 100644 --- a/addons/sitting/XEH_preInit.sqf +++ b/addons/sitting/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" if (hasInterface) then { GVAR(initializedClasses) = []; diff --git a/addons/sitting/initSettings.sqf b/addons/sitting/initSettings.inc.sqf similarity index 100% rename from addons/sitting/initSettings.sqf rename to addons/sitting/initSettings.inc.sqf diff --git a/addons/spectator/XEH_preInit.sqf b/addons/spectator/XEH_preInit.sqf index 1e3d019177..7ef6aadb6f 100644 --- a/addons/spectator/XEH_preInit.sqf +++ b/addons/spectator/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" // Used by public functions GVAR(availableModes) = [MODE_FREE, MODE_FPS, MODE_FOLLOW]; 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/switchunits/XEH_preInit.sqf b/addons/switchunits/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/switchunits/XEH_preInit.sqf +++ b/addons/switchunits/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/switchunits/initSettings.sqf b/addons/switchunits/initSettings.inc.sqf similarity index 100% rename from addons/switchunits/initSettings.sqf rename to addons/switchunits/initSettings.inc.sqf diff --git a/addons/tagging/XEH_preInit.sqf b/addons/tagging/XEH_preInit.sqf index 34b4928b2a..d368b7c1c6 100644 --- a/addons/tagging/XEH_preInit.sqf +++ b/addons/tagging/XEH_preInit.sqf @@ -9,6 +9,6 @@ PREP_RECOMPILE_END; GVAR(cachedTags) = []; GVAR(itemActions) = createHashMap; -#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 9361d05015..894773534a 100644 --- a/addons/towing/XEH_preInit.sqf +++ b/addons/towing/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#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 diff --git a/addons/trenches/XEH_preInit.sqf b/addons/trenches/XEH_preInit.sqf index 47d20d7c2b..94decd550a 100644 --- a/addons/trenches/XEH_preInit.sqf +++ b/addons/trenches/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" GVAR(entrenchingTools) = call (uiNamespace getVariable QGVAR(entrenchingTools)); diff --git a/addons/trenches/initSettings.sqf b/addons/trenches/initSettings.inc.sqf similarity index 100% rename from addons/trenches/initSettings.sqf rename to addons/trenches/initSettings.inc.sqf diff --git a/addons/ui/XEH_preInit.sqf b/addons/ui/XEH_preInit.sqf index 9f2cfd9824..b85b7329b0 100644 --- a/addons/ui/XEH_preInit.sqf +++ b/addons/ui/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" GVAR(interfaceInitialized) = false; diff --git a/addons/ui/initSettings.sqf b/addons/ui/initSettings.inc.sqf similarity index 100% rename from addons/ui/initSettings.sqf rename to addons/ui/initSettings.inc.sqf diff --git a/addons/vector/XEH_postInit.sqf b/addons/vector/XEH_postInit.sqf index 12f643ece3..fb76dc5136 100644 --- a/addons/vector/XEH_postInit.sqf +++ b/addons/vector/XEH_postInit.sqf @@ -13,4 +13,4 @@ GVAR(useFeet) = false; GVAR(modeReticle) = 0; GVAR(illuminate) = false; -#include "initKeybinds.sqf" +#include "initKeybinds.inc.sqf" diff --git a/addons/vector/initKeybinds.sqf b/addons/vector/initKeybinds.inc.sqf similarity index 100% rename from addons/vector/initKeybinds.sqf rename to addons/vector/initKeybinds.inc.sqf diff --git a/addons/vehicle_damage/XEH_preInit.sqf b/addons/vehicle_damage/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/vehicle_damage/XEH_preInit.sqf +++ b/addons/vehicle_damage/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/vehicle_damage/initSettings.sqf b/addons/vehicle_damage/initSettings.inc.sqf similarity index 100% rename from addons/vehicle_damage/initSettings.sqf rename to addons/vehicle_damage/initSettings.inc.sqf diff --git a/addons/vehiclelock/XEH_preInit.sqf b/addons/vehiclelock/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/vehiclelock/XEH_preInit.sqf +++ b/addons/vehiclelock/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/vehiclelock/initSettings.sqf b/addons/vehiclelock/initSettings.inc.sqf similarity index 100% rename from addons/vehiclelock/initSettings.sqf rename to addons/vehiclelock/initSettings.inc.sqf diff --git a/addons/vehicles/XEH_preInit.sqf b/addons/vehicles/XEH_preInit.sqf index 028a8aec1c..70cd66e1cc 100644 --- a/addons/vehicles/XEH_preInit.sqf +++ b/addons/vehicles/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" [ "AllVehicles", diff --git a/addons/vehicles/initSettings.sqf b/addons/vehicles/initSettings.inc.sqf similarity index 100% rename from addons/vehicles/initSettings.sqf rename to addons/vehicles/initSettings.inc.sqf diff --git a/addons/viewdistance/XEH_preInit.sqf b/addons/viewdistance/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/viewdistance/XEH_preInit.sqf +++ b/addons/viewdistance/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/viewdistance/initSettings.sqf b/addons/viewdistance/initSettings.inc.sqf similarity index 100% rename from addons/viewdistance/initSettings.sqf rename to addons/viewdistance/initSettings.inc.sqf diff --git a/addons/viewports/XEH_preInit.sqf b/addons/viewports/XEH_preInit.sqf index a8940fc7dd..ec82c949b1 100644 --- a/addons/viewports/XEH_preInit.sqf +++ b/addons/viewports/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" #ifdef POINT_CONFIG_DEBUG call compileScript [QPATHTOF(dev\debugPoints.sqf)]; diff --git a/addons/viewports/initSettings.sqf b/addons/viewports/initSettings.inc.sqf similarity index 100% rename from addons/viewports/initSettings.sqf rename to addons/viewports/initSettings.inc.sqf diff --git a/addons/viewrestriction/XEH_preInit.sqf b/addons/viewrestriction/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/viewrestriction/XEH_preInit.sqf +++ b/addons/viewrestriction/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/viewrestriction/initSettings.sqf b/addons/viewrestriction/initSettings.inc.sqf similarity index 100% rename from addons/viewrestriction/initSettings.sqf rename to addons/viewrestriction/initSettings.inc.sqf diff --git a/addons/volume/XEH_preInit.sqf b/addons/volume/XEH_preInit.sqf index ae4979ef36..775f4d71d5 100644 --- a/addons/volume/XEH_preInit.sqf +++ b/addons/volume/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" GVAR(isLowered) = false; GVAR(initialGameVolume) = soundVolume; diff --git a/addons/volume/initSettings.sqf b/addons/volume/initSettings.inc.sqf similarity index 100% rename from addons/volume/initSettings.sqf rename to addons/volume/initSettings.inc.sqf diff --git a/addons/weaponselect/XEH_preInit.sqf b/addons/weaponselect/XEH_preInit.sqf index 01c9f2484f..25d6b9b5d5 100644 --- a/addons/weaponselect/XEH_preInit.sqf +++ b/addons/weaponselect/XEH_preInit.sqf @@ -26,6 +26,6 @@ GVAR(GrenadesNonFrag) = []; false } count getArray (configFile >> "CfgWeapons" >> "Throw" >> "muzzles"); -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/weaponselect/initSettings.sqf b/addons/weaponselect/initSettings.inc.sqf similarity index 100% rename from addons/weaponselect/initSettings.sqf rename to addons/weaponselect/initSettings.inc.sqf diff --git a/addons/weather/XEH_preInit.sqf b/addons/weather/XEH_preInit.sqf index 438c3e9962..bae7c82516 100644 --- a/addons/weather/XEH_preInit.sqf +++ b/addons/weather/XEH_preInit.sqf @@ -7,7 +7,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" // Make sure this data is read before client/server postInit call FUNC(getMapData); diff --git a/addons/weather/initSettings.sqf b/addons/weather/initSettings.inc.sqf similarity index 100% rename from addons/weather/initSettings.sqf rename to addons/weather/initSettings.inc.sqf diff --git a/addons/winddeflection/XEH_preInit.sqf b/addons/winddeflection/XEH_preInit.sqf index 9361d05015..894773534a 100644 --- a/addons/winddeflection/XEH_preInit.sqf +++ b/addons/winddeflection/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/winddeflection/initSettings.sqf b/addons/winddeflection/initSettings.inc.sqf similarity index 100% rename from addons/winddeflection/initSettings.sqf rename to addons/winddeflection/initSettings.inc.sqf diff --git a/addons/yardage450/XEH_postInit.sqf b/addons/yardage450/XEH_postInit.sqf index 2d4ef89968..2959360f7d 100644 --- a/addons/yardage450/XEH_postInit.sqf +++ b/addons/yardage450/XEH_postInit.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" -#include "initKeybinds.sqf" +#include "initKeybinds.inc.sqf" GVAR(active) = false; diff --git a/addons/yardage450/initKeybinds.sqf b/addons/yardage450/initKeybinds.inc.sqf similarity index 100% rename from addons/yardage450/initKeybinds.sqf rename to addons/yardage450/initKeybinds.inc.sqf diff --git a/addons/zeus/XEH_preInit.sqf b/addons/zeus/XEH_preInit.sqf index c1bea7c581..12bd359866 100644 --- a/addons/zeus/XEH_preInit.sqf +++ b/addons/zeus/XEH_preInit.sqf @@ -19,6 +19,6 @@ if (isServer) then { GVAR(GlobalSkillAI) = [0.5,0.5,0.5,0.5,true,true]; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/zeus/initSettings.sqf b/addons/zeus/initSettings.inc.sqf similarity index 100% rename from addons/zeus/initSettings.sqf rename to addons/zeus/initSettings.inc.sqf diff --git a/sqfc.json b/sqfc.json index 53209261b8..948f7ed1d5 100644 --- a/sqfc.json +++ b/sqfc.json @@ -6,11 +6,8 @@ "P:/" ], "excludeList": [ - "initsettings.sqf", - "initkeybinds.sqf", - "xeh_prep.sqf", + ".inc.sqf", "\\dev\\", - "medical_ai\\statemachine.sqf", "common\\functions\\fnc_dummy.sqf", "zeus\\functions\\fnc_zeusAttributes.sqf" ], diff --git a/tools/sqf_linter.py b/tools/sqf_linter.py index 58a1491a99..c71c72094e 100644 --- a/tools/sqf_linter.py +++ b/tools/sqf_linter.py @@ -11,17 +11,13 @@ from sqf.exceptions import SQFParserError addon_base_path = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) -files_to_ignore_lower = [ - x.lower() for x in ["initSettings.sqf", "initKeybinds.sqf", "XEH_PREP.sqf"] -] - def get_files_to_process(basePath): arma_files = [] for (root, _dirs, files) in os.walk(basePath): for file in files: if file.endswith(".sqf"): - if file.lower() in files_to_ignore_lower: + if file.endswith(".inc.sqf"): continue filePath = os.path.join(root, file) arma_files.append(filePath) diff --git a/tools/sqfvmChecker.py b/tools/sqfvmChecker.py index 021bc98daa..69d7566100 100644 --- a/tools/sqfvmChecker.py +++ b/tools/sqfvmChecker.py @@ -6,9 +6,6 @@ import tomllib addon_base_path = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) -files_to_ignore_lower = [ - x.lower() for x in ["initSettings.sqf", "initKeybinds.sqf", "XEH_PREP.sqf"] -] sqfvm_exe = os.path.join(addon_base_path, "sqfvm.exe") virtual_paths = [ # would need to add more even more to /include to use it @@ -24,7 +21,7 @@ def get_files_to_process(basePath): for root, _dirs, files in os.walk(os.path.join(addon_base_path, "addons")): for file in files: if file.endswith(".sqf") or file == "config.cpp": - if file.lower() in files_to_ignore_lower: + if file.endswith(".inc.sqf"): continue skipPreprocessing = False for addonTomlPath in [os.path.join(root, "addon.toml"), os.path.join(os.path.dirname(root), "addon.toml")]: