From: Mario <mario.mario@y7mail.com>
Date: Thu, 7 Mar 2013 15:37:05 +0000 (+1100)
Subject: Remove distance check in attack code (enemy is lost at that distance anyway)
X-Git-Tag: xonotic-v0.8.0~241^2^2~460
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=87019578cb32e1d7f88aa19850e9bda1e1df34f3;p=xonotic%2Fxonotic-data.pk3dir.git

Remove distance check in attack code (enemy is lost at that distance anyway)
---

diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index 7847ca5dc..7e0578849 100644
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -350,9 +350,6 @@ float GenericCheckAttack ()
 	
 	if (time < self.attack_finished_single)
 		return FALSE;
-	
-	if (vlen(self.enemy.origin - self.origin) > 2000) // long traces are slow
-		return FALSE;	
 		
 	if(self.attack_melee)
 	if(vlen(self.enemy.origin - self.origin) <= 100 * self.scale)
diff --git a/qcsrc/server/monsters/monster/shalrath.qc b/qcsrc/server/monsters/monster/shalrath.qc
index 240cf38cc..a3efea928 100644
--- a/qcsrc/server/monsters/monster/shalrath.qc
+++ b/qcsrc/server/monsters/monster/shalrath.qc
@@ -171,9 +171,6 @@ float ShalrathCheckAttack ()
 		}
 	}
 
-	if (vlen(targ.origin - self.origin) >= 2000) // long traces are slow
-		return FALSE;
-
 // see if any entities are in the way of the shot
 	spot1 = self.origin + '0 0 10';
 	spot2 = targ.origin + '0 0 10';
diff --git a/qcsrc/server/monsters/monster/soldier.qc b/qcsrc/server/monsters/monster/soldier.qc
index 6fb9e1a54..98ba477c3 100644
--- a/qcsrc/server/monsters/monster/soldier.qc
+++ b/qcsrc/server/monsters/monster/soldier.qc
@@ -82,9 +82,6 @@ float SoldierCheckAttack ()
 	if (self.health <= 0 || targ.health < 1 || targ == world)
 		return FALSE;
 
-	if (vlen(targ.origin - self.origin) > 2000) // long traces are slow
-		return FALSE;
-
 	// see if any entities are in the way of the shot
 	spot1 = self.origin + self.view_ofs;
 	spot2 = targ.origin + targ.view_ofs;