fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-24 13:01:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert SV_TouchLinks changes from fitzquake

Browse source 
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1484 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
ewasylishen 2017-08-28 02:15:03 +00:00
parent a02779a14c
commit 04f495ae00
1 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
quakespasm/Quake/world.c
View file

@ -288,14 +288,6 @@ void SV_TouchLinks ( edict_t *ent, areanode_t *node )
// touch linked edicts // touch linked edicts
for (l = node->trigger_edicts.next ; l != &node->trigger_edicts ; l = next) for (l = node->trigger_edicts.next ; l != &node->trigger_edicts ; l = next)
{ {
//johnfitz -- fixes a crash when a touch function deletes an entity which comes later in the list
if (!l)
{
Con_Printf ("SV_TouchLinks: null link\n");
break;
}
//johnfitz
next = l->next; next = l->next;
touch = EDICT_FROM_AREA(l); touch = EDICT_FROM_AREA(l);
if (touch == ent) if (touch == ent)
@ -317,14 +309,6 @@ void SV_TouchLinks ( edict_t *ent, areanode_t *node )
pr_global_struct->time = sv.time; pr_global_struct->time = sv.time;
PR_ExecuteProgram (touch->v.touch); PR_ExecuteProgram (touch->v.touch);
//johnfitz -- the PR_ExecuteProgram above can alter the linked edicts -- fix from tyrquake
if (next != l->next && l->next)
{
Con_Printf ("SV_TouchLinks: next != l->next\n");
next = l->next;
}
//johnfitz
pr_global_struct->self = old_self; pr_global_struct->self = old_self;
pr_global_struct->other = old_other; pr_global_struct->other = old_other;
} }