- renamed some fixed point stuff in the texture composition code.

This commit is contained in:
Christoph Oelckers 2016-03-24 16:16:45 +01:00
commit 5bf806e478
5 changed files with 35 additions and 25 deletions

View file

@ -230,12 +230,12 @@ bool P_GetMidTexturePosition(const line_t *line, int sideno, fixed_t *ptextop, f
FTexture * tex= TexMan(texnum);
if (!tex) return false;
fixed_t totalscale = abs(FixedMul(side->GetTextureYScale(side_t::mid), tex->yScale));
double totalscale = fabs(FIXED2DBL(side->GetTextureYScale(side_t::mid)) * tex->GetScaleY());
fixed_t y_offset = side->GetTextureYOffset(side_t::mid);
fixed_t textureheight = tex->GetScaledHeight(totalscale) << FRACBITS;
if (totalscale != FRACUNIT && !tex->bWorldPanning)
if (totalscale != 1. && !tex->bWorldPanning)
{
y_offset = FixedDiv(y_offset, totalscale);
y_offset = fixed_t(y_offset * totalscale);
}
if(line->flags & ML_DONTPEGBOTTOM)