r1793 - branches/nexuiz-2.0/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: kadaverjack
Date: 2006-07-30 18:34:14 -0400 (Sun, 30 Jul 2006)
New Revision: 1793

Modified:
   branches/nexuiz-2.0/data/qcsrc/server/clientcommands.qc
   branches/nexuiz-2.0/data/qcsrc/server/t_jumppads.qc
Log:
merged ctf spector fix & jumppad sound fix


Modified: branches/nexuiz-2.0/data/qcsrc/server/clientcommands.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/clientcommands.qc	2006-07-30 22:32:19 UTC (rev 1792)
+++ branches/nexuiz-2.0/data/qcsrc/server/clientcommands.qc	2006-07-30 22:34:14 UTC (rev 1793)
@@ -1,5 +1,6 @@
 void ReadyCount();
 float ValidateMap(string vote);
+void(entity e) DropFlag;
 
 void Say(entity source, float teamsay, string msgin)
 {
@@ -302,6 +303,8 @@
 		if(cvar("g_lms") || cvar("g_arena"))
 			return; // don't allow spectating in lms, unless player runs out of lives
 		if(self.classname == "player" && cvar("sv_spectate") == 1) {
+			if(self.flagcarried)
+				DropFlag(self.flagcarried);
 			DistributeFragsAmongTeam(self, self.team, 1.0);
 			self.classname = "observer";
 			PutClientInServer();

Modified: branches/nexuiz-2.0/data/qcsrc/server/t_jumppads.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/t_jumppads.qc	2006-07-30 22:32:19 UTC (rev 1792)
+++ branches/nexuiz-2.0/data/qcsrc/server/t_jumppads.qc	2006-07-30 22:34:14 UTC (rev 1793)
@@ -37,7 +37,11 @@
 	{
 		local float i;
 		local float found;
-		sound (other, CHAN_ITEM, "misc/jumppad.ogg", 1, ATTN_NORM);
+		if(self.pushltime < time)  // prevent "snorring" sound when a player hits the jumppad more than once
+		{
+			sound (other, CHAN_ITEM, "misc/jumppad.ogg", 1, ATTN_NORM);
+			self.pushltime = time + 0.5;
+		}
 		found = FALSE;
 		for(i = 0; i < other.jumppadcount && i < NUM_JUMPPADSUSED; ++i)
 			if(other.(jumppadsused[i]) == self)