add menu option for cba settings (#641)

CBATeam · Apr 13, 2017 · 2e9cd00 · 2e9cd00
1 parent 1b8c457
commit 2e9cd00
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/addons/settings/Display3DEN.hpp b/addons/settings/Display3DEN.hpp
@@ -10,7 +10,7 @@ class Display3DEN {
                 };
                 class ADDON {
                     text = CSTRING(3den_shortcut);
-                    action = QUOTE(findDisplay 313 call COMPILE_FILE(openSettingsMenu));
+                    action = QUOTE(findDisplay 313 call FUNC(openSettingsMenu));
                     data = QUOTE(ADDON);
                     shortcuts[] = {INPUT_CTRL_OFFSET + INPUT_ALT_OFFSET + DIK_S};
                 };

diff --git a/addons/settings/XEH_PREP.sqf b/addons/settings/XEH_PREP.sqf
@@ -10,6 +10,7 @@ PREP(clear);
 PREP(priority);
 
 if (hasInterface) then {
+    PREP(openSettingsMenu);
     PREP(gui_addonChanged);
     PREP(gui_sourceChanged);
     PREP(gui_configure);

diff --git a/addons/settings/XEH_preInit.sqf b/addons/settings/XEH_preInit.sqf
@@ -79,6 +79,6 @@ if (isServer) then {
     [_setting, _value, _priority, "mission", _store] call FUNC(set);
 }] call CBA_fnc_addEventHandler;
 
-//[localize LSTRING(menu_button), "RscDisplayGameOptions"] call CBA_fnc_addPauseMenuOption;
+[[localize LSTRING(menu_button)], QGVAR(MainMenuHelper)] call CBA_fnc_addPauseMenuOption;
 
 ADDON = true;
diff --git a/addons/settings/openSettingsMenu.sqf → addons/settings/fnc_openSettingsMenu.sqf b/addons/settings/openSettingsMenu.sqf → addons/settings/fnc_openSettingsMenu.sqf
diff --git a/addons/settings/gui.hpp b/addons/settings/gui.hpp
@@ -88,7 +88,7 @@ class RscDisplayGameOptions {
 };
 
 class GVAR(ButtonConfigure_base): RscButtonMenu {
-    onButtonClick = QUOTE(ctrlParent (_this select 0) call COMPILE_FILE(openSettingsMenu));
+    onButtonClick = QUOTE(ctrlParent (_this select 0) call FUNC(openSettingsMenu));
     idc = IDC_BTN_CONFIGURE;
     text = CSTRING(configureAddons);
     x = POS_X_LOW(11.1);
@@ -503,3 +503,11 @@ class GVAR(presets) {
         };
     };
 };
+
+class RscDisplayEmpty;
+class GVAR(MainMenuHelper): RscDisplayEmpty {
+    onLoad = QUOTE(\
+        (_this select 0) call FUNC(openSettingsMenu);\
+        (_this select 0) closeDisplay 0;\
+    );
+};