From: terencehill Date: Sat, 29 Jul 2017 14:27:56 +0000 (+0200) Subject: Fix aim direction when entering extended teleport waypoints X-Git-Tag: xonotic-v0.8.5~2378^2~110 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5de3f2c5ff3c67da9742ac1af754083655adbb39;p=xonotic%2Fxonotic-data.pk3dir.git Fix aim direction when entering extended teleport waypoints --- diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc index 7fba48eab..1c9c0a624 100644 --- a/qcsrc/server/bot/default/havocbot/havocbot.qc +++ b/qcsrc/server/bot/default/havocbot/havocbot.qc @@ -136,13 +136,16 @@ void havocbot_ai(entity this) this.aistatus |= AI_STATUS_ROAMING; this.aistatus &= ~AI_STATUS_ATTACKING; - vector now,v,next;//,heading; + vector v, now, next; float aimdistance,skillblend,distanceblend,blend; - SET_DESTCOORDS(this.goalcurrent, this.origin, now); - next = now = now - (this.origin + this.view_ofs); + if(this.goalcurrent.wpisbox && boxesoverlap(this.goalcurrent.absmin, this.goalcurrent.absmax, this.origin, this.origin)) + v = this.goalcurrent.origin; + else + SET_DESTCOORDS(this.goalcurrent, this.origin, v); + next = now = v - (this.origin + this.view_ofs); aimdistance = vlen(now); - //heading = this.velocity; + //dprint(this.goalstack01.classname,etos(this.goalstack01),"\n"); if( this.goalstack01 != this && this.goalstack01 && !wasfreed(this.goalstack01) && ((this.aistatus & AI_STATUS_RUNNING) == 0) &&