r3809 - in trunk/data: gfx qcsrc/client qcsrc/server

[DONOTREPLY at icculus.org]

Author: blub0
Date: 2008-07-10 12:34:18 -0400 (Thu, 10 Jul 2008)
New Revision: 3809

Modified:
   trunk/data/gfx/sb_kh_full.tga
   trunk/data/gfx/sb_kh_outline.tga
   trunk/data/qcsrc/client/Main.qc
   trunk/data/qcsrc/client/View.qc
   trunk/data/qcsrc/server/g_world.qc
Log:
A lil fix to the mapvoting code, an update to the KH HUD by victim,
and moved the sbar_columns_set cmd to PostInit


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

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

Modified: trunk/data/qcsrc/client/Main.qc
===================================================================
--- trunk/data/qcsrc/client/Main.qc	2008-07-10 08:11:06 UTC (rev 3808)
+++ trunk/data/qcsrc/client/Main.qc	2008-07-10 16:34:18 UTC (rev 3809)
@@ -45,8 +45,6 @@
 	for(i = 0; i < MAX_SBAR_FIELDS; ++i)
 		sbar_title[i] = strzone("(null)");
 
-	localcmd(strcat("\nsbar_columns_set ", cvar_string("sbar_columns"), ";\n"));
-
 	postinit = false;
 }
 
@@ -63,6 +61,8 @@
 		bufstr_set(databuf, DATABUF_CAPTURES + i, "0");
 		bufstr_set(databuf, DATABUF_RETURNS + i, "0");
 	}
+	
+	localcmd(strcat("\nsbar_columns_set ", cvar_string("sbar_columns"), ";\n"));
 
 	postinit = true;
 }

Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc	2008-07-10 08:11:06 UTC (rev 3808)
+++ trunk/data/qcsrc/client/View.qc	2008-07-10 16:34:18 UTC (rev 3809)
@@ -134,7 +134,7 @@
 	yellow = '1 1 0';
 	pink = '1 0 1';
 
-	kh_size = '47 110';
+	kh_size = '0 0';  // don't resize the image
 
 	kh_carrying = "gfx/sb_kh_full";
 	kh_outline = "gfx/sb_kh_outline";

Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2008-07-10 08:11:06 UTC (rev 3808)
+++ trunk/data/qcsrc/server/g_world.qc	2008-07-10 16:34:18 UTC (rev 3809)
@@ -2021,7 +2021,7 @@
 		nmax = min(MAPVOTE_COUNT - 1, cvar("g_maplist_votable"));
 	else
 		nmax = min(MAPVOTE_COUNT, cvar("g_maplist_votable"));
-	smax = min(nmax, cvar("g_maplist_votable_suggestions"));
+	smax = min3(nmax, cvar("g_maplist_votable_suggestions"), mapvote_suggestion_ptr);
 
 	for(i = 0; i < 100 && mapvote_count < smax; ++i)
 		MapVote_AddVotable(mapvote_suggestions[ceil(random() * mapvote_suggestion_ptr) - 1], TRUE);