[nexuiz-commits] r7387 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: mand1nga
Date: 2009-08-08 00:34:44 -0400 (Sat, 08 Aug 2009)
New Revision: 7387

Modified:
   trunk/data/qcsrc/server/mode_onslaught.qc
Log:
Better fix

Modified: trunk/data/qcsrc/server/mode_onslaught.qc
===================================================================
--- trunk/data/qcsrc/server/mode_onslaught.qc	2009-08-08 04:10:17 UTC (rev 7386)
+++ trunk/data/qcsrc/server/mode_onslaught.qc	2009-08-08 04:34:44 UTC (rev 7387)
@@ -1015,33 +1015,32 @@
 			}
 		return;
 	}
-	if (time > self.pain_finished)
-		if (attacker.classname == "player")
+
+	if (attacker.classname == "player")
+	{
+		if(self.team == COLOR_TEAM1)
 		{
-			if(self.team == COLOR_TEAM1)
+			if(time - ons_notification_time_team1 > 10)
 			{
-				if(time - ons_notification_time_team1 > 10)
-				{
-					nag = TRUE;
-					ons_notification_time_team1 = time;
-				}
+				nag = TRUE;
+				ons_notification_time_team1 = time;
 			}
-			else if(self.team == COLOR_TEAM2)
+		}
+		else if(self.team == COLOR_TEAM2)
+		{
+			if(time - ons_notification_time_team2 > 10)
 			{
-				if(time - ons_notification_time_team2 > 10)
-				{
-					nag = TRUE;
-					ons_notification_time_team2 = time;
-				}
-			}
-			else
 				nag = TRUE;
+				ons_notification_time_team2 = time;
+			}
+		}
+		else
+			nag = TRUE;
 
-			if(nag)
-				play2team(self.team, "onslaught/controlpoint_underattack.wav");
+		if(nag)
+			play2team(self.team, "onslaught/controlpoint_underattack.wav");
+	}
 
-			self.pain_finished = time + 10;
-		}
 	self.health = self.health - damage;
 	if(self.owner.iscaptured)
 		WaypointSprite_UpdateHealth(self.owner.sprite, self.health);