r4697 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-10 04:57:11 -0400 (Fri, 10 Oct 2008)
New Revision: 4697

Modified:
   trunk/data/qcsrc/server/miscfunctions.qc
   trunk/data/qcsrc/server/w_minstanex.qc
Log:
don't kill impressive that easily :P


Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2008-10-10 08:36:48 UTC (rev 4696)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2008-10-10 08:57:11 UTC (rev 4697)
@@ -963,14 +963,16 @@
 }
 
 .float announcetime;
-void announce(entity player, string msg)
+float announce(entity player, string msg)
 {
 	if(time > player.announcetime)
 	if(clienttype(player) == CLIENTTYPE_REAL)
 	{
 		player.announcetime = time + 0.3;
 		play2(player, msg);
+		return TRUE;
 	}
+	return FALSE;
 }
 
 void play2team(float t, string filename)

Modified: trunk/data/qcsrc/server/w_minstanex.qc
===================================================================
--- trunk/data/qcsrc/server/w_minstanex.qc	2008-10-10 08:36:48 UTC (rev 4696)
+++ trunk/data/qcsrc/server/w_minstanex.qc	2008-10-10 08:57:11 UTC (rev 4697)
@@ -21,12 +21,12 @@
 	{
 		if(yoda && flying)
 			announce(self, "announcer/male/yoda.ogg");
-		else if(headshot)
+		if(headshot)
 			announce(self, "announcer/male/headshot.ogg");
-		else if(damage_goodhits && self.minstanex_lasthit)
+		if(damage_goodhits && self.minstanex_lasthit)
 		{
-			announce(self, "announcer/male/impressive.ogg");
-			damage_goodhits = 0; // only every second time
+			if(announce(self, "announcer/male/impressive.ogg"))
+				damage_goodhits = 0; // only every second time
 		}
 	}