Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tools - Add HEMTT SQF support #1630

Merged
merged 6 commits into from
Dec 7, 2023
Merged

Tools - Add HEMTT SQF support #1630

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
79bd494
hemtt sqf compat
BrettMayson Nov 24, 2023
65d06e9
Update sqfvmChecker.py
PabstMirror Nov 26, 2023
b10f501
Update sqfvmChecker.py
PabstMirror Nov 26, 2023
8af2f31
Adapt backwards-compatible HEMTT ASC config
jonpas Dec 7, 2023
d42ac87
Update sqfc.json
jonpas Dec 7, 2023
69ae147
Make old ASC work properly
jonpas Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 addons/accessory/XEH_PREP.sqf → addons/accessory/XEH_PREP.hpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion addons/accessory/XEH_preInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

if (!hasInterface) exitWith {};

#include "XEH_PREP.sqf"
#include "XEH_PREP.hpp"
PabstMirror marked this conversation as resolved.
Show resolved Hide resolved

GVAR(usageHash) = createHashMap;

Expand Down
2 changes: 1 addition & 1 deletion addons/accessory/XEH_preStart.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#include "script_component.hpp"

#include "XEH_PREP.sqf"
#include "XEH_PREP.hpp"
2 changes: 1 addition & 1 deletion addons/common/XEH_preInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ GVAR(addons) = call (uiNamespace getVariable [QGVAR(addons), {[]}]);
activateAddons GVAR(addons);

// BWC
#include "backwards_comp.sqf"
#include "backwards_comp.inc.sqf"

