From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 6 Dec 2010 11:28:26 +0000 (+0100)
Subject: make team/invert logic identical to most other ents for trigger_multiple
X-Git-Tag: xonotic-v0.1.0preview~70
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=8e06b145226266e319973f3bca5c2da620fe4a53

make team/invert logic identical to most other ents for trigger_multiple
---

diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc
index 54cb530fe4..0a70de75f8 100644
--- a/qcsrc/server/g_triggers.qc
+++ b/qcsrc/server/g_triggers.qc
@@ -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')