duplicated PRVM_ExecuteProgram to become MVM_ExecuteProgram,

[xonotic/darkplaces.git] / world.c

diff --git a/world.c b/world.c
index f332f0399c52ea5f221237d4c383708bae3ae2fa..20abb84aadc1ccba954e669a59d1cd3da0f13974 100644 (file)
--- a/world.c
+++ b/world.c
@@ -36,7 +36,7 @@ void World_Init(void)
 
 //============================================================================
 
-// World_ClearLink is used for new headnodes
+/// World_ClearLink is used for new headnodes
 void World_ClearLink (link_t *l)
 {
        l->entitynumber = 0;
@@ -80,9 +80,14 @@ World_SetSize
 
 ===============
 */
-void World_SetSize(world_t *world, const vec3_t mins, const vec3_t maxs)
+void World_SetSize(world_t *world, const char *filename, const vec3_t mins, const vec3_t maxs)
 {
        int i;
+
+       strlcpy(world->filename, filename, sizeof(world->filename));
+       VectorCopy(mins, world->mins);
+       VectorCopy(maxs, world->maxs);
+
        // the areagrid_marknumber is not allowed to be 0
        if (world->areagrid_marknumber < 1)
                world->areagrid_marknumber = 1;
@@ -230,7 +235,7 @@ void World_LinkEdict_AreaGrid(world_t *world, prvm_edict_t *ent)
 
        if (entitynumber <= 0 || entitynumber >= prog->max_edicts || PRVM_EDICT_NUM(entitynumber) != ent)
        {
-               Con_Printf ("SV_LinkEdict_AreaGrid: invalid edict %p (edicts is %p, edict compared to prog->edicts is %i)\n", ent, prog->edicts, entitynumber);
+               Con_Printf ("World_LinkEdict_AreaGrid: invalid edict %p (edicts is %p, edict compared to prog->edicts is %i)\n", (void *)ent, (void *)prog->edicts, entitynumber);
                return;
        }