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

[voretournament/voretournament.git] / data / qcsrc / menu / voret / dialog_multiplayer_playersetup_hud.c

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
index 6c1f50cd6b679f47c02c841c9c80abb8d0129606..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
@@ -91,27 +92,63 @@ void fillVoretHudDialog(entity me)
                me.TD(me, 1, 4, makeVoretTextLabel(0, "Radar settings:"));\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
-               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Position:"));\r
-               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "0 0", "Top left"));\r
-               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "0.5 0", "Top middle"));\r
-               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "1 0", "Top right"));\r
+               me.TD(me, 1, 1.2, e = makeVoretRadioButton(1, "cl_radar", "0", "Disabled"));\r
+               me.TD(me, 1, 1.2, e = makeVoretRadioButton(1, "cl_radar", "1", "Team games"));\r
+               me.TD(me, 1, 1.2, e = makeVoretRadioButton(1, "cl_radar", "2", "Always"));\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Foreground:"));\r
+                       setDependent(e, "cl_radar", 1, 2);\r
+               me.TD(me, 1, 3, e = makeVoretSlider(0.10, 1, 0.05, "cl_radar_foreground_alpha"));\r
+                       makeMulti(e, "cl_radar_content_alpha");\r
+                       setDependent(e, "cl_radar", 1, 2);\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               sl = makeVoretSlider(0.10, 1, 0.05, "cl_radar_background_alpha");\r
+               me.TD(me, 1, 0.8, e = makeVoretSliderCheckBox(-1, 1, sl, "Background:"));\r
+               me.TD(me, 1, 3, sl);\r
+               setDependent(e, "cl_radar", 1, 2);\r
+               setDependent(sl, "cl_radar", 1, 2);\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
                me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Size:"));\r
-               me.TD(me, 1, 3, e = makeVoretTextSlider("cl_teamradar_size"));\r
+                       setDependent(e, "cl_radar", 1, 2);\r
+               me.TD(me, 1, 3, e = makeVoretTextSlider("cl_radar_size"));\r
                        e.addValue(e, "96x96", "96 96");\r
                        e.addValue(e, "128x96", "128 96");\r
                        e.addValue(e, "128x128", "128 128");\r
-                       e.addValue(e, "192x144", "192 144");\r
+                       e.addValue(e, "160x128", "160 128");\r
+                       e.addValue(e, "160x160", "160 160");\r
+                       e.addValue(e, "192x160", "192 160");\r
                        e.addValue(e, "192x192", "192 192");\r
                        e.addValue(e, "256x192", "256 192");\r
                        e.addValue(e, "256x256", "256 256");\r
                        e.configureVoretTextSliderValues(e);\r
+                       setDependent(e, "cl_radar", 1, 2);\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
-               sl = makeVoretSlider(0.20, 1, 0.01, "cl_teamradar_background_alpha");\r
-               me.TD(me, 1, 0.8, e = makeVoretSliderCheckBox(-1, 1, sl, "Background:"));\r
-               me.TD(me, 1, 3, sl);\r
+               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Distance:"));\r
+                       setDependent(e, "cl_radar", 1, 2);\r
+               me.TD(me, 1, 3, e = makeVoretTextSlider("cl_radar_scale"));\r
+                       e.addValue(e, "512", "512");\r
+                       e.addValue(e, "1024", "1024");\r
+                       e.addValue(e, "2048", "2048");\r
+                       e.addValue(e, "4096", "4096");\r
+                       e.addValue(e, "8192", "8192");\r
+                       e.configureVoretTextSliderValues(e);\r
+                       setDependent(e, "cl_radar", 1, 2);\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Rotation:"));\r
+                       setDependent(e, "cl_radar", 1, 2);\r
+               me.TD(me, 1, 3, e = makeVoretTextSlider("cl_radar_rotation"));\r
+                       e.addValue(e, "Player", "0");\r
+                       e.addValue(e, "West", "1");\r
+                       e.addValue(e, "South", "2");\r
+                       e.addValue(e, "East", "3");\r
+                       e.addValue(e, "North", "4");\r
+                       e.configureVoretTextSliderValues(e);\r
+                       setDependent(e, "cl_radar", 1, 2);\r
        me.TR(me);\r
        me.TR(me);\r
                me.TD(me, 1, 4, makeVoretTextLabel(0, "Waypoint settings:"));\r