[nexuiz-commits] r6376 - trunk/data/qcsrc/menu/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-30 08:59:37 -0400 (Mon, 30 Mar 2009)
New Revision: 6376

Modified:
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c
Log:
fix the last commit. Now the feature is ready..


Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c	2009-03-30 12:42:50 UTC (rev 6375)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c	2009-03-30 12:59:37 UTC (rev 6376)
@@ -30,8 +30,8 @@
 }
 void fillNexuizPlayerSettingsTab(entity me)
 {
-	entity e, pms, sl, e0, label, e0, box;
-	float i, n;
+	entity e, pms, sl, label, e0, box;
+	float i, r, m, n;
 
 	me.TR(me);
 		me.TD(me, 1, 0.5, me.playerNameLabel = makeNexuizTextLabel(0, "Name:"));
@@ -54,8 +54,9 @@
 	me.TR(me);
 	me.TR(me);
 	me.TR(me);
+	me.gotoRC(me, 8, 0.0);
 		pms = makeNexuizPlayerModelSelector();
-		me.TDempty(me, 0.6);
+		me.TD(me, 1, 0.6, e = makeNexuizTextLabel(1, "Model:"));
 		me.TD(me, 1, 0.3, e = makeNexuizButton("<<", '0 0 0'));
 			e.onClick = PlayerModelSelector_Prev_Click;
 			e.onClickEntity = pms;
@@ -63,22 +64,20 @@
 		me.TD(me, 1, 0.3, e = makeNexuizButton(">>", '0 0 0'));
 			e.onClick = PlayerModelSelector_Next_Click;
 			e.onClickEntity = pms;
-	me.gotoRC(me, 8, 0.0);
-		me.TD(me, 1, 0.4, e = makeNexuizTextLabel(1, "Model:"));
-	me.gotoRC(me, 9, 0.1); me.setFirstColumn(me, me.currentColumn);
+	me.TR(me);
+		r = me.currentRow;
+		m = me.rows - r - 2;
 		n = 16 - !cvar("developer");
+		m = m / (n - 1);
 		for(i = 0; i < n; ++i)
 		{
-			me.gotoRC(me, 8 + i * 0.75, 0.1);
-			me.TR(me);
-				me.TDNoMargin(me, 1, (2 / n) + 0.05, e = makeNexuizColorButton(1, 0, i), '1 0 0');
+			me.gotoRC(me, r + i * m, 0.1);
+			me.TDNoMargin(me, m, 0.2, e = makeNexuizColorButton(1, 0, i), '0 1 0');
 		}
-	me.gotoRC(me, 9, 0.3); me.setFirstColumn(me, me.currentColumn);
 		for(i = 0; i < n; ++i)
 		{
-			me.gotoRC(me, 8 + i * 0.75, 0.4);
-			me.TR(me);
-				me.TDNoMargin(me, 1, (2 / n) + 0.05, e = makeNexuizColorButton(2, 1, i), '1 0 0');
+			me.gotoRC(me, r + i * m, 0.4);
+			me.TDNoMargin(me, m, 0.2, e = makeNexuizColorButton(2, 1, i), '0 1 0');
 		}
 
 	me.gotoRC(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn);
@@ -116,13 +115,13 @@
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Crosshair:"));
 		for(i = 1; i <= 10; ++i) {
-			me.TDNoMargin(me, 1, 2 / 10, e = makeNexuizCrosshairButton(3, i), '0 0 0');
+			me.TDNoMargin(me, 1, 2 / 10, e = makeNexuizCrosshairButton(3, i), '1 1 0');
 			setDependent(e, "crosshair_per_weapon", 0, 0);
 		}
 	me.TR(me);
 		me.TDempty(me, 1);
 		for(i = 11; i <= 20; ++i) {
-			me.TDNoMargin(me, 1, 2 / 10, e = makeNexuizCrosshairButton(3, i), '0 0 0');
+			me.TDNoMargin(me, 1, 2 / 10, e = makeNexuizCrosshairButton(3, i), '1 1 0');
 			setDependent(e, "crosshair_per_weapon", 0, 0);
 		}
 	me.TR(me);