thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-11 03:12:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'amyhearts-fix' into 'next'

Browse source 
Fix NPC Amy's love hearts crashing if they didn't have a set fuse

See merge request STJr/SRB2!641
This commit is contained in:
James R 2020-01-07 01:05:09 -05:00
commit 9804e15e6f
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/p_mobj.c
View file

@ -7977,15 +7977,19 @@ static void P_MobjSceneryThink(mobj_t *mobj)
mobj->x = mobj->extravalue1 + P_ReturnThrustX(mobj, mobj->movedir, mobj->cvmem*mobj->scale); mobj->x = mobj->extravalue1 + P_ReturnThrustX(mobj, mobj->movedir, mobj->cvmem*mobj->scale);
mobj->y = mobj->extravalue2 + P_ReturnThrustY(mobj, mobj->movedir, mobj->cvmem*mobj->scale); mobj->y = mobj->extravalue2 + P_ReturnThrustY(mobj, mobj->movedir, mobj->cvmem*mobj->scale);
P_SetThingPosition(mobj); P_SetThingPosition(mobj);
if ((--mobj->fuse) < 6)
if (!mobj->fuse)
{ {
if (!mobj->fuse) #ifdef HAVE_BLUA
{ if (!LUAh_MobjFuse(mobj))
#endif
P_RemoveMobj(mobj); P_RemoveMobj(mobj);
return; return;
}
mobj->frame = (mobj->frame & ~FF_TRANSMASK) | ((10 - (mobj->fuse*2)) << (FF_TRANSSHIFT));
} }
if (mobj->fuse < 0)
return;
if ((--mobj->fuse) < 6)
mobj->frame = (mobj->frame & ~FF_TRANSMASK) | ((10 - (mobj->fuse*2)) << (FF_TRANSSHIFT));
} }
break; break;
case MT_VWREF: case MT_VWREF: