From: terencehill <piuntn@gmail.com>
Date: Thu, 24 May 2018 14:27:35 +0000 (+0200)
Subject: Bot AI: fix bots turning aim too much when current goal and next goal are close to... 
X-Git-Tag: xonotic-v0.8.5~1923^2~49
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e6ec722421c18fe902d37f372afa1f42fc2132a9;p=xonotic%2Fxonotic-data.pk3dir.git

Bot AI: fix bots turning aim too much when current goal and next goal are close to each other
---

diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc
index a0b1e398d..26ded65e3 100644
--- a/qcsrc/server/bot/default/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/default/havocbot/havocbot.qc
@@ -948,7 +948,7 @@ void havocbot_movetogoal(entity this)
 			vector flat_diff = vec2(diff);
 			offset = max(32, vlen(vec2(this.velocity)) * cos(deviation.y * DEG2RAD) * 0.2) * flatdir;
 			vector actual_destorg = this.origin + offset;
-			if (!this.goalstack01 || this.goalcurrent.wpflags & WAYPOINTFLAG_TELEPORT)
+			if (!this.goalstack01 || this.goalcurrent.wpflags & (WAYPOINTFLAG_TELEPORT | WAYPOINTFLAG_LADDER))
 			{
 				if (vlen2(flat_diff) < vlen2(offset))
 				{
@@ -965,9 +965,15 @@ void havocbot_movetogoal(entity this)
 			{
 				vector next_goal_org = (this.goalstack01.absmin + this.goalstack01.absmax) * 0.5;
 				vector next_dir = normalize(vec2(next_goal_org - destorg));
-				float next_dist = vlen(vec2(this.origin + offset - destorg));
-				actual_destorg = vec2(destorg) + next_dist * next_dir;
+				float dist = vlen(vec2(this.origin + offset - destorg));
+				// if current and next goal are close to each other make sure
+				// actual_destorg isn't set beyond next_goal_org
+				if (dist ** 2 > vlen2(vec2(next_goal_org - destorg)))
+					actual_destorg = next_goal_org;
+				else
+					actual_destorg = vec2(destorg) + dist * next_dir;
 				actual_destorg.z = this.origin.z;
+
 			}
 
 			tracebox(this.origin, this.mins, this.maxs, actual_destorg, false, this);