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

WIP - CBA - use PREPMAIN() instead of CfgFunctions #1338

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
+832 −530
Open

WIP - CBA - use PREPMAIN() instead of CfgFunctions #1338

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
00d5b36
accessory move CfgFunctions to PREPMAIN
commy2 May 15, 2020
8615ab3
accessory move CfgFunctions to PREPMAIN
commy2 May 15, 2020
8685947
accessory move CfgFunctions to PREPMAIN
commy2 May 15, 2020
67435b3
ai and arrays move CfgFunctions to PREPMAIN
commy2 May 15, 2020
0e6844b
common move CfgFunctions to PREPMAIN
commy2 May 15, 2020
7a6ad43
´diagnostic move CfgFunctions to PREPMAIN
commy2 May 15, 2020
9c4eec5
disposable move CfgFunctions to PREPMAIN
commy2 May 15, 2020
cb3656a
events move CfgFunctions to PREPMAIN
commy2 May 15, 2020
aefdefc
hashes move CfgFunctions to PREPMAIN
commy2 May 15, 2020
31b9ed1
jr move CfgFunctions to PREPMAIN
commy2 May 15, 2020
4bb8a7a
keybinding move CfgFunctions to PREPMAIN
commy2 May 15, 2020
02a54a2
modules move CfgFunctions to PREPMAIN
commy2 May 15, 2020
f807932
music move CfgFunctions to PREPMAIN
commy2 May 15, 2020
2346c6a
network move CfgFunctions to PREPMAIN
commy2 May 15, 2020
12b0b59
settings move CfgFunctions to PREPMAIN
commy2 May 15, 2020
7ad0811
fix indentation
commy2 May 15, 2020
c4a2804
strings move CfgFunctions to PREPMAIN
commy2 May 15, 2020
d2b3e79
ui move CfgFunctions to PREPMAIN
commy2 May 15, 2020
23a567e
xeh move CfgFunctions to PREPMAIN
commy2 May 15, 2020
b2f5706
vectors move CfgFunctions to PREPMAIN
commy2 May 15, 2020
8bc8307
PREP in preStart
commy2 May 15, 2020
80edb76
fix some XEH functions being undefined on start
commy2 May 15, 2020
814323c
fix some XEH functions being undefined on start
commy2 May 15, 2020
6025447
fix some XEH functions being undefined on preInit
commy2 May 15, 2020
d241771
fix a loading order thing
commy2 May 16, 2020
88187a0
move PREP'd functions to mission namespace before preInit runs
commy2 May 16, 2020
26bddc1
handle disabling compile cache
commy2 May 17, 2020
325bbb4
fix some jumbled variables
commy2 May 17, 2020
e8534b0
handle initFunctions running multiple times
commy2 May 29, 2020
ed5f070
don't copy PREP macros before preInit (but PREPMAIN)
commy2 May 29, 2020
aeb8fc0
functions viewer integration
commy2 May 30, 2020
ac37c0b
add PREP() to prepList in release builds
commy2 May 30, 2020
4a19f66
disable debug
commy2 May 30, 2020
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
7 changes: 0 additions & 7 deletions addons/accessory/CfgFunctions.hpp
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion addons/accessory/XEH_PREP.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
PREPMAIN(switchableAttachments);

PREP(switchAttachment);
if (hasInterface) then {
PREP(switchAttachment);
};
4 changes: 2 additions & 2 deletions addons/accessory/XEH_preInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "script_component.hpp"

if (!hasInterface) exitWith {};

#include "XEH_PREP.sqf"

if (!hasInterface) exitWith {};

[ELSTRING(common,WeaponsCategory), "MRT_SwitchItemNextClass_R", [LSTRING(railNext), LSTRING(railNext_tooltip)], {
[1, "next"] call FUNC(switchAttachment) // return
}, {}, [DIK_L, [false, true, false]]] call CBA_fnc_addKeybind;
Expand Down
1 change: 0 additions & 1 deletion addons/accessory/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@ class CfgPatches {
};

#include "CfgEventHandlers.hpp"
#include "CfgFunctions.hpp"