r5701 - trunk/data/qcsrc/menu/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-31 04:48:43 -0500 (Sat, 31 Jan 2009)
New Revision: 5701

Modified:
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_join_serverinfo.c
   trunk/data/qcsrc/menu/nexuiz/playerlist.c
Log:
terencehill's score column after a cleanup


Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_join_serverinfo.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_join_serverinfo.c	2009-01-31 02:26:39 UTC (rev 5700)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_join_serverinfo.c	2009-01-31 09:48:43 UTC (rev 5701)
@@ -123,7 +123,7 @@
 			me.cnameLabel = e;
 
 	me.TR(me);
-		me.TD(me, 1, 6, e = makeNexuizTextLabel(0, "Players:"));
+		me.TD(me, 1, 5.5, e = makeNexuizTextLabel(0, "Players:"));
 	me.TR(me);
 		me.TD(me, me.rows - 4, 5.5, e = makeNexuizPlayerList());
 			me.rawPlayerList = e;

Modified: trunk/data/qcsrc/menu/nexuiz/playerlist.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/playerlist.c	2009-01-31 02:26:39 UTC (rev 5700)
+++ trunk/data/qcsrc/menu/nexuiz/playerlist.c	2009-01-31 09:48:43 UTC (rev 5701)
@@ -6,6 +6,8 @@
 	ATTRIB(NexuizPlayerList, realFontSize, vector, '0 0 0')
 	ATTRIB(NexuizPlayerList, columnNameOrigin, float, 0)
 	ATTRIB(NexuizPlayerList, columnNameSize, float, 0)
+	ATTRIB(NexuizPlayerList, columnScoreOrigin, float, 0)
+	ATTRIB(NexuizPlayerList, columnScoreSize, float, 0)
 	ATTRIB(NexuizPlayerList, realUpperMargin, float, 0)
 	ATTRIB(NexuizPlayerList, origin, vector, '0 0 0')
 	ATTRIB(NexuizPlayerList, itemAbsSize, vector, '0 0 0')
@@ -84,13 +86,18 @@
 	me.realFontSize_x = me.fontSize / (me.itemAbsSize_x = (absSize_x * (1 - me.controlWidth)));
 	me.realUpperMargin = 0.5 * (1 - me.realFontSize_y);
 
+	// this list does 1 char left and right margin
+	me.columnScoreSize = 3 * me.realFontSize_x;
+	me.columnNameSize = 1 - 3 * me.realFontSize_x - me.columnScoreSize;
+
 	me.columnNameOrigin = me.realFontSize_x;
-	me.columnNameSize = 1 - 2 * me.realFontSize_x;
+	me.columnScoreOrigin = me.columnNameOrigin + me.columnNameSize + me.realFontSize_x;
 }
 
 void drawListBoxItemNexuizPlayerList(entity me, float i, vector absSize, float isSelected)
 {
 	string s;
+	string score;
 	float t;
 	vector rgb;
 
@@ -107,13 +114,13 @@
 		rgb = '1 1 1';
 	
 	s = me.getPlayerList(me, i, PLAYERPARM_NAME);
+	score = me.getPlayerList(me, i, PLAYERPARM_SCORE);
 
-	if(rgb != '1 1 1')
-		s = strdecolorize(s);
+	s = draw_TextShortenToWidth(s, (me.columnNameSize / me.realFontSize_x), 1);
+	score = draw_TextShortenToWidth(score, me.columnScoreSize / me.realFontSize_x, 0);
 
-	s = draw_TextShortenToWidth(s, me.columnNameSize / me.realFontSize_x, rgb == '1 1 1');
-
-	draw_Text(me.realUpperMargin2 * eY + (me.columnNameOrigin + 0.00 * (me.columnNameSize - draw_TextWidth(s, 1) * me.realFontSize_x)) * eX, s, me.realFontSize, rgb, 1, rgb == '1 1 1');
+	draw_Text(me.realUpperMargin2 * eY + (me.columnNameOrigin + 0.00 * (me.columnNameSize - draw_TextWidth(s, 1) * me.realFontSize_x)) * eX, s, me.realFontSize, '1 1 1', 1, 1);
+	draw_Text(me.realUpperMargin2 * eY + (me.columnScoreOrigin + 1.00 * (me.columnScoreSize - draw_TextWidth(score, 1) * me.realFontSize_x)) * eX, score, me.realFontSize, rgb, 1, 0);
 }
 
 #endif