X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=csprogs.c;h=d417fa97ece0aae75c38c02f7f006e153c317ef0;hb=ef9fefb7ab57b0bfe6c159b75ea905db519c7cdd;hp=bdb0e48561ac52d54ddbfa2b7f00fee9e7bf8da6;hpb=9399e2dd28d4db4dde5fc1f03af9cbf2c3aad3ac;p=xonotic%2Fdarkplaces.git

diff --git a/csprogs.c b/csprogs.c
index bdb0e485..d417fa97 100644
--- a/csprogs.c
+++ b/csprogs.c
@@ -976,13 +976,13 @@ void CL_VM_Init (void)
 	prog->globals.client->time = cl.time;
 	prog->globals.client->self = 0;
 
-	prog->globals.client->mapname = cl.worldmodel ? PRVM_SetEngineString(cl.worldmodel->name) : PRVM_SetEngineString("");
+	prog->globals.client->mapname = PRVM_SetEngineString(cl.worldname);
 	prog->globals.client->player_localentnum = cl.playerentity;
 
 	// set map description (use world entity 0)
 	val = PRVM_EDICTFIELDVALUE(prog->edicts, prog->fieldoffsets.message);
 	if(val)
-		val->string = PRVM_SetEngineString(cl.levelname);
+		val->string = PRVM_SetEngineString(cl.worldmessage);
 	VectorCopy(cl.world.mins, prog->edicts->fields.client->mins);
 	VectorCopy(cl.world.maxs, prog->edicts->fields.client->maxs);