From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 19 Jul 2011 12:18:19 +0000 (+0300)
Subject: Add menu selectors for all crosshairs
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8c79ba38d44926e2778e48fa84a0df4267abf23c;p=voretournament%2Fvoretournament.git

Add menu selectors for all crosshairs
---

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
index 089e3ef0..056260e9 100644
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
@@ -5,9 +5,9 @@ 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.7)
+	ATTRIB(VoretWeaponsDialog, intendedWidth, float, 1)
 	ATTRIB(VoretWeaponsDialog, rows, float, 20)
-	ATTRIB(VoretWeaponsDialog, columns, float, 4)
+	ATTRIB(VoretWeaponsDialog, columns, float, 8)
 	ATTRIB(VoretWeaponsDialog, weaponsList, entity, NULL)
 ENDCLASS(VoretWeaponsDialog)
 #endif
@@ -51,7 +51,7 @@ void fillVoretWeaponsDialog(entity me)
 	me.TD(me, 1, 3, makeVoretTextLabel(0, "Weapon crosshair settings:"));
 	me.TR(me);
 		me.TDempty(me, 0.3);
-		me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Crosshair:"));
+		me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Unarmed style:"));
 		for(i = 1; i <= 10; ++i) {
 			me.TDNoMargin(me, 1, 2.5 / 10, e = makeVoretCrosshairButton(3, i, "crosshair"), '1 1 0');
 		}
@@ -61,6 +61,31 @@ void fillVoretWeaponsDialog(entity me)
 		for(i = 11; i <= 20; ++i) {
 			me.TDNoMargin(me, 1, 2.5 / 10, e = makeVoretCrosshairButton(3, i, "crosshair"), '1 1 0');
 		}
+	me.TR(me);
+		me.TDempty(me, 0.3);
+		me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Primary style:"));
+		for(i = 1; i <= 10; ++i) {
+			me.TDNoMargin(me, 1, 2.5 / 10, e = makeVoretCrosshairButton(3, i, "crosshair_primary"), '1 1 0');
+		}
+	me.TR(me);
+		me.TDempty(me, 0.3);
+		me.TDempty(me, 1);
+		for(i = 11; i <= 20; ++i) {
+			me.TDNoMargin(me, 1, 2.5 / 10, e = makeVoretCrosshairButton(3, i, "crosshair_primary"), '1 1 0');
+		}
+	me.TR(me);
+		me.TDempty(me, 0.3);
+		me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Secondary style:"));
+		for(i = 1; i <= 10; ++i) {
+			me.TDNoMargin(me, 1, 2.5 / 10, e = makeVoretCrosshairButton(3, i, "crosshair_secondary"), '1 1 0');
+		}
+	me.TR(me);
+		me.TDempty(me, 0.3);
+		me.TDempty(me, 1);
+		for(i = 11; i <= 20; ++i) {
+			me.TDNoMargin(me, 1, 2.5 / 10, e = makeVoretCrosshairButton(3, i, "crosshair_secondary"), '1 1 0');
+		}
+	me.TR(me);
 	me.TR(me);
 		me.TDempty(me, 0.3);
 		me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Size:"));
@@ -90,7 +115,9 @@ void fillVoretWeaponsDialog(entity me)
 	me.TR(me);
 		me.TDempty(me, 0.6);
 		me.TD(me, 1, 2, e = makeVoretCheckBox(0, "crosshair_color_by_health", "Colorize by health"));
-	me.TR(me);
+
+	me.gotoRC(me, 0, 4); me.setFirstColumn(me, me.currentColumn);
+	me.TD(me, 1, 3, makeVoretTextLabel(0, "Crosshair effects:"));
 	me.TR(me);
 		me.TDempty(me, 0.3);
 		me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Hit test:"));