]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix normal waypoints often failing to get linked to ladder waypoints
authorterencehill <piuntn@gmail.com>
Sun, 21 May 2017 18:03:23 +0000 (20:03 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 21 May 2017 18:03:23 +0000 (20:03 +0200)
qcsrc/server/bot/default/navigation.qc

index 5672b110167ea68017f552279735807c5c7e100c..891ad3c1551dd2d7c3e0bbc4f1b087b1f2adcd6b 100644 (file)
@@ -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)
                                                });