r5681 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-27 15:34:55 -0500 (Tue, 27 Jan 2009)
New Revision: 5681

Modified:
   trunk/data/qcsrc/client/Main.qc
   trunk/data/qcsrc/client/mapvoting.qc
Log:
fix mapvote bugs


Modified: trunk/data/qcsrc/client/Main.qc
===================================================================
--- trunk/data/qcsrc/client/Main.qc	2009-01-27 20:34:39 UTC (rev 5680)
+++ trunk/data/qcsrc/client/Main.qc	2009-01-27 20:34:55 UTC (rev 5681)
@@ -681,6 +681,7 @@
 	self.classname = "ent_client_init";
 
 	csqc_revision = ReadShort();
+
 	maxclients = ReadByte();
 	for(i = 0; i < 24; ++i)
 		weaponimpulse[i] = ReadByte() - 1;

Modified: trunk/data/qcsrc/client/mapvoting.qc
===================================================================
--- trunk/data/qcsrc/client/mapvoting.qc	2009-01-27 20:34:39 UTC (rev 5680)
+++ trunk/data/qcsrc/client/mapvoting.qc	2009-01-27 20:34:55 UTC (rev 5681)
@@ -1,5 +1,6 @@
 float mv_num_maps;
 
+float mv_active;
 string mv_maps[MAPVOTE_COUNT];
 string mv_pics[MAPVOTE_COUNT];
 string mv_pk3[MAPVOTE_COUNT];
@@ -117,6 +118,9 @@
 	float columns, rows;
 	float tsize;
 	vector dist;
+
+	if(!mv_active)
+		return;
 	
 	center = (vid_conwidth - 1)/2;
 	xmin = vid_conwidth*0.05; // 5% border must suffice
@@ -265,6 +269,8 @@
 	registercmd("+showscores");
 	registercmd("-showscores");
 
+	mv_active = 1;
+
 	ssdir = ReadString();
 	
 	mv_num_maps = min(MAPVOTE_COUNT, ReadByte());
@@ -346,6 +352,8 @@
 {
 	float sf;
 
+	sf = ReadByte();
+
 	if(sf & 1)
 		MapVote_Init();