From: terencehill Date: Sun, 21 May 2017 18:03:23 +0000 (+0200) Subject: Fix normal waypoints often failing to get linked to ladder waypoints X-Git-Tag: xonotic-v0.8.5~2378^2~149 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=81067ff3c5f3c183ebebca5f1f4748b234ec5b0e;p=xonotic%2Fxonotic-data.pk3dir.git Fix normal waypoints often failing to get linked to ladder waypoints --- diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc index 5672b1101..891ad3c15 100644 --- a/qcsrc/server/bot/default/navigation.qc +++ b/qcsrc/server/bot/default/navigation.qc @@ -183,7 +183,7 @@ bool tracewalk(entity e, vector start, vector m1, vector m2, vector end, float e IL_EACH(g_ladders, it.classname == "func_ladder", { if(it.bot_pickup) - if(boxesoverlap(org + jumpheight_vec + m1 + '-1 -1 -1', org + jumpheight_vec + m2 + '1 1 1', it.absmin, it.absmax)) + if(boxesoverlap(move + jumpheight_vec + m1 + '-1 -1 -1', move + jumpheight_vec + m2 + '1 1 1', it.absmin, it.absmax)) if(boxesoverlap(end, end2, it.absmin + (m1 - eZ * m1.z - '1 1 0'), it.absmax + (m2 - eZ * m2.z + '1 1 0'))) ladder_found = true; // can't return here ("Loop mutex held by tracewalk" error) });