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:
commit
b9fb6182ac
|
@ -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:
|
||||||
|
|
Loading…
Reference in New Issue