Merge branch 'fix-long-lr-frames' into 'next'

Fix L/R frames not being automatically mirrored

See merge request STJr/SRB2!2519
This commit is contained in:
LJ Sonic 2024-09-19 18:53:19 +00:00
commit 3b5cfdeb3e

View file

@ -367,7 +367,7 @@ static void MirrorMissingRotations(void)
{ {
spriteframe_t *frame = &sprtemp[framenum]; spriteframe_t *frame = &sprtemp[framenum];
if (frame->rotate == SRF_NONE || !(frame->rotate & SRF_3DMASK)) if (frame->rotate == SRF_NONE || !(frame->rotate & (SRF_3DMASK | SRF_2D)))
continue; continue;
UINT8 numrotations = frame->rotate == SRF_3D ? 8 : 16; UINT8 numrotations = frame->rotate == SRF_3D ? 8 : 16;
@ -2198,7 +2198,7 @@ static void R_ProjectSprite(mobj_t *thing)
} }
else else
trans = 0; trans = 0;
if ((oldthing->flags2 & MF2_LINKDRAW) && oldthing->tracer) if ((oldthing->flags2 & MF2_LINKDRAW) && oldthing->tracer)
trans = R_GetThingTransTable(oldthing->tracer->alpha, trans); trans = R_GetThingTransTable(oldthing->tracer->alpha, trans);
else else