Minor autowaypointer fixes.

diff --git a/qcsrc/server/bot/navigation.qc b/qcsrc/server/bot/navigation.qc
index 001617722ae1fc61eb781bb659061cad7e95edc1..0f4c330ed8882b2037a6e99bb5f7652d76a421bb 100644 (file)
--- a/qcsrc/server/bot/navigation.qc
+++ b/qcsrc/server/bot/navigation.qc
@@ -430,7 +430,7 @@ entity navigation_findnearestwaypoint(entity ent, float walkfromwp)
        if (autocvar_g_waypointeditor_auto)
        {
                entity wp2 = navigation_findnearestwaypoint_withdist_except(ent, walkfromwp, 1050, wp);
-               if (!wp2)
+               if (wp && !wp2)
                        wp.wpflags |= WAYPOINTFLAG_PROTECTED;
        }
        return wp;

diff --git a/qcsrc/server/bot/waypoints.qc b/qcsrc/server/bot/waypoints.qc
index da0b3508941ecaec1fdf0205e0b464be0c971978..4118b6b76998e6f3c082d3b3f4df7b8426517ab1 100644 (file)
--- a/qcsrc/server/bot/waypoints.qc
+++ b/qcsrc/server/bot/waypoints.qc
@@ -1141,6 +1141,7 @@ void botframe_autowaypoints()
                //te_explosion(p.botframe_autowaypoints_lastwp0.origin);
        }
 
-       botframe_deleteuselesswaypoints();
+       // TODO(divVerent): For some reason this always removes newly created WPs. Need to figure out why.
+       //botframe_deleteuselesswaypoints();
 }