lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'idk-what-to-call-this-branch' into 'next'

Browse source 
A_SetObjectFlags tweak

Only reset the sector/blockmap links on an object calling A_SetObjectFlags if the MF_NOSECTOR|MF_NOBLOCKMAP flags change. Fixes a freeze related to LD442 demonstrated in MascaraSnake's example WAD at https://dl.dropboxusercontent.com/u/27962790/statetest.wad .

See merge request !11
This commit is contained in:
Alam Ed Arias 2015-06-18 10:06:46 -04:00
parent f0054be951 ddd66b9eff
commit b2e330d64c
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/p_enemy.c
View file

@ -7650,26 +7650,33 @@ void A_SetObjectFlags(mobj_t *actor)
{ {
INT32 locvar1 = var1; INT32 locvar1 = var1;
INT32 locvar2 = var2; INT32 locvar2 = var2;
boolean unlinkthings = false;
#ifdef HAVE_BLUA #ifdef HAVE_BLUA
if (LUA_CallAction("A_SetObjectFlags", actor)) if (LUA_CallAction("A_SetObjectFlags", actor))
return; return;
#endif #endif
P_UnsetThingPosition(actor); if (locvar2 == 2)
if (sector_list) locvar1 = actor->flags | locvar1;
{ else if (locvar2 == 1)
P_DelSeclist(sector_list); locvar1 = actor->flags & ~locvar1;
sector_list = NULL;
if ((locvar1 & (MF_NOBLOCKMAP|MF_NOSECTOR)) != (actor->flags & (MF_NOBLOCKMAP|MF_NOSECTOR))) // Blockmap/sector status has changed, so reset the links
unlinkthings = true;
if (unlinkthings) {
P_UnsetThingPosition(actor);
if (sector_list)
{
P_DelSeclist(sector_list);
sector_list = NULL;
}
} }
if (locvar2 == 2) actor->flags = locvar1;
actor->flags |= locvar1;
else if (locvar2 == 1)
actor->flags &= ~locvar1;
else
actor->flags = locvar1;
P_SetThingPosition(actor); if (unlinkthings)
P_SetThingPosition(actor);
} }
// Function: A_SetObjectFlags2 // Function: A_SetObjectFlags2