make team/invert logic identical to most other ents for trigger_multiple
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 6 Dec 2010 11:28:26 +0000 (12:28 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 6 Dec 2010 11:28:26 +0000 (12:28 +0100)
qcsrc/server/g_triggers.qc

index 54cb530..0a70de7 100644 (file)
@@ -189,14 +189,12 @@ void multi_use()
 void multi_touch()
 {
        if not(self.spawnflags & 2)
-       {
                if not(other.iscreature)
                        return;
 
-               if(self.team)
-               if(self.team == other.team)
+       if(self.team)
+               if((self.spawnflags & 4 == 0) == (self.team != other.team))
                        return;
-       }
 
 // if the trigger has an angles field, check player's facing direction
        if (self.movedir != '0 0 0')