From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 11 May 2010 09:35:09 +0000 (+0000)
Subject: somehow I missed this edit in the other maps/ checks
X-Git-Tag: xonotic-v0.1.0preview~230^2~289
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=064213f25fd7d96bf1608bdbdb1e604ff0efd9f5;p=xonotic%2Fdarkplaces.git

somehow I missed this edit in the other maps/ checks


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10189 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/cl_parse.c b/cl_parse.c
index a0d340b2..30ee1720 100644
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -1794,7 +1794,7 @@ void CL_ParseServerInfo (void)
 		// set the base name for level-specific things...  this gets updated again by CL_SetupWorldModel later
 		strlcpy(cl.worldname, cl.model_name[1], sizeof(cl.worldname));
 		FS_StripExtension(cl.worldname, cl.worldnamenoextension, sizeof(cl.worldnamenoextension));
-		strlcpy(cl.worldbasename, FS_FileWithoutPath(cl.worldnamenoextension), sizeof(cl.worldbasename));
+		strlcpy(cl.worldbasename, !strncmp(cl.worldnamenoextension, "maps/", 5) ? cl.worldnamenoextension + 4 : cl.worldnamenoextension, sizeof(cl.worldbasename));
 		Cvar_SetQuick(&cl_worldmessage, cl.worldmessage);
 		Cvar_SetQuick(&cl_worldname, cl.worldname);
 		Cvar_SetQuick(&cl_worldnamenoextension, cl.worldnamenoextension);