mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-25 05:31:00 +00:00
- fixed: HI_START/HI_END must be checked after parsing the TEXTURES lump, not before it.
SVN r2297 (trunk)
This commit is contained in:
parent
e0419dde15
commit
82af1640fd
2 changed files with 7 additions and 4 deletions
|
@ -549,8 +549,8 @@ FTexture *FTexture::GetRedirect(bool wantwarped)
|
|||
|
||||
void FTexture::SetScaledSize(int fitwidth, int fitheight)
|
||||
{
|
||||
xScale = DivScale16(Width, fitwidth);
|
||||
yScale = DivScale16(Height,fitheight);
|
||||
xScale = FLOAT2FIXED(float(Width) / fitwidth);
|
||||
yScale = FLOAT2FIXED(float(Height) / fitheight);
|
||||
// compensate for roundoff errors
|
||||
if (MulScale16(xScale, fitwidth) != Width) xScale++;
|
||||
if (MulScale16(yScale, fitheight) != Height) yScale++;
|
||||
|
|
|
@ -822,10 +822,13 @@ void FTextureManager::AddTexturesForWad(int wadnum)
|
|||
}
|
||||
}
|
||||
|
||||
// Seventh step: Check for hires replacements.
|
||||
AddHiresTextures(wadnum);
|
||||
// Check for text based texture definitions
|
||||
LoadTextureDefs(wadnum, "TEXTURES");
|
||||
LoadTextureDefs(wadnum, "HIRESTEX");
|
||||
|
||||
// Seventh step: Check for hires replacements.
|
||||
AddHiresTextures(wadnum);
|
||||
|
||||
SortTexturesByType(firsttexture, Textures.Size());
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue