[nexuiz-commits] r7456 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: mand1nga
Date: 2009-08-17 10:37:43 -0400 (Mon, 17 Aug 2009)
New Revision: 7456

Modified:
   trunk/data/qcsrc/server/bots_scripting.qc
Log:
Fix bot pausing

Modified: trunk/data/qcsrc/server/bots_scripting.qc
===================================================================
--- trunk/data/qcsrc/server/bots_scripting.qc	2009-08-17 14:24:54 UTC (rev 7455)
+++ trunk/data/qcsrc/server/bots_scripting.qc	2009-08-17 14:37:43 UTC (rev 7456)
@@ -1017,7 +1017,7 @@
 	self.movement = '0 0 0';
 	self.bot_cmd_keys = BOT_CMD_KEY_NONE;
 
-	self.bot_exec_status = self.bot_exec_status | BOT_EXEC_STATUS_PAUSED;
+	self.bot_exec_status |= BOT_EXEC_STATUS_PAUSED;
 	return CMD_STATUS_FINISHED;
 }
 
@@ -1124,12 +1124,6 @@
 	// Find command
 	bot_setcurrentcommand();
 
-	// Keep pressing keys raised by the "presskey" command
-	ispressingkey = !!bot_presskeys();
-
-	if(bot_cmd==world)
-		return ispressingkey;
-
 	// Ignore all commands except continue when the bot is paused
 	if(self.bot_exec_status & BOT_EXEC_STATUS_PAUSED)
 	if(bot_cmd.bot_cmd_type!=BOT_CMD_CONTINUE)
@@ -1142,6 +1136,12 @@
 		return 1;
 	}
 
+	// Keep pressing keys raised by the "presskey" command
+	ispressingkey = !!bot_presskeys();
+
+	if(bot_cmd==world)
+		return ispressingkey;
+
 	// Handle conditions
 	if not(bot_cmd.bot_cmd_type==BOT_CMD_FI||bot_cmd.bot_cmd_type==BOT_CMD_ELSE)
 	if(self.bot_cmd_condition_status & CMD_CONDITION_TRUE && self.bot_cmd_condition_status & CMD_CONDITION_FALSE_BLOCK)