From: terencehill <piuntn@gmail.com>
Date: Mon, 13 Mar 2017 00:37:42 +0000 (+0100)
Subject: Fix bots not jumping to get out of lava and water (part 2)
X-Git-Tag: xonotic-v0.8.2~62
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=68b0ed76e2;p=xonotic%2Fxonotic-data.pk3dir.git

Fix bots not jumping to get out of lava and water (part 2)
---

diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc
index 824d645ee..038aea0f6 100644
--- a/qcsrc/server/bot/default/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/default/havocbot/havocbot.qc
@@ -736,6 +736,7 @@ void havocbot_movetogoal(entity this)
 		evadeobstacle = '0 0 0';
 		evadelava = '0 0 0';
 
+		this.aistatus &= ~AI_STATUS_DANGER_AHEAD;
 		makevectors(this.v_angle.y * '0 1 0');
 		if (this.waterlevel)
 		{
@@ -812,7 +813,6 @@ void havocbot_movetogoal(entity this)
 
 			// Check for water/slime/lava and dangerous edges
 			// (only when the bot is on the ground or jumping intentionally)
-			this.aistatus &= ~AI_STATUS_DANGER_AHEAD;
 
 			vector dst_ahead = this.origin + this.view_ofs + offset;
 			vector dst_down = dst_ahead - '0 0 3000';