Merge branch 'no-effect5-fudging' into 'master'

p_setup: Don't fudge texture offsets if EFFECT5 and a linedef exec

See merge request STJr/SRB2Internal!193
This commit is contained in:
Digiku 2018-09-18 10:48:29 -04:00
commit a2c64d0e96

View file

@ -1331,7 +1331,8 @@ static void P_LoadLineDefs2(void)
ld->backsector = ld->sidenum[1] != 0xffff ? sides[ld->sidenum[1]].sector : 0;
// Repeat count for midtexture
if ((ld->flags & ML_EFFECT5) && (ld->sidenum[1] != 0xffff))
if ((ld->flags & ML_EFFECT5) && (ld->sidenum[1] != 0xffff)
&& !(ld->special >= 300 && ld->special < 500)) // exempt linedef exec specials
{
sides[ld->sidenum[0]].repeatcnt = (INT16)(((unsigned)sides[ld->sidenum[0]].textureoffset >> FRACBITS) >> 12);
sides[ld->sidenum[0]].textureoffset = (((unsigned)sides[ld->sidenum[0]].textureoffset >> FRACBITS) & 2047) << FRACBITS;