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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-05-31 08:12:20 -0400 (Sun, 31 May 2009)
New Revision: 6823

Modified:
   trunk/data/qcsrc/server/bots.qc
   trunk/data/qcsrc/server/cl_client.qc
Log:
less leaks for everyone


Modified: trunk/data/qcsrc/server/bots.qc
===================================================================
--- trunk/data/qcsrc/server/bots.qc	2009-05-31 12:12:01 UTC (rev 6822)
+++ trunk/data/qcsrc/server/bots.qc	2009-05-31 12:12:20 UTC (rev 6823)
@@ -1874,6 +1874,8 @@
 entity bot_list;
 .entity nextbot;
 .string netname_freeme;
+.string playermodel_freeme;
+.string playerskin_freeme;
 
 float sv_maxspeed;
 .float createdtime;
@@ -1972,13 +1974,13 @@
 		name = bot_name;
 
 	// pick the model and skin
-	self.playermodel = strzone(strcat("models/player/", bot_model, ".zym"));
-	self.playerskin = strzone(bot_skin);
+	self.playermodel = self.playermodel_freeme = strzone(strcat("models/player/", bot_model, ".zym"));
+	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 = name;
+ 		self.netname = self.netname_freeme = strzone(name);
 };
 
 float bot_custom_weapon;
@@ -2459,7 +2461,13 @@
 		return;
 	if(self.netname_freeme)
 		strunzone(self.netname_freeme);
+	if(self.playermodel_freeme)
+		strunzone(self.playermodel_freeme);
+	if(self.playerskin_freeme)
+		strunzone(self.playerskin_freeme);
 	self.netname_freeme = string_null;
+	self.playermodel_freeme = string_null;
+	self.playerskin_freeme = string_null;
 }
 
 void bot_clientconnect()

Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2009-05-31 12:12:01 UTC (rev 6822)
+++ trunk/data/qcsrc/server/cl_client.qc	2009-05-31 12:12:20 UTC (rev 6823)
@@ -1453,6 +1453,8 @@
 
 	if(self.netname_previous)
 		strunzone(self.netname_previous);
+	if(self.clientstatus)
+		strunzone(self.clientstatus);
 
 	ClearPlayerSounds();