From: Mario <mario.mario@y7mail.com>
Date: Sat, 16 Mar 2013 13:02:18 +0000 (+1100)
Subject: Some minor changes to mage projectiles
X-Git-Tag: xonotic-v0.8.0~241^2^2~440
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=41b4c05736e8d339f1706d4a3ea7b4ec81424b64;p=xonotic%2Fxonotic-data.pk3dir.git

Some minor changes to mage projectiles
---

diff --git a/qcsrc/server/monsters/monster/shalrath.qc b/qcsrc/server/monsters/monster/shalrath.qc
index a3efea928..4a523ae48 100644
--- a/qcsrc/server/monsters/monster/shalrath.qc
+++ b/qcsrc/server/monsters/monster/shalrath.qc
@@ -20,7 +20,6 @@ float autocvar_g_monster_shalrath_attack_melee_delay;
 #define shalrath_anim_death 	4
 #define shalrath_anim_run		5
 
-
 void() ShalMissile;
 
 void shalrath_think ()
@@ -61,13 +60,8 @@ void shalrath_attack_melee ()
 
 float shal_missile ()
 {
-	// don't throw if it is blocked
-	traceline(self.origin + '0 0 10', self.enemy.origin + '0 0 10', FALSE, self);
-	if (vlen(self.enemy.origin - self.origin) > 1000)
-		return FALSE;
-	if (trace_ent != self.enemy)
-		return FALSE;
 	shalrath_attack();
+	
 	return TRUE;
 }
 
@@ -172,8 +166,8 @@ float ShalrathCheckAttack ()
 	}
 
 // see if any entities are in the way of the shot
-	spot1 = self.origin + '0 0 10';
-	spot2 = targ.origin + '0 0 10';
+	spot1 = self.origin + self.view_ofs;
+	spot2 = targ.origin + targ.view_ofs;
 
 	traceline (spot1, spot2, FALSE, self);