r5284 - in trunk/data: gfx qcsrc/menu/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-12-22 11:47:23 -0500 (Mon, 22 Dec 2008)
New Revision: 5284

Added:
   trunk/data/gfx/crosshair13.tga
   trunk/data/gfx/crosshair14.tga
   trunk/data/gfx/crosshair15.tga
   trunk/data/gfx/crosshair16.tga
   trunk/data/gfx/crosshair17.tga
   trunk/data/gfx/crosshair18.tga
   trunk/data/gfx/crosshair19.tga
Modified:
   trunk/data/gfx/crosshair7.tga
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c
Log:
new crosshairs by mikeeusa as posted on the NN forum, but fixtrans'd ;)
crosshair19 isn't in the menu as it doesn't make a good preview anyway, use "crosshair 19" to load it


Added: trunk/data/gfx/crosshair13.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/crosshair13.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/crosshair14.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/crosshair14.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/crosshair15.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/crosshair15.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/crosshair16.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/crosshair16.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/crosshair17.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/crosshair17.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/crosshair18.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/crosshair18.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/crosshair19.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/crosshair19.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/gfx/crosshair7.tga
===================================================================
(Binary files differ)

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c	2008-12-22 15:56:42 UTC (rev 5283)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c	2008-12-22 16:47:23 UTC (rev 5284)
@@ -92,10 +92,13 @@
 	me.TR(me);
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Crosshair:"));
-		n = 12;
-		for(i = 1; i <= n; ++i)
-			me.TDNoMargin(me, 1, 2 / n, e = makeNexuizCrosshairButton(3, i), '0 0 0');
+		for(i = 1; i <= 9; ++i)
+			me.TDNoMargin(me, 1, 2 / 9, e = makeNexuizCrosshairButton(3, i), '0 0 0');
 	me.TR(me);
+		me.TDempty(me, 1);
+		for(i = 10; i <= 18; ++i)
+			me.TDNoMargin(me, 1, 2 / 9, e = makeNexuizCrosshairButton(3, i), '0 0 0');
+	me.TR(me);
 		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Crosshair Size:"));
 		me.TD(me, 1, 2, e = makeNexuizSlider(0.40, 2, 0.05, "crosshair_size"));
 	me.TR(me);
@@ -111,6 +114,8 @@
 		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Crosshair Blue:"));
 		me.TD(me, 1, 2, e = makeNexuizSlider(0, 1, 0.01, "crosshair_color_blue"));
 	me.TR(me);
+	/*
+	 * not supported by the current csqc code
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "HUD size:"));
 		me.TD(me, 1, 2, e = makeNexuizTextSlider("viewsize"));
@@ -118,6 +123,7 @@
 			e.addValue(e, "Reduced", "110");
 			e.addValue(e, "Full", "100");
 			e.configureNexuizTextSliderValues(e);
+	*/
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 2.8, e = makeNexuizCheckBox(1, "sbar_hudselector", "Use old-style HUD layout"));