r1686 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2006-06-28 05:00:24 -0400 (Wed, 28 Jun 2006)
New Revision: 1686

Modified:
   trunk/data/qcsrc/server/cl_client.qc
Log:
Allow client-side CD track overrides again


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2006-06-28 08:40:53 UTC (rev 1685)
+++ trunk/data/qcsrc/server/cl_client.qc	2006-06-28 09:00:24 UTC (rev 1686)
@@ -710,8 +710,8 @@
 	self.welcomemessage_time = time + cvar("welcome_message_time");
 	self.welcomemessage_time2 = 0;
 
-	//stuffcmd(self, strcat("exec maps/", mapname, ".cfg\n"));
-	// the client might not have that file yet!
+	// the client might not have his maps/%s.cfg file yet!
+	// so send the one from the server...
 	fh = fopen(strcat("maps/", mapname, ".cfg"), FILE_READ);
 	if(fh >= 0)
 	{
@@ -719,10 +719,12 @@
 			stuffcmd(self, strcat(s, "\n"));
 		fclose(fh);
 	}
+	// and then execute the client's so he can still override CD tracks
+	stuffcmd(self, strcat("exec maps/", mapname, ".cfg\n"));
+
 	// TODO: is this being used for anything else than cd tracks?
 	// Remember: SVC_CDTRACK exists. Maybe it should be used.
 	
-	
 	// send prediction settings to the client
 	stuffcmd(self, strcat("cl_movement_accelerate ", ftos(cvar("sv_accelerate")), "\n"));
 	stuffcmd(self, strcat("cl_movement_friction ", ftos(cvar("sv_friction")), "\n"));