Fix "bot_cmd X pause" command not working (broken since 8da4929ec)
authorterencehill <piuntn@gmail.com>
Wed, 16 Nov 2016 16:42:46 +0000 (17:42 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 16 Nov 2016 16:42:46 +0000 (17:42 +0100)
qcsrc/server/bot/default/scripting.qc

index 9f29a22176264e9e507c24da84854fd67e90c486..f96099087b7b345ec65aa6e14fe5fead95e5509f 100644 (file)
@@ -1160,16 +1160,17 @@ float bot_execute_commands_once(entity this)
        // Find command
        bot_setcurrentcommand(this);
 
        // Find command
        bot_setcurrentcommand(this);
 
-       // if we have no bot command, better return
-       // old logic kept pressing previously pressed keys, but that has problems
-       // (namely, it means you cannot make a bot "normal" ever again)
-       // to keep a bot walking for a while, use the "wait" bot command
-       if(bot_cmd == NULL)
-               return false;
-
        // Ignore all commands except continue when the bot is paused
        // Ignore all commands except continue when the bot is paused
-       if(this.bot_exec_status & BOT_EXEC_STATUS_PAUSED)
-       if(bot_cmd.bot_cmd_type!=BOT_CMD_CONTINUE)
+       if(!(self.bot_exec_status & BOT_EXEC_STATUS_PAUSED))
+       {
+               // if we have no bot command, better return
+               // old logic kept pressing previously pressed keys, but that has problems
+               // (namely, it means you cannot make a bot "normal" ever again)
+               // to keep a bot walking for a while, use the "wait" bot command
+               if(bot_cmd == world)
+                       return 0;
+       }
+       else if(bot_cmd.bot_cmd_type != BOT_CMD_CONTINUE)
        {
                if(bot_cmd.bot_cmd_type!=BOT_CMD_NULL)
                {
        {
                if(bot_cmd.bot_cmd_type!=BOT_CMD_NULL)
                {