// fix changing direction of remote units not working with zeus
["ModuleCurator_F", "init", {
Expand Down
0 addons/common/backwards_comp.sqf → addons/common/backwards_comp.inc.sqf
View file
Open in desktop
File renamed without changes.
0 addons/diagnostic/XEH_PREP.sqf → addons/diagnostic/XEH_PREP.hpp
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions addons/diagnostic/XEH_preInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ LOG(MSG_INIT);

ADDON = false;

#include "XEH_PREP.sqf"
#include "initSettings.sqf"
#include "XEH_PREP.hpp"
#include "initSettings.inc.sqf"

[QGVAR(debug), {_this call CBA_fnc_debug}] call CBA_fnc_addEventHandler;

Expand Down
2 changes: 1 addition & 1 deletion addons/diagnostic/XEH_preStart.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "script_component.hpp"

#include "XEH_PREP.sqf"
#include "XEH_PREP.hpp"

PREP(initExtendedDebugConsole);
PREP(initTargetDebugConsole);
0 addons/diagnostic/initSettings.sqf → addons/diagnostic/initSettings.inc.sqf
View file
Open in desktop
File renamed without changes.
0 addons/disposable/XEH_PREP.sqf → addons/disposable/XEH_PREP.hpp
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions addons/disposable/XEH_preInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

ADDON = false;

#include "initSettings.sqf"
#include "initSettings.inc.sqf"

if (configProperties [configFile >> "CBA_DisposableLaunchers"] isEqualTo []) exitWith {};

#include "XEH_PREP.sqf"
#include "XEH_PREP.hpp"

["loadout", {
params ["_unit"];
Expand Down
2 changes: 1 addition & 1 deletion addons/disposable/XEH_preStart.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ PREP(initDisplayInventory);

if (configProperties [configFile >> "CBA_DisposableLaunchers"] isEqualTo []) exitWith {};

#include "XEH_PREP.sqf"
#include "XEH_PREP.hpp"
0 addons/disposable/initSettings.sqf → addons/disposable/initSettings.inc.sqf
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions addons/events/XEH_preInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ if (isServer) then {
};
};

#include "backwards_comp.sqf"
#include "initSettings.sqf"
#include "backwards_comp.inc.sqf"
#include "initSettings.inc.sqf"

ADDON = true;

Expand Down
0 addons/events/backwards_comp.sqf → addons/events/backwards_comp.inc.sqf
View file
Open in desktop
File renamed without changes.
0 addons/events/initSettings.sqf → addons/events/initSettings.inc.sqf
View file
Open in desktop
File renamed without changes.
0 addons/keybinding/XEH_PREP.sqf → addons/keybinding/XEH_PREP.hpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion addons/keybinding/XEH_preInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ SCRIPT(XEH_preInit);

if (!hasInterface) exitWith {};

#include "XEH_PREP.sqf"
#include "XEH_PREP.hpp"

ADDON = false;

Expand Down
2 changes: 1 addition & 1 deletion addons/keybinding/XEH_preStart.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

if (!hasInterface) exitWith {};

#include "XEH_PREP.sqf"
#include "XEH_PREP.hpp"

private _supportedKeys = [
DIK_ESCAPE,
Expand Down
2 changes: 1 addition & 1 deletion addons/network/XEH_preInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

ADDON = false;

#include "initSettings.sqf"
#include "initSettings.inc.sqf"

// Restore loadouts lost by the naked unit bug
[QGVAR(validateLoadout), {
Expand Down
0 addons/network/initSettings.sqf → addons/network/initSettings.inc.sqf
View file
Open in desktop
File renamed without changes.
0 addons/optics/XEH_PREP.sqf → addons/optics/XEH_PREP.hpp
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions addons/optics/XEH_preInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

ADDON = false;

#include "initSettings.sqf"
#include "initSettings.inc.sqf"

if (configProperties [configFile >> "CBA_PIPItems"] isEqualTo [] && {
configProperties [configFile >> "CBA_CarryHandleTypes"] isEqualTo []
}) exitWith {};

#include "XEH_PREP.sqf"
#include "XEH_PREP.hpp"

if (!hasInterface) exitWith {};

#include "initKeybinds.sqf"
#include "initKeybinds.inc.sqf"

QGVAR(pauseOpticLayer) cutText ["", "PLAIN"];

Expand Down
2 changes: 1 addition & 1 deletion addons/optics/XEH_preStart.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ if (configProperties [configFile >> "CBA_PIPItems"] isEqualTo [] && {
configProperties [configFile >> "CBA_CarryHandleTypes"] isEqualTo []
}) exitWith {};

#include "XEH_PREP.sqf"
#include "XEH_PREP.hpp"
0 addons/optics/initKeybinds.sqf → addons/optics/initKeybinds.inc.sqf
View file
Open in desktop
File renamed without changes.
0 addons/optics/initSettings.sqf → addons/optics/initSettings.inc.sqf
View file
Open in desktop
File renamed without changes.
0 addons/settings/XEH_PREP.sqf → addons/settings/XEH_PREP.hpp
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions addons/settings/XEH_preInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ADDON = false;

// Don't prep functions if already prepped by CBA_fnc_addSetting to avoid log spam.
if (isNil QFUNC(init)) then {
#include "XEH_PREP.sqf"
#include "XEH_PREP.hpp"
};

//#define DEBUG_MODE_FULL
Expand Down Expand Up @@ -42,7 +42,7 @@ if (isNil QFUNC(init)) then {
#endif

// --- init settings namespaces
#include "initSettings.sqf"
#include "initSettings.inc.sqf"

// --- event to refresh missionNamespace value if setting has changed and call public event as well as execute setting script
[QGVAR(refreshSetting), {
Expand Down
2 changes: 1 addition & 1 deletion addons/settings/XEH_preStart.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "script_component.hpp"

#include "XEH_PREP.sqf"
#include "XEH_PREP.hpp"

PREP(initDisplayMain);

Expand Down
2 changes: 1 addition & 1 deletion addons/settings/fnc_addSetting.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Author:

// Prep functions if not yet prepped to avoid race condition.
if (isNil QFUNC(init)) then {
#include "XEH_PREP.sqf"
#include "XEH_PREP.hpp"
};

call FUNC(init) == 0
2 changes: 1 addition & 1 deletion addons/settings/fnc_gui_addonChanged.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ uiNamespace setVariable [QGVAR(addonIndex), _index];
private _selectedSource = uiNamespace getVariable QGVAR(source);

if !(_display getVariable [_selectedAddon, false]) then {
#include "gui_createCategory.sqf"
#include "gui_createCategory.inc.sqf"
_display setVariable [_selectedAddon, true];
};

Expand Down
2 changes: 1 addition & 1 deletion addons/settings/fnc_init.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ if (canSuspend) exitWith {
};

// --- init settings system, makes this function useable in preInit without having to add "CBA_settings" to requiredAddons
#include "initSettings.sqf"
#include "initSettings.inc.sqf"

params [
["_setting", "", [""]],
Expand Down
0 addons/settings/gui_createCategory.sqf → addons/settings/gui_createCategory.inc.sqf
View file
Open in desktop
File renamed without changes.
0 addons/settings/initSettings.sqf → addons/settings/initSettings.inc.sqf
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion addons/ui/XEH_preInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

ADDON = false;

#include "initSettings.sqf"
#include "initSettings.inc.sqf"

if (hasInterface) then {
call COMPILE_FILE(flexiMenu\init);
Expand Down
0 addons/ui/initSettings.sqf → addons/ui/initSettings.inc.sqf
View file
Open in desktop
File renamed without changes.
6 changes: 1 addition & 5 deletions sqfc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@
"P:/"
],
"excludeList": [
"\\initsettings.sqf",
"\\initkeybinds.sqf",
"\\xeh_prep.sqf",
"\\backwards_comp.sqf",
"settings\\gui_createcategory.sqf",
".inc.sqf",
"diagnostic\\fnc_isdebugconsoleallowed.sqf",
"xeh\\fnc_initdisplay.sqf",
"xeh\\fnc_startloadingscreen.sqf",
Expand Down