X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=world.c;h=5f703a5d8522f413236ba1535b56ea4abfb04e11;hb=c9c011dcf7b2ee062e9493139b89fff99f63ea25;hp=6c833975188f1ef470f8e8d587a1de79cb62f9fb;hpb=c6d7670ed439522ba8be3959a0315cb8c4039a7f;p=xonotic%2Fdarkplaces.git

diff --git a/world.c b/world.c
index 6c833975..5f703a5d 100644
--- a/world.c
+++ b/world.c
@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 #include "clvm_cmds.h"
 #include "cl_collision.h"
+#include "com_list.h"
 
 /*
 
@@ -147,10 +148,10 @@ void World_UnlinkAll(world_t *world)
 	// unlink all entities one by one
 	grid = &world->areagrid_outside;
 	while (grid->list.next != &grid->list)
-		World_UnlinkEdict(PRVM_EDICT_NUM(List_Entry(*grid->list.next, link_t, list)->entitynumber));
+		World_UnlinkEdict(PRVM_EDICT_NUM(List_Entry(grid->list.next, link_t, list)->entitynumber));
 	for (i = 0, grid = world->areagrid;i < AREA_GRIDNODES;i++, grid++)
 		while (grid->list.next != &grid->list)
-			World_UnlinkEdict(PRVM_EDICT_NUM(List_Entry(*grid->list.next, link_t, list)->entitynumber));
+			World_UnlinkEdict(PRVM_EDICT_NUM(List_Entry(grid->list.next, link_t, list)->entitynumber));
 }
 
 /*
@@ -172,7 +173,6 @@ int World_EntitiesInBox(world_t *world, const vec3_t requestmins, const vec3_t r
 {
 	prvm_prog_t *prog = world->prog;
 	int numlist;
-	llist_t *pos;
 	link_t *grid;
 	link_t *l;
 	prvm_edict_t *ent;
@@ -215,9 +215,8 @@ int World_EntitiesInBox(world_t *world, const vec3_t requestmins, const vec3_t r
 	if (world->areagrid_outside.list.next)
 	{
 		grid = &world->areagrid_outside;
-		List_For_Each(pos, &grid->list)
+		List_For_Each_Entry(l, &grid->list, list)
 		{
-			l = List_Entry(*pos, link_t, list);
 			ent = PRVM_EDICT_NUM(l->entitynumber);
 			if (ent->priv.server->areagridmarknumber != world->areagrid_marknumber)
 			{
@@ -240,9 +239,8 @@ int World_EntitiesInBox(world_t *world, const vec3_t requestmins, const vec3_t r
 		{
 			if (grid->list.next)
 			{
-				List_For_Each(pos, &grid->list)
+				List_For_Each_Entry(l, &grid->list, list)
 				{
-					l = List_Entry(*pos, link_t, list);
 					ent = PRVM_EDICT_NUM(l->entitynumber);
 					if (ent->priv.server->areagridmarknumber != world->areagrid_marknumber)
 					{