stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-23 03:12:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'amycrash' into 'master'

Browse source 
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
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)
return;
if ((--mobj->fuse) < 6)
if (mobj->fuse < 6)
mobj->frame = (mobj->frame & ~FF_TRANSMASK) | ((10 - (mobj->fuse*2)) << (FF_TRANSSHIFT));
mobj->fuse--;
}
break;
case MT_FINISHFLAG:
@ -11594,7 +11595,7 @@ void P_AfterPlayerSpawn(INT32 playernum)
if (CheckForReverseGravity)
P_CheckGravity(mobj, false);
if (p->pflags & PF_FINISHED)
P_GiveFinishFlags(p);
}