From: terencehill <piuntn@gmail.com>
Date: Thu, 8 Jun 2017 16:16:38 +0000 (+0200)
Subject: Don't forbid spawning autogenerated waypoints if close to an existing (autogenerated... 
X-Git-Tag: xonotic-v0.8.5~2378^2~136
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9ab463ad54b6f121536bc399e68c43b419fb82b0;p=xonotic%2Fxonotic-data.pk3dir.git

Don't forbid spawning autogenerated waypoints if close to an existing (autogenerated) waypoint; it fixes a ladder without destination waypoint in the map Cucumber
---

diff --git a/qcsrc/server/bot/default/waypoints.qc b/qcsrc/server/bot/default/waypoints.qc
index f5391dbea..74df45583 100644
--- a/qcsrc/server/bot/default/waypoints.qc
+++ b/qcsrc/server/bot/default/waypoints.qc
@@ -184,9 +184,8 @@ entity waypoint_spawn(vector m1, vector m2, float f)
 {
 	if(!(f & WAYPOINTFLAG_PERSONAL))
 	{
-		vector em1 = m1;
-		vector em2 = m2;
-		if (m1 == m2)
+		vector em1 = m1, em2 = m2;
+		if (!(f & WAYPOINTFLAG_GENERATED) && m1 == m2)
 		{
 			em1 = m1 - '8 8 8';
 			em2 = m2 + '8 8 8';