From: Mario <mario.mario@y7mail.com>
Date: Sat, 26 Jan 2013 12:21:33 +0000 (+1100)
Subject: Fix vehicles only crushing zombies
X-Git-Tag: xonotic-v0.8.0~241^2^2~557
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c883ccf563dcc4218b6f57b63401ad1c33c8188f;p=xonotic%2Fxonotic-data.pk3dir.git

Fix vehicles only crushing zombies
---

diff --git a/qcsrc/server/mutators/gamemode_td.qc b/qcsrc/server/mutators/gamemode_td.qc
index 81beb4123..5a5c0436f 100644
--- a/qcsrc/server/mutators/gamemode_td.qc
+++ b/qcsrc/server/mutators/gamemode_td.qc
@@ -230,7 +230,7 @@ void spawnturret(entity spawnedby, entity own, string turet, vector orig)
 	oldself = self;
 	self = spawn();
 	
-	self.origin = orig;
+	setorigin(self, orig);
 	self.spawnflags = TSL_NO_RESPAWN;
 	self.monster_attack = TRUE;
 	self.realowner = own;
diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index 5e377079e..b7b168eeb 100644
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -506,7 +506,7 @@ float vehicles_crushable(entity e)
     if(e.classname == "player")
         return TRUE;
 
-    if(e.classname == "monster_zombie")
+    if(e.flags & FL_MONSTER)
         return TRUE;
 
     return FALSE;