From ba76a21a6b746a21f7c4297b75a1516061a69df3 Mon Sep 17 00:00:00 2001 From: mrbougo Date: Tue, 26 May 2009 08:40:54 +0000 Subject: [PATCH] reset trigger_multiple correctly: don't assume they all use .health git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6773 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/g_triggers.qc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/data/qcsrc/server/g_triggers.qc b/data/qcsrc/server/g_triggers.qc index 5fcdba504..c6498feb7 100644 --- a/data/qcsrc/server/g_triggers.qc +++ b/data/qcsrc/server/g_triggers.qc @@ -221,10 +221,14 @@ void multi_eventdamage (entity inflictor, entity attacker, float damage, float d 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; } -- 2.39.2