X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_parse.c;h=5931a7da716212c46f01af204a010a0c91aeba44;hb=8170bc8cb3e7dd0bff36840bd4c16b5dd2e5e616;hp=a0d340b276b2634cc03816ec48ef15dca9673d49;hpb=0ced124f9998c69376edfb828a7001e1aa91ac39;p=xonotic%2Fdarkplaces.git

diff --git a/cl_parse.c b/cl_parse.c
index a0d340b2..5931a7da 100644
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -452,7 +452,7 @@ static void CL_SetupWorldModel(void)
 	{
 		strlcpy(cl.worldname, cl.worldmodel->name, sizeof(cl.worldname));
 		FS_StripExtension(cl.worldname, cl.worldnamenoextension, sizeof(cl.worldnamenoextension));
-		strlcpy(cl.worldbasename, !strncmp(cl.worldnamenoextension, "maps/", 5) ? cl.worldnamenoextension + 4 : cl.worldnamenoextension, sizeof(cl.worldbasename));
+		strlcpy(cl.worldbasename, !strncmp(cl.worldnamenoextension, "maps/", 5) ? cl.worldnamenoextension + 5 : cl.worldnamenoextension, sizeof(cl.worldbasename));
 		Cvar_SetQuick(&cl_worldmessage, cl.worldmessage);
 		Cvar_SetQuick(&cl_worldname, cl.worldname);
 		Cvar_SetQuick(&cl_worldnamenoextension, cl.worldnamenoextension);
@@ -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 + 5 : cl.worldnamenoextension, sizeof(cl.worldbasename));
 		Cvar_SetQuick(&cl_worldmessage, cl.worldmessage);
 		Cvar_SetQuick(&cl_worldname, cl.worldname);
 		Cvar_SetQuick(&cl_worldnamenoextension, cl.worldnamenoextension);
@@ -2864,7 +2864,7 @@ void CL_ParseTrailParticles(void)
 	effectindex = (unsigned short)MSG_ReadShort();
 	MSG_ReadVector(start, cls.protocol);
 	MSG_ReadVector(end, cls.protocol);
-	CL_ParticleEffect(effectindex, VectorDistance(start, end), start, end, vec3_origin, vec3_origin, entityindex > 0 ? cl.entities + entityindex : NULL, 0);
+	CL_ParticleEffect(effectindex, 1, start, end, vec3_origin, vec3_origin, entityindex > 0 ? cl.entities + entityindex : NULL, 0);
 }
 
 void CL_ParsePointParticles(void)