From f8e7d1ff9dea1e6a966ad0b46e54ed4049360602 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sat, 30 Dec 2017 19:55:45 +0100 Subject: [PATCH] Fix broken automatic waypoint generation for jumppads really close to other jumppads (e.g. the row of 3 jumppads in Runningman) --- qcsrc/server/bot/default/waypoints.qc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/qcsrc/server/bot/default/waypoints.qc b/qcsrc/server/bot/default/waypoints.qc index c3b67a378..5fdd360a2 100644 --- a/qcsrc/server/bot/default/waypoints.qc +++ b/qcsrc/server/bot/default/waypoints.qc @@ -184,14 +184,10 @@ void waypoint_setupmodel(entity wp) // (suitable for spawnfunc_waypoint editor) entity waypoint_spawn(vector m1, vector m2, float f) { - if(!(f & WAYPOINTFLAG_PERSONAL)) + if(!(f & (WAYPOINTFLAG_PERSONAL | WAYPOINTFLAG_GENERATED)) && m1 == m2) { - vector em1 = m1, em2 = m2; - if (!(f & WAYPOINTFLAG_GENERATED) && m1 == m2) - { - em1 = m1 - '8 8 8'; - em2 = m2 + '8 8 8'; - } + vector em1 = m1 - '8 8 8'; + vector em2 = m2 + '8 8 8'; IL_EACH(g_waypoints, boxesoverlap(em1, em2, it.absmin, it.absmax), { return it; -- 2.39.2