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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-08-04 14:52:22 -0400 (Tue, 04 Aug 2009)
New Revision: 7334

Modified:
   trunk/data/qcsrc/server/bots.qc
Log:
fix bot name selection in campaign


Modified: trunk/data/qcsrc/server/bots.qc
===================================================================
--- trunk/data/qcsrc/server/bots.qc	2009-08-04 18:44:01 UTC (rev 7333)
+++ trunk/data/qcsrc/server/bots.qc	2009-08-04 18:52:22 UTC (rev 7334)
@@ -2007,8 +2007,16 @@
 	string bot_name, bot_model, bot_skin, bot_shirt, bot_pants;
 	string name, prefix, suffix;
 
-	prefix = cvar_string("bot_prefix");
-	suffix = cvar_string("bot_suffix");
+ 	if(cvar("g_campaign"))
+	{
+		prefix = "";
+		suffix = "";
+	}
+	else
+	{
+		prefix = cvar_string("bot_prefix");
+		suffix = cvar_string("bot_suffix");
+	}
 
 	file = fopen(cvar_string("bot_config_file"), FILE_READ);
 
@@ -2078,10 +2086,7 @@
 	self.playermodel = self.playermodel_freeme = strzone(strcat("models/player/", bot_model));
 	self.playerskin = self.playerskin_freeme = strzone(bot_skin);
 
- 	if(!cvar("g_campaign"))
- 		self.netname = self.netname_freeme = strzone(strcat(prefix, name, suffix));
- 	else
- 		self.netname = self.netname_freeme = strzone(name);
+	self.netname = self.netname_freeme = strzone(strcat(prefix, name, suffix));
 };
 
 float bot_custom_weapon;