From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 1 Mar 2011 16:55:01 +0000 (+0200)
Subject: Several menu tweaks
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=0c835e3c80a28967f15acacf4105dcf12494dd7f

Several menu tweaks
---

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c
index d59dc688..9d44a2ea 100644
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c
@@ -90,8 +90,8 @@ void fillVoretPlayerSettingsTab(entity me)
 		me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Field of View:"));
 		me.TD(me, 1, 2, e = makeVoretSlider(60, 130, 1, "fov"));
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Damage kick:"));
-		me.TD(me, 1, 2, e = makeVoretSlider(0, 0.5, 0.05, "v_kicktime"));
+		me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Velocity zoom:"));
+		me.TD(me, 1, 2, e = makeVoretSlider(-2, 2, 0.1, "cl_velocityzoom"));
 	me.TR(me);
 		sl = makeVoretSlider(0.45, 0.75, 0.05, "cl_bobcycle");
 		me.TD(me, 1, 1, e = makeVoretSliderCheckBox(0, 1, sl, "View bobbing:"));
@@ -102,9 +102,6 @@ void fillVoretPlayerSettingsTab(entity me)
 		sl = makeVoretSlider(0.5, 8, 0.5, "cl_rollangle");
 		me.TD(me, 1, 1, e = makeVoretSliderCheckBox(0, 1, sl, "View rolling:"));
 		me.TD(me, 1, 2, sl);
-	me.TR(me);
-		me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Velocity zoom:"));
-		me.TD(me, 1, 2, e = makeVoretSlider(-2, 2, 0.1, "cl_velocityzoom"));
 	me.TR(me);
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Zoom Factor:"));
@@ -114,10 +111,6 @@ void fillVoretPlayerSettingsTab(entity me)
 		me.TD(me, 1, 1, e = makeVoretSliderCheckBox(-1, 1, sl, "Zoom speed:"));
 		me.TD(me, 1, 2, sl);
 	me.TR(me);
-	me.TR(me);
-		me.TD(me, 1, 2.8, e = makeVoretCheckBox(0, "cl_artwork", "Intermission art & music"));
-		makeMulti(e, "cl_intermission");
-	me.TR(me);
 	me.TR(me);
 		me.TDempty(me, 0.4);
 		me.TD(me, 1, 2.2, e = makeVoretButton("Weapon & Crosshair settings...", '0 0 0'));
diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
index 24c7b564..d7bd9652 100644
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
@@ -6,7 +6,7 @@ CLASS(VoretHudDialog) EXTENDS(VoretDialog)
 	ATTRIB(VoretHudDialog, title, string, "Radar, HUD & Waypoints")
 	ATTRIB(VoretHudDialog, color, vector, SKINCOLOR_DIALOG_HUD)
 	ATTRIB(VoretHudDialog, intendedWidth, float, 0.7)
-	ATTRIB(VoretHudDialog, rows, float, 20)
+	ATTRIB(VoretHudDialog, rows, float, 24)
 	ATTRIB(VoretHudDialog, columns, float, 4)
 ENDCLASS(VoretHudDialog)
 #endif
@@ -23,6 +23,24 @@ string toStringVoretHudDialog(entity me)
 void fillVoretHudDialog(entity me)
 {
 	entity e, sl;
+	me.TR(me);
+		me.TD(me, 1, 4, makeVoretTextLabel(0, "Screen settings:"));
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		sl = makeVoretSlider(0.1, 1, 0.05, "hud_damage");
+		me.TD(me, 1, 2, e = makeVoretSliderCheckBox(0, 1, sl, "Splashes:"));
+		me.TD(me, 1, 3, sl);
+		makeMulti(e, "hud_stomach");
+		makeMulti(sl, "hud_stomach");
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 2, e = makeVoretCheckBox(0, "cl_reticle_item_normal", "Zoom reticles"));
+		makeMulti(e, "cl_reticle_item_weapon");
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 2, e = makeVoretCheckBox(0, "cl_artwork", "Intermission art & music"));
+		makeMulti(e, "cl_intermission");
+	me.TR(me);
 	me.TR(me);
 		me.TD(me, 1, 4, makeVoretTextLabel(0, "HUD settings:"));
 	me.TR(me);
@@ -63,11 +81,6 @@ void fillVoretHudDialog(entity me)
 		me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "0 0", "Top left"));
 		me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "0.5 0", "Top middle"));
 		me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "1 0", "Top right"));
-	me.TR(me);
-		me.TDempty(me, 1);
-		me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "0 0.5", "Middle left"));
-		me.TDempty(me, 1);
-		me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "1 0.5", "Middle right"));
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Size:"));
diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
index 66381b22..0db056ce 100644
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
@@ -85,7 +85,7 @@ void fillVoretWeaponsDialog(entity me)
 		me.TD(me, 1, 2.5, e = makeVoretSlider(0, 1, 0.01, "crosshair_color_blue"));
 		setDependent(e, "crosshair_color_by_health", 0, 0);
 	me.TR(me);
-		me.TDempty(me, 0.3);
+		me.TDempty(me, 0.6);
 		me.TD(me, 1, 2, e = makeVoretCheckBox(0, "crosshair_color_by_health", "Colorize by health"));
 	me.TR(me);
 	me.TR(me);