Merge branch 'master' into pooga/keepawaybots

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / bot / bot.qc

diff --git a/qcsrc/server/bot/bot.qc b/qcsrc/server/bot/bot.qc
index 581e3f0c758050dae69b33c9c983a98a4ba735c4..8be71a3cf09f1f1dadbec0069f10099ebadd22d9 100644 (file)
--- a/qcsrc/server/bot/bot.qc
+++ b/qcsrc/server/bot/bot.qc
@@ -98,6 +98,8 @@ void bot_think()
                        self.bot_strategytime = 0;
                }
        }
+       else if(self.aistatus & AI_STATUS_STUCK)
+               navigation_unstuck();
 
        // now call the current bot AI (havocbot for example)
        self.bot_ai();
@@ -374,6 +376,8 @@ void bot_clientdisconnect()
        self.playermodel_freeme = string_null;
        self.playerskin_freeme = string_null;
        remove(self.bot_cmd_current);
+       if(bot_waypoint_queue_owner==self)
+               bot_waypoint_queue_owner = world;
 }
 
 void bot_clientconnect()