X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=world.c;h=a9192494a5535e31cb2b25fc5668aa2dd846cbd5;hb=cc8f0a961ced175ad07c383758275764657637b6;hp=b178bad212bed4025cc0b2ffd4d02a02c7703a89;hpb=da678034f2cd88eff4b8f5c98ca628cd23893fe3;p=xonotic%2Fdarkplaces.git

diff --git a/world.c b/world.c
index b178bad2..a9192494 100644
--- a/world.c
+++ b/world.c
@@ -76,13 +76,18 @@ void World_PrintAreaStats(world_t *world, const char *worldname)
 
 /*
 ===============
-World_Clear
+World_SetSize
 
 ===============
 */
-void World_Clear(world_t *world)
+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;
@@ -105,9 +110,28 @@ void World_Clear(world_t *world)
 	World_ClearLink(&world->areagrid_outside);
 	for (i = 0;i < AREA_GRIDNODES;i++)
 		World_ClearLink(&world->areagrid[i]);
-	Con_DPrintf("areagrid settings: divisions %ix%ix1 : box %f %f %f : %f %f %f size %f %f %f grid %f %f %f (mingrid %f)\n", AREA_GRID, AREA_GRID, world->areagrid_mins[0], world->areagrid_mins[1], world->areagrid_mins[2], world->areagrid_maxs[0], world->areagrid_maxs[1], world->areagrid_maxs[2], world->areagrid_size[0], world->areagrid_size[1], world->areagrid_size[2], 1.0f / world->areagrid_scale[0], 1.0f / world->areagrid_scale[1], 1.0f / world->areagrid_scale[2], sv_areagrid_mingridsize.value);
+	if (developer.integer >= 10)
+		Con_Printf("areagrid settings: divisions %ix%ix1 : box %f %f %f : %f %f %f size %f %f %f grid %f %f %f (mingrid %f)\n", AREA_GRID, AREA_GRID, world->areagrid_mins[0], world->areagrid_mins[1], world->areagrid_mins[2], world->areagrid_maxs[0], world->areagrid_maxs[1], world->areagrid_maxs[2], world->areagrid_size[0], world->areagrid_size[1], world->areagrid_size[2], 1.0f / world->areagrid_scale[0], 1.0f / world->areagrid_scale[1], 1.0f / world->areagrid_scale[2], sv_areagrid_mingridsize.value);
 }
 
+/*
+===============
+World_UnlinkAll
+
+===============
+*/
+void World_UnlinkAll(world_t *world)
+{
+	int i;
+	link_t *grid;
+	// unlink all entities one by one
+	grid = &world->areagrid_outside;
+	while (grid->next != grid)
+		World_UnlinkEdict(PRVM_EDICT_NUM(grid->next->entitynumber));
+	for (i = 0, grid = world->areagrid;i < AREA_GRIDNODES;i++, grid++)
+		while (grid->next != grid)
+			World_UnlinkEdict(PRVM_EDICT_NUM(grid->next->entitynumber));
+}
 
 /*
 ===============