Use a more correct way of toggling the HUD, and fix some missing menu dependencies

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index d501b1f39b659a6323afb9117a7c00e85b7d6665..82026d3b12865b58125eca94d93f84591918b6d4 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1212,6 +1212,7 @@ seta hud_shownames_offset 52 "offset (along z-axis) tag from player origin by th
 seta hud_shownames_offset_healthsize 0.5 "offset (along z-axis) tag from player origin by this many units, based on player size"\r
 \r
 sbar_info_pos 50\r
+seta sbar_hudselector 1 "enables the HUD"\r
 seta sbar_alpha_bg 0.8 "alpha value of the HUD background"\r
 seta sbar_alpha_fg 1 "alpha value of the HUD foreground items"\r
 seta sbar_border_thickness 1 "scoreboard border thickness"\r

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 557a0d9b916488f105139dfeaf0f56bc7b53b59d..68d0bc27cb4d37dbef5e8aee1982304dadeb709d 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -1150,7 +1150,7 @@ void CSQC_UpdateView(float w, float h)
        hud = getstati(STAT_HUD);\r
 \r
        if(cvar("r_letterbox") == 0)\r
-               if(cvar("viewsize") < 120)\r
+               if(cvar("viewsize") < 120 && sbar_hudselector)\r
                        CSQC_common_hud();\r
 \r
        if(cvar("cl_flash_pickup"))\r

diff --git a/data/qcsrc/client/hud.qc b/data/qcsrc/client/hud.qc
index 0852aa6fbad3ae119369ad706ea1c507757bf67a..2bf72e48b1c4958f2e5283487216dfc2087c5ee6 100644 (file)
--- a/data/qcsrc/client/hud.qc
+++ b/data/qcsrc/client/hud.qc
@@ -1989,7 +1989,7 @@ void Sbar_Status()
        health_pos = bottom - '43 58 0';\r
        armor_pos = bottom - '43 68 0';\r
 \r
-       if (cvar("viewsize") <= 100) {\r
+       if (cvar("viewsize") <= 100 && sbar_hudselector) {\r
                if (teamplay)\r
                        drawpic(bottom - '96 96 0', "gfx/hud/bg_status", '192 96 0', GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // hud color = myteam color\r
                else {\r
@@ -2142,7 +2142,7 @@ void Sbar_Timer()
                bgpos_z = 0;\r
        }\r
 \r
-       if (cvar("viewsize") <= 100) { // draw timer background when viewsize <= 100\r
+       if (cvar("viewsize") <= 100 && sbar_hudselector) { // draw timer background when viewsize <= 100\r
                if (teamplay)\r
                        drawpic(bgpos, "gfx/hud/bg_timer", '120 30 0' * scale, GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // timer bg color = myteam color\r
                else {\r
@@ -3168,7 +3168,7 @@ void Sbar_Draw (void)
                if(g_vore) // only when the vore system is active\r
                {\r
                        // draw the stomach board\r
-                       if (cvar("viewsize") <= 100) {\r
+                       if (cvar("viewsize") <= 100 && sbar_hudselector) {\r
                                if (teamplay)\r
                                        drawpic(bottomleft- '0 256 0', "gfx/hud/bg_stomach", '256 256 0', GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // hud color = myteam color\r
                                else {\r

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
index e1c7c2a4128ebda1aeaea56486dd5860f68bbc5c..4960b91ed61c0c21187b3007234bc23612db39bd 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
@@ -49,23 +49,24 @@ void fillVoretHudDialog(entity me)
                me.TD(me, 1, 4, makeVoretTextLabel(0, "HUD settings:"));\r
        me.TR(me);\r
        me.TDempty(me, 0.2);\r
-       me.TD(me, 1, 2, e = makeVoretCheckBoxEx(100, 120, "viewsize", "Enable HUD"));\r
+       me.TD(me, 1, 2, e = makeVoretCheckBox(0, "sbar_hudselector", "Enable HUD"));\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
-               me.TD(me, 1, 0.8, e = makeVoretCheckBoxEx(100, 110, "viewsize", "Background:"));\r
-                       setDependent(e, "viewsize", 0, 100);\r
                me.TD(me, 1, 3, e = makeVoretSlider(0, 1, 0.01, "sbar_alpha_bg"));\r
-                       setDependent(e, "viewsize", 0, 100);\r
+                       setDependent(e, "sbar_hudselector", 1, 1);\r
                me.TR(me);\r
                        me.TDempty(me, 0.2);\r
                        me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Default color:"));\r
+                               setDependent(e, "sbar_hudselector", 1, 1);\r
                        me.TD(me, 2, 2, e = makeVoretColorpickerString("sbar_color_bg", "sbar_color_bg"));\r
+                               setDependent(e, "sbar_hudselector", 1, 1);\r
                me.TR(me);\r
                me.TR(me);\r
                        me.TDempty(me, 0.2);\r
                        me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Team color:"));\r
+                               setDependent(e, "sbar_hudselector", 1, 1);\r
                        me.TD(me, 1, 3, e = makeVoretSlider(0.1, 1, 0.01, "sbar_color_bg_team"));\r
-                               setDependent(e, "viewsize", 0, 100);\r
+                               setDependent(e, "sbar_hudselector", 1, 1);\r
        me.TR(me);\r
        me.TR(me);\r
                me.TD(me, 1, 4, makeVoretTextLabel(0, "Ring settings:"));\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index 01d6b9ab2ec7ac1300550cf1132fc18b75f81aa0..cfee2452d0b0f7c09cce587773ad6e57e3cae8cc 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -26,8 +26,6 @@
 \r
 - 0.8: Make a new area in the Vore Temple map, I know where and how\r
 \r
-- 0.7 | 0.8: Check if it's really ok to change the viewsize cvar to toggle the HUD in the menu\r
-\r
 - 0.8 BUG: There is still an issue with the weapon model attempting to be attached to the stomach model, fix it\r
 \r
 - +0.8: Port some player models from Xonotic when they are properly done\r
@@ -148,4 +146,6 @@
 \r
 - 0.8: Turn the Grabber into an organic weapon, but keep metal parts like the fuel cases and weapon display\r
 \r
-- 0.8: Colormod gibs when regurgitating them, although they are client side and the color cvars are server
\ No newline at end of file
+- 0.8: Colormod gibs when regurgitating them, although they are client side and the color cvars are server\r
+\r
+- 0.8: scoreboard doesn't show when HUD is disabled (sbar_hudselector is 0)
\ No newline at end of file