From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 9 Jul 2011 12:03:33 +0000 (+0300)
Subject: Adapt the HUD menu to the new shownames
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=df1443886fdf2fba0adcbae71a3608fe0a01d302

Adapt the HUD menu to the new shownames
---

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 9b32b871..5890e75c 100644
--- 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"
 seta hud_shownames_status 2 "1 = show when the team mate can be healed, 2 = also show health, 3 = also show armor"
 seta hud_shownames_aspect 8 "aspect ratio of total drawing area per name"
-seta hud_shownames_fontsize 12 "font size"
+seta hud_shownames_fontsize 8 "font size"
 seta hud_shownames_decolorize 1 "1 = decolorize name in team games, 2 = decolorize always"
 seta hud_shownames_alpha 0.7 "alpha"
 seta hud_shownames_resize 1 "enable resizing of the names, then the size cvars will correspond to the maximum size"
diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
index 9d1aca64..b52906d2 100644
--- 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))
 	ATTRIB(VoretHudDialog, title, string, "Radar, HUD & Waypoints")
 	ATTRIB(VoretHudDialog, color, vector, SKINCOLOR_DIALOG_HUD)
-	ATTRIB(VoretHudDialog, intendedWidth, float, 0.7)
-	ATTRIB(VoretHudDialog, rows, float, 24)
-	ATTRIB(VoretHudDialog, columns, float, 4)
+	ATTRIB(VoretHudDialog, intendedWidth, float, 1)
+	ATTRIB(VoretHudDialog, rows, float, 19)
+	ATTRIB(VoretHudDialog, columns, float, 8)
 ENDCLASS(VoretHudDialog)
 #endif
 
@@ -29,10 +29,11 @@ void fillVoretHudDialog(entity me)
 		me.TDempty(me, 0.2);
 		sl = makeVoretSlider(0.1, 1, 0.05, "hud_damage");
 		me.TD(me, 1, 0.8, e = makeVoretSliderCheckBox(0, 1, sl, "Splashes:"));
-		me.TD(me, 1, 1.5, sl);
+		me.TD(me, 1, 3, sl);
 		makeMulti(e, "hud_stomach");
 		makeMulti(sl, "hud_stomach");
-		me.TDempty(me, 0.4);
+	me.TR(me);
+		me.TDempty(me, 0.2);
 		me.TD(me, 1, 0.5, e = makeVoretCheckBoxEx(0.25, 0, "cl_flash_pickup", "Pickup flashes"));
 	me.TR(me);
 		me.TDempty(me, 0.2);
@@ -101,7 +102,8 @@ void fillVoretHudDialog(entity me)
 		me.TD(me, 1, 0.8, e = makeVoretSliderCheckBox(-1, 1, sl, "Background:"));
 		me.TD(me, 1, 3, sl);
 	me.TR(me);
-	me.TR(me);
+
+	me.gotoRC(me, 0, 4); me.setFirstColumn(me, me.currentColumn);
 		me.TD(me, 1, 4, makeVoretTextLabel(0, "Waypoint settings:"));
 	me.TR(me);
 		me.TDempty(me, 0.2);
@@ -116,14 +118,40 @@ void fillVoretHudDialog(entity me)
 		me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Waypoint alpha:"));
 			me.TD(me, 1, 3, e = makeVoretSlider(0.1, 1, 0.01, "g_waypointsprite_alpha"));
 				setDependent(e, "cl_hidewaypoints", 0, 0);
+	me.TR(me);
+	me.TR(me);
+		me.TD(me, 1, 4, makeVoretTextLabel(0, "Name settings:"));
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Show names:"));
-		me.TD(me, 1, 3, e = makeVoretTextSlider("cl_shownames"));
-			e.addValue(e, "Never", "0");
+		me.TD(me, 1, 3, e = makeVoretTextSlider("hud_shownames"));
+			e.addValue(e, "Disabled", "0");
 			e.addValue(e, "Teammates", "1");
 			e.addValue(e, "All players", "2");
 			e.configureVoretTextSliderValues(e);
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Team status:"));
+			setDependent(e, "hud_shownames", 1, 2);
+		me.TD(me, 1, 3, e = makeVoretTextSlider("hud_shownames_status"));
+			e.addValue(e, "Disabled", "0");
+			e.addValue(e, "Heal", "1");
+			e.addValue(e, "Heal & health", "2");
+			e.addValue(e, "Heal, health & armor", "3");
+			e.configureVoretTextSliderValues(e);
+			setDependent(e, "hud_shownames", 1, 2);
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Scale:"));
+			setDependent(e, "hud_shownames", 1, 2);
+		me.TD(me, 1, 3, e = makeVoretSlider(6, 24, 1, "hud_shownames_fontsize"));
+			setDependent(e, "hud_shownames", 1, 2);
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Alpha:"));
+			setDependent(e, "hud_shownames", 1, 2);
+		me.TD(me, 1, 3, e = makeVoretSlider(0, 1, 0.01, "hud_shownames_alpha"));
+			setDependent(e, "hud_shownames", 1, 2);
 	me.gotoRC(me, me.rows - 1, 0);
 		me.TD(me, 1, me.columns, e = makeVoretButton("OK", '0 0 0'));
 			e.onClick = Dialog_Close;