Merge branch 'z411/gamemenu_cvar' into 'master'

Add menu_gamemenu client cvar to enable/disable the in-game menu

Closes #2732

See merge request xonotic/xonotic-data.pk3dir!1101

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 9c610aabca53484a66ec502772e79dc483336010..4e05e681db3d48d8c37276dfe4339e4e895fcd9e 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -526,7 +526,7 @@ float CSQC_InputEvent(int bInputType, float nPrimary, float nSecondary)
                        Scoreboard_UI_Enable(0);
                        return true;
                }
-               if (!isdemo() && cvar("_menu_gamemenu_dialog_available"))
+               if (autocvar_menu_gamemenu && !isdemo() && cvar("_menu_gamemenu_dialog_available"))
                {
                        localcmd("\nmenu_showgamemenudialog\n");
                        return true;

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index 00dd149638de748bb50cf927b89ec9e20a2c5f92..1f9e6a9a03e5aa1f78ef13dd78a8de13b79853ca 100644 (file)
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@ -20,6 +20,7 @@ bool autocvar_developer_csqcentities;
 bool autocvar_cl_race_cptimes_onlyself; // TODO: move to race gamemode
 bool autocvar_cl_race_cptimes_showself = false;
 bool autocvar_cl_welcome = true;
+bool autocvar_menu_gamemenu = true;
 
 // Map coordinate base calculations need these
 vector mi_center;

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index d427b0f5a7fe73edb0ebd0510fb003778243a469..4cd709bb6d9689c864affa5f354ad86d99a68c04 100644 (file)
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -870,6 +870,9 @@ scr_loadingscreen_scale 999
 scr_loadingscreen_scale_base 1
 scr_loadingscreen_scale_limit 2
 
+// in-game menu
+seta menu_gamemenu 1 "1: show in-game menu when esc is pressed; 0: show main menu when esc is pressed"
+
 // other config files
 exec effects-normal.cfg
 exec crosshairs.cfg