r3225 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-22 15:51:42 -0500 (Tue, 22 Jan 2008)
New Revision: 3225

Modified:
   trunk/data/qcsrc/server/mode_onslaught.qc
Log:
fix two minor bugs


Modified: trunk/data/qcsrc/server/mode_onslaught.qc
===================================================================
--- trunk/data/qcsrc/server/mode_onslaught.qc	2008-01-22 20:45:16 UTC (rev 3224)
+++ trunk/data/qcsrc/server/mode_onslaught.qc	2008-01-22 20:51:42 UTC (rev 3225)
@@ -320,7 +320,11 @@
 		if (attacker == self)
 			bprint(ColoredTeamName(self.team), " generator spontaneously exploded due to overtime!\n");
 		else
-			bprint(ColoredTeamName(self.team), " generator destroyed by ", ColoredTeamName(attacker.team), "!\n");
+		{
+			string t;
+			t = ColoredTeamName(attacker.team);
+			bprint(ColoredTeamName(self.team), " generator destroyed by ", t, "!\n");
+		}
 		self.iscaptured = FALSE;
 		self.islinked = FALSE;
 		self.isshielded = FALSE;
@@ -368,7 +372,7 @@
 	if(e.classname == "player")
 	{
 		a = onslaught_controlpoint_attackable(self.owner, e.team);
-		if(a == -1 || a == 1) // own point, or fire at it
+		if(self.owner.team == e.team || a == -1 || a == 1) // own point, or fire at it
 		{
 			if(self.owner.team == COLOR_TEAM1)
 				return ons_sprite_cp_red;