X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fdefault%2Fscripting.qc;h=252708a1189f0401c7af68b0ff4ff047759e1950;hb=64f2b309aa5be8aafb9ad2137174bb6d99aeb876;hp=4b3fc6266e175c98beaf0c3e0fc6af179b86d7e5;hpb=bc6fe08d1d10d513d52efb1ab57a27d6086b8397;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/bot/default/scripting.qc b/qcsrc/server/bot/default/scripting.qc
index 4b3fc6266..252708a11 100644
--- a/qcsrc/server/bot/default/scripting.qc
+++ b/qcsrc/server/bot/default/scripting.qc
@@ -1120,7 +1120,6 @@ void bot_setcurrentcommand(entity this)
 	if(!this.bot_cmd_current)
 	{
 		this.bot_cmd_current = new_pure(bot_cmd);
-		this.bot_cmd_current.is_bot_cmd = true;
 	}
 
 	bot_cmd = this.bot_cmd_current;
@@ -1175,16 +1174,17 @@ float bot_execute_commands_once(entity 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
-	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)
 		{