From 681c7e6c77128f8e46693c379ff103864ba1ebac Mon Sep 17 00:00:00 2001 From: terencehill Date: Wed, 4 Sep 2019 22:30:50 +0200 Subject: [PATCH] Move this.goalcurrent check inside havocbot_bunnyhop --- qcsrc/server/bot/default/havocbot/havocbot.qc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc index d055fc962..4e32ce99a 100644 --- a/qcsrc/server/bot/default/havocbot/havocbot.qc +++ b/qcsrc/server/bot/default/havocbot/havocbot.qc @@ -270,7 +270,7 @@ void havocbot_bunnyhop(entity this, vector dir) if(this.aistatus & AI_STATUS_ATTACKING) return; - if(IS_PLAYER(this.goalcurrent)) + if (!this.goalcurrent || IS_PLAYER(this.goalcurrent)) return; if((this.aistatus & AI_STATUS_RUNNING) && vdist(this.velocity, <, autocvar_sv_maxspeed * 0.75) @@ -295,8 +295,6 @@ void havocbot_bunnyhop(entity this, vector dir) this.bot_timelastseengoal = 0; } - vector gco = get_closer_dest(this.goalcurrent, this.origin); - // Run only to visible goals if(IS_ONGROUND(this)) if(vdist(vec2(this.velocity), >=, autocvar_sv_maxspeed)) @@ -307,6 +305,7 @@ void havocbot_bunnyhop(entity this, vector dir) // seen it before if(this.bot_timelastseengoal) { + vector gco = get_closer_dest(this.goalcurrent, this.origin); // for a period of time if(time - this.bot_timelastseengoal > autocvar_bot_ai_bunnyhop_firstjumpdelay) { @@ -1256,9 +1255,7 @@ void havocbot_movetogoal(entity this) havocbot_keyboard_movement(this, destorg); // Bunnyhop! - //if(this.aistatus & AI_STATUS_ROAMING) - if(!bunnyhop_forbidden && this.goalcurrent) - if(skill+this.bot_moveskill >= autocvar_bot_ai_bunnyhop_skilloffset) + if (!bunnyhop_forbidden && skill + this.bot_moveskill >= autocvar_bot_ai_bunnyhop_skilloffset) havocbot_bunnyhop(this, dir); if (dir * v_up >= autocvar_sv_jumpvelocity * 0.5 && IS_ONGROUND(this)) -- 2.39.2