[quake3-commits] r1972 - trunk/code/game

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2011-05-10 07:11:37 -0400 (Tue, 10 May 2011)
New Revision: 1972

Modified:
   trunk/code/game/g_trigger.c
Log:
Fix spawnflag behaviour for trigger_hurt, patch by DevHC


Modified: trunk/code/game/g_trigger.c
===================================================================
--- trunk/code/game/g_trigger.c	2011-05-10 10:18:07 UTC (rev 1971)
+++ trunk/code/game/g_trigger.c	2011-05-10 11:11:37 UTC (rev 1972)
@@ -392,12 +392,13 @@
 
 	self->r.contents = CONTENTS_TRIGGER;
 
-	if ( self->spawnflags & 2 ) {
-		self->use = hurt_use;
-	}
+	self->use = hurt_use;
 
 	// link in to the world if starting active
-	if ( ! (self->spawnflags & 1) ) {
+	if ( self->spawnflags & 1 ) {
+		trap_UnlinkEntity (self);
+	}
+	else {
 		trap_LinkEntity (self);
 	}
 }