From: Mario <mario.mario@y7mail.com>
Date: Sun, 13 Oct 2013 00:26:06 +0000 (+1100)
Subject: Attempt to fix mage teleporting behind walls
X-Git-Tag: xonotic-v0.8.0~241^2^2~39
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=93c3208621500e9a27896381db1539e1cd10db61;p=xonotic%2Fxonotic-data.pk3dir.git

Attempt to fix mage teleporting behind walls
---

diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc
index 9e78ce1ac..b389a46c9 100644
--- a/qcsrc/common/monsters/monster/mage.qc
+++ b/qcsrc/common/monsters/monster/mage.qc
@@ -249,13 +249,13 @@ void mage_teleport()
 		return;
 
 	makevectors(self.enemy.angles);
-	tracebox(self.enemy.origin + ((v_forward * -1) * 200), self.mins, self.maxs, self.origin - '0 0 5', MOVE_NORMAL, self);
+	tracebox(self.enemy.origin + ((v_forward * -1) * 200), self.mins, self.maxs, self.origin, MOVE_NOMONSTERS, self);
 	
-	if(trace_fraction <= 1)
-	{
-		pointparticles(particleeffectnum("spawn_event_neutral"), self.origin, '0 0 0', 1);
-		setorigin(self, self.enemy.origin + ((v_forward * -1) * 200));
-	}
+	if(trace_fraction < 1)
+		return;
+		
+	pointparticles(particleeffectnum("spawn_event_neutral"), self.origin, '0 0 0', 1);
+	setorigin(self, self.enemy.origin + ((v_forward * -1) * 200));
 	
 	self.attack_finished_single = time + 0.2;
 }