r6077 - in trunk/data/qcsrc: client menu/nexuiz server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-07 17:06:34 -0500 (Sat, 07 Mar 2009)
New Revision: 6077

Modified:
   trunk/data/qcsrc/client/mapvoting.qc
   trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c
   trunk/data/qcsrc/server/g_world.qc
Log:
fix mapvote "keeptwo" feature (wasn't display disappearing maps)


Modified: trunk/data/qcsrc/client/mapvoting.qc
===================================================================
--- trunk/data/qcsrc/client/mapvoting.qc	2009-03-07 17:16:09 UTC (rev 6076)
+++ trunk/data/qcsrc/client/mapvoting.qc	2009-03-07 22:06:34 UTC (rev 6077)
@@ -266,6 +266,8 @@
 	float i, power;
 	string map, pk3, ssdir;
 
+	precache_sound ("misc/invshot.wav");
+
 	registercmd("+showscores");
 	registercmd("-showscores");
 
@@ -323,10 +325,23 @@
 
 void MapVote_UpdateMask()
 {
+	float i, power;
+	float oldmask;
+
+	oldmask = mv_maps_mask;
 	if(mv_num_maps <= 8)
 		mv_maps_mask = ReadByte();
 	else
 		mv_maps_mask = ReadShort();
+
+	if(oldmask & mv_maps_mask != oldmask)
+		if(oldmask & mv_maps_mask == mv_maps_mask)
+			 sound(world, CHAN_AUTO, "misc_invshot.wav", VOL_BASE, ATTN_NONE);
+
+	// remove votes that no longer apply
+	for(i = 0, power = 1; i < mv_num_maps; ++i, power *= 2)
+		if not(mv_maps_mask & power)
+			mv_votes[i] = -1;
 }
 
 void MapVote_UpdateVotes()

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c	2009-03-07 17:16:09 UTC (rev 6076)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c	2009-03-07 22:06:34 UTC (rev 6077)
@@ -43,6 +43,7 @@
 		me.TDempty(me, 0.2);
 		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_worldchannel0volume");
 		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Info:"));
+		makeMulti(s, "snd_csqcchannel0volume");
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "volume", "0");
 		setDependentStringNotEqual(s, "volume", "0");

Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2009-03-07 17:16:09 UTC (rev 6076)
+++ trunk/data/qcsrc/server/g_world.qc	2009-03-07 22:06:34 UTC (rev 6077)
@@ -2112,6 +2112,9 @@
 	string mapfile, pakfile;
 	float i, o;
 
+	if(sf & 1)
+		sf &~= 2; // if we send 1, we don't need to also send 2
+
 	WriteByte(MSG_ENTITY, ENT_CLIENT_MAPVOTE);
 	WriteByte(MSG_ENTITY, sf);
 
@@ -2335,10 +2338,6 @@
 			}
 		}
 
-		// notify about keep-two
-		if(keeptwo != 0 && mapvote_keeptwotime == 0)
-			play2(other, "misc/invshot.wav");
-
 		// clear possibly invalid votes
 		if(mapvote_maps[other.mapvote - 1] == "")
 			other.mapvote = 0;