From: terencehill <piuntn@gmail.com>
Date: Sat, 2 Dec 2017 13:47:59 +0000 (+0100)
Subject: Revert "Increase tracewalk destination height to include player's height; it fixes... 
X-Git-Tag: xonotic-v0.8.5~2378^2~14^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=042089583dd3eae6bbe1cbdf85bd694d5bd1bb0c;p=xonotic%2Fxonotic-data.pk3dir.git

Revert "Increase tracewalk destination height to include player's height; it fixes bots not being able to reach items and jumppads too high above their head" because it's wrong (it fixed some Space Eleveator's jumppads but led bots to think they could reach unreachable jumppads, e.g. Atelier's jumppad next to Strength)

This reverts commit 6b3f7d6fc917129765479348a8b3957c50af09d9.
---

diff --git a/qcsrc/server/bot/default/navigation.qh b/qcsrc/server/bot/default/navigation.qh
index 6b4b8a9c2..ea913456d 100644
--- a/qcsrc/server/bot/default/navigation.qh
+++ b/qcsrc/server/bot/default/navigation.qh
@@ -51,8 +51,8 @@ entity navigation_bestgoal;
 // if ent is a box waypoint or an item v is set to coords of ent that are closer to org
 #define SET_DESTCOORDS(ent, org, v) MACRO_BEGIN { \
 	if ((ent.classname != "waypoint") || ent.wpisbox) { \
-		vector wm1 = ent.origin + ent.mins - eZ * (PL_MAX_CONST.z - 1); \
-		vector wm2 = ent.origin + ent.maxs - eZ * (PL_MIN_CONST.z + 1); \
+		vector wm1 = ent.origin + ent.mins; \
+		vector wm2 = ent.origin + ent.maxs; \
 		v.x = bound(wm1.x, org.x, wm2.x); \
 		v.y = bound(wm1.y, org.y, wm2.y); \
 		v.z = bound(wm1.z, org.z, wm2.z); \
@@ -65,8 +65,8 @@ entity navigation_bestgoal;
 // (but v.z is set to the lowest coord of ent), v_height is set to ent's height
 #define SET_TRACEWALK_DESTCOORDS(ent, org, v, v_height) MACRO_BEGIN { \
 	if ((ent.classname != "waypoint") || ent.wpisbox) { \
-		vector wm1 = ent.origin + ent.mins - eZ * (PL_MAX_CONST.z - 1); \
-		vector wm2 = ent.origin + ent.maxs - eZ * (PL_MIN_CONST.z + 1); \
+		vector wm1 = ent.origin + ent.mins; \
+		vector wm2 = ent.origin + ent.maxs; \
 		v.x = bound(wm1.x, org.x, wm2.x); \
 		v.y = bound(wm1.y, org.y, wm2.y); \
 		v.z = wm1.z; \
@@ -81,8 +81,8 @@ entity navigation_bestgoal;
 // (but v2.z is set to the lowest coord of ent), v2_height is set to ent's height
 #define SET_TRACEWALK_DESTCOORDS_2(ent, org, v, v2, v2_height) MACRO_BEGIN { \
 	if ((ent.classname != "waypoint") || ent.wpisbox) { \
-		vector wm1 = ent.origin + ent.mins - eZ * (PL_MAX_CONST.z - 1); \
-		vector wm2 = ent.origin + ent.maxs - eZ * (PL_MIN_CONST.z + 1); \
+		vector wm1 = ent.origin + ent.mins; \
+		vector wm2 = ent.origin + ent.maxs; \
 		v.x = bound(wm1.x, org.x, wm2.x); \
 		v.y = bound(wm1.y, org.y, wm2.y); \
 		v.z = bound(wm1.z, org.z, wm2.z); \