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

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Fri May 29 16:56:31 EDT 2009


Author: div0
Date: 2009-05-29 16:56:31 -0400 (Fri, 29 May 2009)
New Revision: 6791

Modified:
   trunk/data/qcsrc/server/bots.qc
Log:
#101


Modified: trunk/data/qcsrc/server/bots.qc
===================================================================
--- trunk/data/qcsrc/server/bots.qc	2009-05-29 20:52:23 UTC (rev 6790)
+++ trunk/data/qcsrc/server/bots.qc	2009-05-29 20:56:31 UTC (rev 6791)
@@ -1907,7 +1907,7 @@
 vector shotorg;
 vector shotdir;
 
-.float bot_team;
+.float bot_team, bot_checked;
 void bot_setnameandstuff()
 {
 	local string readfile, s;
@@ -1955,6 +1955,7 @@
 	else bot_pants = ftos(floor(random() * 15));
 
 	self.bot_team = stof(argv(5));
+	self.bot_checked = 1;
 	prefix = cvar_string("bot_prefix");
 	suffix = cvar_string("bot_suffix");
 
@@ -2469,6 +2470,8 @@
 	self.isbot = TRUE;
 	self.createdtime = self.nextthink;
 
+	if(!self.bot_checked) // This is needed so team overrider doesn't break between matches
+		bot_setnameandstuff();
 	if(self.bot_team==1)
 		self.team = COLOR_TEAM1;
 	else if(self.bot_team==2)
@@ -2477,7 +2480,7 @@
 		self.team = COLOR_TEAM3;
 	else if(self.bot_team==4)
 		self.team = COLOR_TEAM4;
-	else 
+	else
 		JoinBestTeam(self, FALSE, TRUE);
 
 	havocbot_setupbot();



More information about the nexuiz-commits mailing list