From: terencehill <piuntn@gmail.com>
Date: Mon, 11 Sep 2017 17:04:59 +0000 (+0200)
Subject: Remove a now redundant optimization
X-Git-Tag: xonotic-v0.8.5~2378^2~59
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6ee317a5e4f91f95b1a1b6b06c8f11627bc51235;p=xonotic%2Fxonotic-data.pk3dir.git

Remove a now redundant optimization
---

diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc
index 9a3f65255..9bdcf8dba 100644
--- a/qcsrc/server/bot/default/navigation.qc
+++ b/qcsrc/server/bot/default/navigation.qc
@@ -1202,29 +1202,8 @@ void navigation_routerating(entity this, entity e, float f, float rangebias)
 		if ((!e.nearestwaypoint || e.navigation_dynamicgoal)
 			&& e.nearestwaypointtimeout >= 0 && time > e.nearestwaypointtimeout)
 		{
-			nwp = navigation_findnearestwaypoint(e, true);
-			if(nwp)
-			{
-				e.nearestwaypoint = nwp;
-
-				vector m1 = nwp.absmin, m2 = nwp.absmax;
-				m1.x = nwp.origin.x; m1.y = nwp.origin.y;
-				m2.x = nwp.origin.x; m2.y = nwp.origin.y;
-				vector ve = (e.absmin - e.absmax) * 0.5;
-				ve.x = bound(m1.x, ve.x, m2.x);
-				ve.y = bound(m1.y, ve.y, m2.y);
-				ve.z = bound(m1.z, ve.z, m2.z);
-
-				m1 = e.absmin; m2 = e.absmax;
-				m1.x = e.origin.x; m1.y = e.origin.y;
-				m2.x = e.origin.x; m2.y = e.origin.y;
-				vector vnwp = nwp.origin;
-				vnwp.x = bound(m1.x, vnwp.x, m2.x);
-				vnwp.y = bound(m1.y, vnwp.y, m2.y);
-				vnwp.z = bound(m1.z, vnwp.z, m2.z);
-				e.nearestwaypoint_dist = vlen(ve - vnwp);
-			}
-			else
+			e.nearestwaypoint = nwp = navigation_findnearestwaypoint(e, true);
+			if(!nwp)
 			{
 				LOG_DEBUG("FAILED to find a nearest waypoint to '", e.classname, "' #", etos(e));
 
@@ -1325,20 +1304,15 @@ bool navigation_routetogoal(entity this, entity e, vector startposition)
 	if(nearest_wp && nearest_wp.enemy)
 	{
 		// often path can be optimized by not adding the nearest waypoint
-		if (this.goalentity.nearestwaypoint_dist < 8)
-			e = nearest_wp.enemy;
-		else
+		if (this.goalentity.navigation_dynamicgoal || autocvar_g_waypointeditor)
 		{
-			if (this.goalentity.navigation_dynamicgoal || autocvar_g_waypointeditor)
-			{
-				SET_TRACEWALK_DESTCOORDS(this.goalentity, nearest_wp.enemy.origin, dest, dest_height);
-				if(vdist(dest - nearest_wp.enemy.origin, <, 1050))
-				if(tracewalk(this, nearest_wp.enemy.origin, STAT(PL_MIN, this), STAT(PL_MAX, this), dest, dest_height, bot_navigation_movemode))
-					e = nearest_wp.enemy;
-			}
-			else if(navigation_item_islinked(nearest_wp.enemy, this.goalentity))
+			SET_TRACEWALK_DESTCOORDS(this.goalentity, nearest_wp.enemy.origin, dest, dest_height);
+			if(vdist(dest - nearest_wp.enemy.origin, <, 1050))
+			if(tracewalk(this, nearest_wp.enemy.origin, STAT(PL_MIN, this), STAT(PL_MAX, this), dest, dest_height, bot_navigation_movemode))
 				e = nearest_wp.enemy;
 		}
+		else if(navigation_item_islinked(nearest_wp.enemy, this.goalentity))
+			e = nearest_wp.enemy;
 	}
 
 	for (;;)
diff --git a/qcsrc/server/bot/default/navigation.qh b/qcsrc/server/bot/default/navigation.qh
index d9dd089cb..ca770f869 100644
--- a/qcsrc/server/bot/default/navigation.qh
+++ b/qcsrc/server/bot/default/navigation.qh
@@ -30,7 +30,6 @@ entity navigation_bestgoal;
 .float goalcurrent_distance_time;
 
 .entity nearestwaypoint;
-.float nearestwaypoint_dist;
 .float nearestwaypointtimeout;
 
 /*