From 2b1d5514980874543806e4f4a4f6ce82ef4b505e Mon Sep 17 00:00:00 2001 From: havoc Date: Tue, 11 May 2010 09:35:09 +0000 Subject: [PATCH] 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 ::stable-branch::merge=064213f25fd7d96bf1608bdbdb1e604ff0efd9f5 --- cl_parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- 2.39.2