X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=csprogs.c;h=d417fa97ece0aae75c38c02f7f006e153c317ef0;hb=76e4c7368717520b5182d72f596bdbfd97a3860b;hp=d8a396756c10202ff9981deab604b046b557e3a6;hpb=f2467d484c38a13d23bb92f91c19a9d6a71f7bec;p=xonotic%2Fdarkplaces.git

diff --git a/csprogs.c b/csprogs.c
index d8a39675..d417fa97 100644
--- a/csprogs.c
+++ b/csprogs.c
@@ -738,7 +738,7 @@ void CL_VM_CB_EndIncreaseEdicts(void)
 	prvm_edict_t *ent;
 
 	// link every entity except world
-	for (i = 1, ent = prog->edicts;i < prog->max_edicts;i++, ent++)
+	for (i = 1, ent = prog->edicts;i < prog->num_edicts;i++, ent++)
 		if (!ent->priv.server->free)
 			CL_LinkEdict(ent);
 }
@@ -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);