Adapt the HUD menu to the new shownames

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 9b32b871e9dcc43b1eacb90dc2fee0d9ff9e6d55..5890e75cf5b79ae24bfc7092c7eb2c4c62a144ca 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1151,7 +1151,7 @@ seta hud_contents_stomach_color "0.3 0.2 0"
 seta hud_shownames 2 "1 = draw names of nearby team mates, 2 = also draw names of nearby enemies"\r
 seta hud_shownames_status 2 "1 = show when the team mate can be healed, 2 = also show health, 3 = also show armor"\r
 seta hud_shownames_aspect 8 "aspect ratio of total drawing area per name"\r
-seta hud_shownames_fontsize 12 "font size"\r
+seta hud_shownames_fontsize 8 "font size"\r
 seta hud_shownames_decolorize 1 "1 = decolorize name in team games, 2 = decolorize always"\r
 seta hud_shownames_alpha 0.7 "alpha"\r
 seta hud_shownames_resize 1 "enable resizing of the names, then the size cvars will correspond to the maximum size"\r

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
index 9d1aca645b7d20ffc408353ab4db7dee4302a725..b52906d20bd9815440edcc6b1b5bb3a7274e82fc 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
@@ -5,9 +5,9 @@ CLASS(VoretHudDialog) EXTENDS(VoretDialog)
        METHOD(VoretHudDialog, showNotify, void(entity))\r
        ATTRIB(VoretHudDialog, title, string, "Radar, HUD & Waypoints")\r
        ATTRIB(VoretHudDialog, color, vector, SKINCOLOR_DIALOG_HUD)\r
-       ATTRIB(VoretHudDialog, intendedWidth, float, 0.7)\r
-       ATTRIB(VoretHudDialog, rows, float, 24)\r
-       ATTRIB(VoretHudDialog, columns, float, 4)\r
+       ATTRIB(VoretHudDialog, intendedWidth, float, 1)\r
+       ATTRIB(VoretHudDialog, rows, float, 19)\r
+       ATTRIB(VoretHudDialog, columns, float, 8)\r
 ENDCLASS(VoretHudDialog)\r
 #endif\r
 \r
@@ -29,10 +29,11 @@ void fillVoretHudDialog(entity me)
                me.TDempty(me, 0.2);\r
                sl = makeVoretSlider(0.1, 1, 0.05, "hud_damage");\r
                me.TD(me, 1, 0.8, e = makeVoretSliderCheckBox(0, 1, sl, "Splashes:"));\r
-               me.TD(me, 1, 1.5, sl);\r
+               me.TD(me, 1, 3, sl);\r
                makeMulti(e, "hud_stomach");\r
                makeMulti(sl, "hud_stomach");\r
-               me.TDempty(me, 0.4);\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
                me.TD(me, 1, 0.5, e = makeVoretCheckBoxEx(0.25, 0, "cl_flash_pickup", "Pickup flashes"));\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
@@ -101,7 +102,8 @@ void fillVoretHudDialog(entity me)
                me.TD(me, 1, 0.8, e = makeVoretSliderCheckBox(-1, 1, sl, "Background:"));\r
                me.TD(me, 1, 3, sl);\r
        me.TR(me);\r
-       me.TR(me);\r
+\r
+       me.gotoRC(me, 0, 4); me.setFirstColumn(me, me.currentColumn);\r
                me.TD(me, 1, 4, makeVoretTextLabel(0, "Waypoint settings:"));\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
@@ -116,14 +118,40 @@ void fillVoretHudDialog(entity me)
                me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Waypoint alpha:"));\r
                        me.TD(me, 1, 3, e = makeVoretSlider(0.1, 1, 0.01, "g_waypointsprite_alpha"));\r
                                setDependent(e, "cl_hidewaypoints", 0, 0);\r
+       me.TR(me);\r
+       me.TR(me);\r
+               me.TD(me, 1, 4, makeVoretTextLabel(0, "Name settings:"));\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
                me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Show names:"));\r
-               me.TD(me, 1, 3, e = makeVoretTextSlider("cl_shownames"));\r
-                       e.addValue(e, "Never", "0");\r
+               me.TD(me, 1, 3, e = makeVoretTextSlider("hud_shownames"));\r
+                       e.addValue(e, "Disabled", "0");\r
                        e.addValue(e, "Teammates", "1");\r
                        e.addValue(e, "All players", "2");\r
                        e.configureVoretTextSliderValues(e);\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Team status:"));\r
+                       setDependent(e, "hud_shownames", 1, 2);\r
+               me.TD(me, 1, 3, e = makeVoretTextSlider("hud_shownames_status"));\r
+                       e.addValue(e, "Disabled", "0");\r
+                       e.addValue(e, "Heal", "1");\r
+                       e.addValue(e, "Heal & health", "2");\r
+                       e.addValue(e, "Heal, health & armor", "3");\r
+                       e.configureVoretTextSliderValues(e);\r
+                       setDependent(e, "hud_shownames", 1, 2);\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Scale:"));\r
+                       setDependent(e, "hud_shownames", 1, 2);\r
+               me.TD(me, 1, 3, e = makeVoretSlider(6, 24, 1, "hud_shownames_fontsize"));\r
+                       setDependent(e, "hud_shownames", 1, 2);\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Alpha:"));\r
+                       setDependent(e, "hud_shownames", 1, 2);\r
+               me.TD(me, 1, 3, e = makeVoretSlider(0, 1, 0.01, "hud_shownames_alpha"));\r
+                       setDependent(e, "hud_shownames", 1, 2);\r
        me.gotoRC(me, me.rows - 1, 0);\r
                me.TD(me, 1, me.columns, e = makeVoretButton("OK", '0 0 0'));\r
                        e.onClick = Dialog_Close;\r