Merge branch 'paperfix2' into 'master'

Another potential papersprite crash fix

Closes #456

See merge request STJr/SRB2Internal!605
This commit is contained in:
MascaraSnake 2019-12-05 16:19:33 -05:00
commit 114753e2fe

View file

@ -1340,9 +1340,10 @@ static void R_ProjectSprite(mobj_t *thing)
if ((range = x2 - x1) <= 0) if ((range = x2 - x1) <= 0)
return; return;
range++; // fencepost problem
scalestep = (yscale2 - yscale)/range; scalestep = (yscale2 - yscale)/range;
scalestep = scalestep ? scalestep : 1; xscale = FixedDiv(range<<FRACBITS, abs(offset2));
xscale = FixedDiv(range<<FRACBITS, abs(offset2))+1;
// The following two are alternate sorting methods which might be more applicable in some circumstances. TODO - maybe enable via MF2? // The following two are alternate sorting methods which might be more applicable in some circumstances. TODO - maybe enable via MF2?
// sortscale = max(yscale, yscale2); // sortscale = max(yscale, yscale2);