walkero
/
blobwarsAttrition
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Remove dead entities as soon as possible, to prevent dangling pointers.

This commit is contained in:
Steve 2018-02-11 07:59:11 +00:00
parent 34b97bcc27
commit 284436f8c9
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/world/entities.c
View File

@ -90,6 +90,22 @@ void doEntities(void)
removeFromQuadtree(self, &world.quadtree); removeFromQuadtree(self, &world.quadtree);
if (self->alive == ALIVE_DEAD)
{
prev->next = self->next;
if (self == world.entityTail)
{
world.entityTail = prev;
}
free(self);
self = prev;
continue;
}
self->isVisible = 0; self->isVisible = 0;
if (self->flags & EF_TELEPORTING) if (self->flags & EF_TELEPORTING)
@ -183,20 +199,7 @@ void doEntities(void)
self->isVisible = 0; self->isVisible = 0;
} }
if (self->alive == ALIVE_DEAD) if (self->alive == ALIVE_ALIVE)
{
prev->next = self->next;
if (self == world.entityTail)
{
world.entityTail = prev;
}
free(self);
self = prev;
}
else if (self->alive == ALIVE_ALIVE)
{ {
if (self->health <= 0) if (self->health <= 0)
{ {