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

Merge branch 'amycrash' into 'master' 

Fix Amy cameo's love hearts crashing the Software renderer due to invalid translucency tables

See merge request STJr/SRB2!823
This commit is contained in:
Jaime Passos 2020-02-25 20:38:15 -05:00
parent 711c8ed6b4 fe93155578
commit b9fb6182ac
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/p_mobj.c
View File

@ -8001,8 +8001,9 @@ static void P_MobjSceneryThink(mobj_t *mobj)
} }
if (mobj->fuse < 0) if (mobj->fuse < 0)
return; return;
if ((--mobj->fuse) < 6) if (mobj->fuse < 6)
mobj->frame = (mobj->frame & ~FF_TRANSMASK) | ((10 - (mobj->fuse*2)) << (FF_TRANSSHIFT)); mobj->frame = (mobj->frame & ~FF_TRANSMASK) | ((10 - (mobj->fuse*2)) << (FF_TRANSSHIFT));
mobj->fuse--;
} }
break; break;
case MT_FINISHFLAG: case MT_FINISHFLAG:
@ -11594,7 +11595,7 @@ void P_AfterPlayerSpawn(INT32 playernum)
if (CheckForReverseGravity) if (CheckForReverseGravity)
P_CheckGravity(mobj, false); P_CheckGravity(mobj, false);
if (p->pflags & PF_FINISHED) if (p->pflags & PF_FINISHED)
P_GiveFinishFlags(p); P_GiveFinishFlags(p);
} }