From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 1 Mar 2011 00:19:55 +0000 (+0200)
Subject: Add the new dim feature to the weapons menu, and also make some changes to that menu
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=1b13fc4b56984cfc3d7684a2d616d50dff75585e

Add the new dim feature to the weapons menu, and also make some changes to that menu
---

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
index 540cb596..66381b22 100644
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
@@ -5,8 +5,8 @@ CLASS(VoretWeaponsDialog) EXTENDS(VoretDialog)
 	METHOD(VoretWeaponsDialog, showNotify, void(entity))
 	ATTRIB(VoretWeaponsDialog, title, string, "Weapon & Crosshair settings")
 	ATTRIB(VoretWeaponsDialog, color, vector, SKINCOLOR_DIALOG_WEAPONS)
-	ATTRIB(VoretWeaponsDialog, intendedWidth, float, 0.5)
-	ATTRIB(VoretWeaponsDialog, rows, float, 19)
+	ATTRIB(VoretWeaponsDialog, intendedWidth, float, 0.7)
+	ATTRIB(VoretWeaponsDialog, rows, float, 20)
 	ATTRIB(VoretWeaponsDialog, columns, float, 4)
 	ATTRIB(VoretWeaponsDialog, weaponsList, entity, NULL)
 ENDCLASS(VoretWeaponsDialog)
@@ -23,7 +23,7 @@ string toStringVoretWeaponsDialog(entity me)
 }
 void fillVoretWeaponsDialog(entity me)
 {
-	entity e;
+	entity e, sl;
 	float i;
 
 	// Voretournament has one weapon by default, so disable the weapon priority list code
@@ -90,10 +90,17 @@ void fillVoretWeaponsDialog(entity me)
 	me.TR(me);
 	me.TR(me);
 		me.TDempty(me, 0.3);
-		me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Hit test:"));
+		me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Hit test:"));
 		me.TD(me, 1, 2.5/3, e = makeVoretRadioButton(2, "crosshair_hittest", "0",    "None"));
 		me.TD(me, 1, 2.5/3, e = makeVoretRadioButton(2, "crosshair_hittest", "1",    "TrueAim"));
 		me.TD(me, 1, 2.5/3, e = makeVoretRadioButton(2, "crosshair_hittest", "1.25", "Enemies"));
+	me.TR(me);
+		me.TDempty(me, 0.3);
+		sl = makeVoretSlider(0.1, 1, 0.05, "crosshair_unarmed_dim_color");
+		me.TD(me, 1, 1.25, e = makeVoretSliderCheckBox(0, 1, sl, "Dim when unarmed:"));
+		me.TD(me, 1, 2.5, sl);
+		makeMulti(e, "crosshair_unarmed_dim_alpha");
+		makeMulti(sl, "crosshair_unarmed_dim_alpha");
 	me.TR(me);
 		me.TDempty(me, 0.3);
 		me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.5, 0, "crosshair_pickup", "Crosshair pickup effect"));
@@ -105,7 +112,7 @@ void fillVoretWeaponsDialog(entity me)
 		me.TD(me, 1, 2, e = makeVoretCheckBox(0, "crosshair_swallowindicator", "Crosshair swallow indicator"));
 	me.TR(me);
 	me.TR(me);
-	me.TD(me, 1, 3, makeVoretTextLabel(0, "Weapon model & view settings:"));
+	me.TD(me, 1, 3, makeVoretTextLabel(0, "Weapon model settings:"));
 	me.TR(me);
 		me.TDempty(me, 0.3);
 		me.TD(me, 1, 3, e = makeVoretCheckBox(0, "r_drawviewmodel", "Draw 1st person weapon model"));