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

[DONOTREPLY at icculus.org]

Author: mand1nga
Date: 2009-05-29 20:42:16 -0400 (Fri, 29 May 2009)
New Revision: 6798

Modified:
   trunk/data/qcsrc/server/bots.qc
Log:
Minor cleanup

Modified: trunk/data/qcsrc/server/bots.qc
===================================================================
--- trunk/data/qcsrc/server/bots.qc	2009-05-30 00:22:59 UTC (rev 6797)
+++ trunk/data/qcsrc/server/bots.qc	2009-05-30 00:42:16 UTC (rev 6798)
@@ -1907,7 +1907,9 @@
 vector shotorg;
 vector shotdir;
 
-.float bot_team, bot_checked;
+.float bot_forced_team;
+.float bot_config_loaded;
+
 void bot_setnameandstuff()
 {
 	local string readfile, s;
@@ -1954,8 +1956,8 @@
 	if(argv(4) != "" && stof(argv(4)) >= 0) bot_pants = argv(4);
 	else bot_pants = ftos(floor(random() * 15));
 
-	self.bot_team = stof(argv(5));
-	self.bot_checked = 1;
+	self.bot_forced_team = stof(argv(5));
+	self.bot_config_loaded = TRUE;
 	prefix = cvar_string("bot_prefix");
 	suffix = cvar_string("bot_suffix");
 
@@ -2470,15 +2472,16 @@
 	self.isbot = TRUE;
 	self.createdtime = self.nextthink;
 
-	if(!self.bot_checked) // This is needed so team overrider doesn't break between matches
+	if(!self.bot_config_loaded) // This is needed so team overrider doesn't break between matches
 		bot_setnameandstuff();
-	if(self.bot_team==1)
+
+	if(self.bot_forced_team==1)
 		self.team = COLOR_TEAM1;
-	else if(self.bot_team==2)
+	else if(self.bot_forced_team==2)
 		self.team = COLOR_TEAM2;
-	else if(self.bot_team==3)
+	else if(self.bot_forced_team==3)
 		self.team = COLOR_TEAM3;
-	else if(self.bot_team==4)
+	else if(self.bot_forced_team==4)
 		self.team = COLOR_TEAM4;
 	else
 		JoinBestTeam(self, FALSE, TRUE);