Merge branch 'fofflags-bruh' into 'next'

Fix flag mixup in P_GetOldFOFFlags()

Closes #995

See merge request STJr/SRB2!1958
This commit is contained in:
Monster Iestyn 2023-04-11 19:08:59 +00:00
commit b98af785f5

View file

@ -1910,10 +1910,10 @@ static INT32 P_GetOldFOFFlags(ffloor_t *fflr)
result |= FF_OLD_SPINBUST;
if (fflr->busttype == BT_STRONG)
result |= FF_OLD_STRONGBUST;
if (fflr->fofflags & FF_OLD_RIPPLE)
result |= FOF_RIPPLE;
if (fflr->fofflags & FF_OLD_COLORMAPONLY)
result |= FOF_COLORMAPONLY;
if (fflr->fofflags & FOF_RIPPLE)
result |= FF_OLD_RIPPLE;
if (fflr->fofflags & FOF_COLORMAPONLY)
result |= FF_OLD_COLORMAPONLY;
return result;
}