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

precompile all display load functions #464

Merged
merged 1 commit into from
Aug 15, 2016
Merged

precompile all display load functions #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions addons/events/CfgEventHandlers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ class Extended_PostInit_EventHandlers {

class Extended_DisplayLoad_EventHandlers {
class RscDisplayMission {
ADDON = QUOTE(_this call COMPILE_FILE(XEH_missionDisplayLoad));
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(missionDisplayLoad)'));
};
class RscDisplayCurator {
ADDON = QUOTE(_this call COMPILE_FILE(XEH_curatorDisplayLoad));
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(curatorDisplayLoad)'));
};
};
3 changes: 3 additions & 0 deletions addons/events/XEH_preStart.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@
PREP(keyHandler);
PREP(keyHandlerDown);
PREP(keyHandlerUp);

PREP(missionDisplayLoad);
PREP(curatorDisplayLoad);
0 addons/events/XEH_curatorDisplayLoad.sqf → addons/events/fnc_curatorDisplayLoad.sqf
View file
Open in desktop
File renamed without changes.
0 addons/events/XEH_missionDisplayLoad.sqf → addons/events/fnc_missionDisplayLoad.sqf
View file
Open in desktop
File renamed without changes.
18 changes: 12 additions & 6 deletions addons/help/CfgEventhandlers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@

class Extended_PreStart_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_preStart));
};
};

class Extended_PreInit_EventHandlers {
class ADDON {
clientInit = QUOTE(call COMPILE_FILE(XEH_preClientInit));
Expand All @@ -13,15 +19,15 @@ class Extended_PostInit_EventHandlers {

class Extended_DisplayLoad_EventHandlers {
class RscDisplayMain {
CBA_helpVersion = QUOTE(_this call COMPILE_FILE(fnc_setVersionLine));
CBA_helpCredits = QUOTE(_this call COMPILE_FILE(fnc_setCreditsLine));
CBA_helpVersion = QUOTE(_this call (uiNamespace getVariable 'FUNC(setVersionLine)'));
CBA_helpCredits = QUOTE(_this call (uiNamespace getVariable 'FUNC(setCreditsLine)'));
};
class RscDisplayInterrupt {
CBA_helpVersion = QUOTE(_this call COMPILE_FILE(fnc_setVersionLine));
CBA_helpCredits = QUOTE(_this call COMPILE_FILE(fnc_setCreditsLine));
CBA_helpVersion = QUOTE(_this call (uiNamespace getVariable 'FUNC(setVersionLine)'));
CBA_helpCredits = QUOTE(_this call (uiNamespace getVariable 'FUNC(setCreditsLine)'));
};
class RscDisplayMPInterrupt {
CBA_helpVersion = QUOTE(_this call COMPILE_FILE(fnc_setVersionLine));
CBA_helpCredits = QUOTE(_this call COMPILE_FILE(fnc_setCreditsLine));
CBA_helpVersion = QUOTE(_this call (uiNamespace getVariable 'FUNC(setVersionLine)'));
CBA_helpCredits = QUOTE(_this call (uiNamespace getVariable 'FUNC(setCreditsLine)'));
};
};
4 changes: 4 additions & 0 deletions addons/help/XEH_preStart.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "script_component.hpp"

PREP(setVersionLine);
PREP(setCreditsLine);
8 changes: 7 additions & 1 deletion addons/keybinding/CfgEventHandlers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@

class Extended_PreStart_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_preStart));
};
};

class Extended_PreInit_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_preInit));
Expand All @@ -7,6 +13,6 @@ class Extended_PreInit_EventHandlers {

class Extended_DisplayLoad_EventHandlers {
class RscDisplayConfigure {
ADDON = QUOTE(_this call COMPILE_FILE(XEH_configureDisplayLoad));
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(configureDisplayLoad)'));
};
};
3 changes: 3 additions & 0 deletions addons/keybinding/XEH_preStart.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#include "script_component.hpp"

PREP(configureDisplayLoad);
0 ...s/keybinding/XEH_configureDisplayLoad.sqf → ...s/keybinding/fnc_configureDisplayLoad.sqf
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions addons/settings/CfgEventHandlers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ class Extended_PostInit_EventHandlers {

class Extended_DisplayLoad_EventHandlers {
class RscDisplayGameOptions {
ADDON = QUOTE(if (isNil 'ADDON') then {_this call COMPILE_FILE(gui_initDisplay_disabled)} else {_this call COMPILE_FILE(gui_initDisplay)};);
ADDON = QUOTE(if (isNil 'ADDON') then {_this call (uiNamespace getVariable 'FUNC(gui_initDisplay_disabled)')} else {_this call (uiNamespace getVariable 'FUNC(gui_initDisplay)')};);
};
class Display3DEN {
ADDON = QUOTE(_this call COMPILE_FILE(init3DEN));
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(init3DEN)'));
};
};
4 changes: 4 additions & 0 deletions addons/settings/XEH_preStart.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#include "script_component.hpp"

#include "XEH_PREP.sqf"

PREP(gui_initDisplay);
PREP(gui_initDisplay_disabled);
PREP(init3DEN);
0 addons/settings/gui_initDisplay.sqf → addons/settings/fnc_gui_initDisplay.sqf
View file
Open in desktop
File renamed without changes.
0 addons/settings/gui_initDisplay_disabled.sqf → ...settings/fnc_gui_initDisplay_disabled.sqf
View file
Open in desktop
File renamed without changes.
0 addons/settings/init3DEN.sqf → addons/settings/fnc_init3DEN.sqf
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion addons/xeh/CfgEventHandlers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class Extended_Reloaded_EventHandlers {};
// display xeh
class Extended_DisplayLoad_EventHandlers {
class Display3DEN {
ADDON = QUOTE(call COMPILE_FILE(XEH_3DENDisplayLoad));
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(3DENDisplayLoad)'));
};
};
class Extended_DisplayUnload_EventHandlers {};
0 addons/xeh/XEH_3DENDisplayLoad.sqf → addons/xeh/fnc_3DENDisplayLoad.sqf
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions addons/xeh/fnc_preStart.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ with uiNamespace do {
SLX_XEH_COMPILE = compileFinal "compile preprocessFileLineNumbers _this"; //backwards comps
SLX_XEH_COMPILE_NEW = CBA_fnc_compileFunction; //backwards comp

PREP(3DENDisplayLoad);

// call PreStart events
{
private _eventFunc = "";
Expand Down