From 952442a043e6f79e0ae3b32ebfed9bd8bb398159 Mon Sep 17 00:00:00 2001 From: terencehill Date: Mon, 6 Feb 2017 12:05:45 +0100 Subject: [PATCH] Similarly to the previous commit, make detection of obstacles that can be jumped over if bot stopped for some reason a bit more reliable --- qcsrc/server/bot/default/havocbot/havocbot.qc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc index d523b6ab8..13b8739d7 100644 --- a/qcsrc/server/bot/default/havocbot/havocbot.qc +++ b/qcsrc/server/bot/default/havocbot/havocbot.qc @@ -733,17 +733,18 @@ void havocbot_movetogoal(entity this) // jump if going toward an obstacle that doesn't look like stairs we // can walk up directly - tracebox(this.origin, this.mins, this.maxs, this.origin + this.velocity * 0.2, false, this); + offset = (vdist(this.velocity, >, 32) ? this.velocity * 0.2 : v_forward * 32); + tracebox(this.origin, this.mins, this.maxs, this.origin + offset, false, this); if (trace_fraction < 1) if (trace_plane_normal.z < 0.7) { s = trace_fraction; - tracebox(this.origin + stepheightvec, this.mins, this.maxs, this.origin + this.velocity * 0.2 + stepheightvec, false, this); + tracebox(this.origin + stepheightvec, this.mins, this.maxs, this.origin + offset + stepheightvec, false, this); if (trace_fraction < s + 0.01) if (trace_plane_normal.z < 0.7) { s = trace_fraction; - tracebox(this.origin + jumpstepheightvec, this.mins, this.maxs, this.origin + this.velocity * 0.2 + jumpstepheightvec, false, this); + tracebox(this.origin + jumpstepheightvec, this.mins, this.maxs, this.origin + offset + jumpstepheightvec, false, this); if (trace_fraction > s) PHYS_INPUT_BUTTON_JUMP(this) = true; } -- 2.39.2