qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-23 02:41:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

when touching entities, it is possible for the next linked entity to be

Browse source 
freed, and thus unlinked. when this mappens, make sure the pointer to the
next entity to be touched gets updated appropriatly.
This commit is contained in:
Bill Currie 2002-02-25 03:24:46 +00:00
parent 8e31211266
commit d5ed3bea75
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nq/source/world.c
View file

@ -245,6 +245,9 @@ SV_ClearWorld (void)
SV_CreateAreaNode (0, sv.worldmodel->mins, sv.worldmodel->maxs);
}
link_t **sv_link_next;
link_t **sv_link_prev;
void
SV_UnlinkEdict (edict_t *ent)
@ -252,6 +255,10 @@ SV_UnlinkEdict (edict_t *ent)
if (!ent->area.prev)
return; // not linked in anywhere
RemoveLink (&ent->area);
if (sv_link_next && *sv_link_next == &ent->area)
*sv_link_next = ent->area.next;
if (sv_link_prev && *sv_link_prev == &ent->area)
*sv_link_prev = ent->area.prev;
ent->area.prev = ent->area.next = NULL;
}
@ -264,6 +271,7 @@ SV_TouchLinks (edict_t *ent, areanode_t *node)
link_t *l, *next;
// touch linked edicts
sv_link_next = &next;
for (l = node->trigger_edicts.next; l != &node->trigger_edicts; l = next) {
next = l->next;
touch = EDICT_FROM_AREA (l);
@ -291,6 +299,7 @@ SV_TouchLinks (edict_t *ent, areanode_t *node)
*sv_globals.self = old_self;
*sv_globals.other = old_other;
}
sv_link_next = 0;
// recurse down both sides
if (node->axis == -1)

9
qw/source/world.c
View file

@ -245,6 +245,9 @@ SV_ClearWorld (void)
SV_CreateAreaNode (0, sv.worldmodel->mins, sv.worldmodel->maxs);
}
link_t **sv_link_next;
link_t **sv_link_prev;
void
SV_UnlinkEdict (edict_t *ent)
@ -252,6 +255,10 @@ SV_UnlinkEdict (edict_t *ent)
if (!ent->area.prev)
return; // not linked in anywhere
RemoveLink (&ent->area);
if (sv_link_next && *sv_link_next == &ent->area)
*sv_link_next = ent->area.next;
if (sv_link_prev && *sv_link_prev == &ent->area)
*sv_link_prev = ent->area.prev;
ent->area.prev = ent->area.next = NULL;
}
@ -264,6 +271,7 @@ SV_TouchLinks (edict_t *ent, areanode_t *node)
link_t *l, *next;
// touch linked edicts
sv_link_next = &next;
for (l = node->trigger_edicts.next; l != &node->trigger_edicts; l = next) {
next = l->next;
touch = EDICT_FROM_AREA (l);
@ -291,6 +299,7 @@ SV_TouchLinks (edict_t *ent, areanode_t *node)
*sv_globals.self = old_self;
*sv_globals.other = old_other;
}
sv_link_next = 0;
// recurse down both sides
if (node->axis == -1)