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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-06-17 12:54:55 -0400 (Wed, 17 Jun 2009)
New Revision: 7052

Modified:
   trunk/data/qcsrc/server/bots_scripting.qc
   trunk/data/qcsrc/server/gamecommand.qc
Log:
make bot command reading faster :P


Modified: trunk/data/qcsrc/server/bots_scripting.qc
===================================================================
--- trunk/data/qcsrc/server/bots_scripting.qc	2009-06-17 16:43:35 UTC (rev 7051)
+++ trunk/data/qcsrc/server/bots_scripting.qc	2009-06-17 16:54:55 UTC (rev 7052)
@@ -266,6 +266,9 @@
 	local entity bot;
 	local float c;
 
+	if(!number)
+		return world;
+
 	bot = findchainflags(flags, FL_CLIENT);
 	while (bot)
 	{

Modified: trunk/data/qcsrc/server/gamecommand.qc
===================================================================
--- trunk/data/qcsrc/server/gamecommand.qc	2009-06-17 16:43:35 UTC (rev 7051)
+++ trunk/data/qcsrc/server/gamecommand.qc	2009-06-17 16:54:55 UTC (rev 7052)
@@ -963,9 +963,9 @@
 				if(argc >= 3 && argv(0) == "sv_cmd" && argv(1) == "bot_cmd")
 				{
 					// let's start at token 2 so we can skip sv_cmd bot_cmd
-					bot = find_bot_by_name(argv(2));
+					bot = find_bot_by_number(stof(argv(2)));
 					if(bot == world)
-						bot = find_bot_by_number(stof(argv(2)));
+						bot = find_bot_by_name(argv(2));
 					if(bot)
 						bot_queuecommand(bot, strcat(argv(3), " ", argv(4)));
 				}
@@ -991,9 +991,9 @@
 			return;
 		}
 
-		bot = find_bot_by_name(argv(1));
-		if(bot==world)
-			bot = find_bot_by_number(stof(argv(1)));
+		bot = find_bot_by_number(stof(argv(2)));
+		if(bot == world)
+			bot = find_bot_by_name(argv(2));
 
 		if(bot)
 			bot_queuecommand(bot, strcat(argv(2), " ", argv(3)));