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

[DONOTREPLY at icculus.org]

Author: mrbougo
Date: 2009-05-26 04:40:54 -0400 (Tue, 26 May 2009)
New Revision: 6773

Modified:
   trunk/data/qcsrc/server/g_triggers.qc
Log:
reset trigger_multiple correctly: don't assume they all use .health

Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc	2009-05-25 18:34:07 UTC (rev 6772)
+++ trunk/data/qcsrc/server/g_triggers.qc	2009-05-26 08:40:54 UTC (rev 6773)
@@ -221,10 +221,14 @@
 
 void multi_reset()
 {
-	self.touch = multi_touch;
-	self.health = self.max_health;
-	self.takedamage = DAMAGE_YES;
-	self.solid = SOLID_BBOX;
+	if ( !(self.spawnflags & SPAWNFLAG_NOTOUCH) )
+		self.touch = multi_touch;
+	if (self.max_health)
+	{
+		self.health = self.max_health;
+		self.takedamage = DAMAGE_YES;
+		self.solid = SOLID_BBOX;
+	}
 	self.think = SUB_Null;
 	self.team = self.team_saved;
 }