From: Mario <mario@smbclan.net>
Date: Tue, 30 Aug 2016 19:07:28 +0000 (+1000)
Subject: Don't even check trace_ent (unreliable)
X-Git-Tag: xonotic-v0.8.2~637
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=41598895516e60fb4d85ce772b8fe97a770df97c;p=xonotic%2Fxonotic-data.pk3dir.git

Don't even check trace_ent (unreliable)
---

diff --git a/monsters.cfg b/monsters.cfg
index 66fc72c30..b5a97f87a 100644
--- a/monsters.cfg
+++ b/monsters.cfg
@@ -94,6 +94,7 @@ set g_monsters_miniboss_chance 5
 set g_monsters_miniboss_healthboost 100
 set g_monsters_drop_time 10
 set g_monsters_ignoretraces 1
+set g_monsters_lineofsight 1
 set g_monsters_owners 1
 set g_monsters_teams 1
 set g_monsters_score_kill 0
diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 3d937bef8..9ac1f4e14 100644
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -99,10 +99,9 @@ bool Monster_ValidTarget(entity this, entity targ)
 		return false;
 	}
 
-	traceline(this.origin + this.view_ofs, targ.origin, MOVE_NORMAL, this);
+	traceline(this.origin + this.view_ofs, targ.origin, MOVE_NOMONSTERS, this);
 
-	if(trace_fraction < 1 && trace_ent != targ)
-	if(!autocvar_g_monsters_ignoretraces || !trace_ent.iscreature)
+	if(trace_fraction < 1)
 		return false; // solid
 
 	if(autocvar_g_monsters_target_infront || (this.spawnflags & MONSTERFLAG_INFRONT))
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 0162470e7..a1bb5fb95 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -406,7 +406,7 @@ bool autocvar_g_monsters_respawn;
 float autocvar_g_monsters_armor_blockpercent;
 float autocvar_g_monsters_healthbars;
 bool autocvar_g_monsters_lineofsight = true;
-bool autocvar_g_monsters_ignoretraces = true;
+//bool autocvar_g_monsters_ignoretraces = true;
 #define autocvar_g_bloodloss cvar("g_bloodloss")
 bool autocvar_g_nades;
 bool autocvar_g_nades_override_dropweapon = true;