X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_multiplayer_playersetup.c;h=ef930b4e1490fe879c28ca7a83a191f191610777;hb=bd71e076bdb4066094634ee70e7cdce9b2fc4002;hp=6862705b78f32396757d98d72d0d41fd7103553f;hpb=2734bbf35415e405424df669e2288cbee7797a4e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
index 6862705b7..ef930b4e1 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
@@ -30,8 +30,8 @@ void XonoticPlayerSettingsTab_draw(entity me)
 }
 void XonoticPlayerSettingsTab_fill(entity me)
 {
-	entity e, pms, sl, label, e0, box;
-	float i, r, m, n;
+	entity e, pms, label, box;
+	float i;
 
 	me.TR(me);
 		me.TD(me, 1, 0.5, me.playerNameLabel = makeXonoticTextLabel(0, _("Name:")));
@@ -54,34 +54,38 @@ void XonoticPlayerSettingsTab_fill(entity me)
 	me.TR(me);
 	me.TR(me);
 	me.TR(me);
+
+	me.TR(me);
+		me.TDempty(me, 1);
+		me.TD(me, 1, 2, e = makeXonoticTextLabel(0.5, _("Model:")));
 	me.TR(me);
-	me.gotoRC(me, 8, 0.0);
+		me.TDempty(me, 1);
 		pms = makeXonoticPlayerModelSelector();
-		me.TD(me, 1, 0.6, e = makeXonoticTextLabel(1, _("Model:")));
 		me.TD(me, 1, 0.3, e = makeXonoticButton("<<", '0 0 0'));
 			e.onClick = PlayerModelSelector_Prev_Click;
 			e.onClickEntity = pms;
-		me.TD(me, me.rows - (me.currentRow + 3), 1.8, pms);
+		me.TD(me, me.rows - (me.currentRow + 2), 1.4, pms);
 		me.TD(me, 1, 0.3, e = makeXonoticButton(">>", '0 0 0'));
 			e.onClick = PlayerModelSelector_Next_Click;
 			e.onClickEntity = pms;
 	me.TR(me);
-		r = me.currentRow;
-		m = me.rows - (r + 4);
-		n = 16 - !cvar("developer");
-		m = m / (n - 1);
-		for(i = 0; i < n; ++i)
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0.5, _("Glowing color:")));
+		for(i = 0; i < 15; ++i)
 		{
-			me.gotoRC(me, r + i * m, 0.1);
-			me.TDNoMargin(me, m, 0.2, e = makeXonoticColorButton(1, 0, i), '0 1 0');
+			if(mod(i, 5) == 0)
+				me.TR(me);
+			me.TDNoMargin(me, 1, 0.2, e = makeXonoticColorButton(1, 0, i), '0 1 0');
 		}
-		for(i = 0; i < n; ++i)
+	me.TR(me);
+	me.TR(me);
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0.5, _("Detail color:")));
+		for(i = 0; i < 15; ++i)
 		{
-			me.gotoRC(me, r + i * m, 0.4);
-			me.TDNoMargin(me, m, 0.2, e = makeXonoticColorButton(2, 1, i), '0 1 0');
+			if(mod(i, 5) == 0)
+				me.TR(me);
+			me.TDNoMargin(me, 1, 0.2, e = makeXonoticColorButton(2, 1, i), '0 1 0');
 		}
 
-
 	// crosshair_enabled: 0 = no crosshair options, 1 = no crosshair selection, but everything else enabled, 2 = all crosshair options enabled
 	// FIXME: In the future, perhaps make one global crosshair_type cvar which has 0 for disabled, 1 for custom, 2 for per weapon, etc?
 	me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);