zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-25 05:31:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: HI_START/HI_END must be checked after parsing the TEXTURES lump, not before it.

Browse source 
SVN r2297 (trunk)
This commit is contained in:
Christoph Oelckers 2010-04-21 17:39:52 +00:00
parent e0419dde15
commit 82af1640fd
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/textures/texture.cpp
View file

@ -549,8 +549,8 @@ FTexture *FTexture::GetRedirect(bool wantwarped)
void FTexture::SetScaledSize(int fitwidth, int fitheight) void FTexture::SetScaledSize(int fitwidth, int fitheight)
{ {
xScale = DivScale16(Width, fitwidth); xScale = FLOAT2FIXED(float(Width) / fitwidth);
yScale = DivScale16(Height,fitheight); yScale = FLOAT2FIXED(float(Height) / fitheight);
// compensate for roundoff errors // compensate for roundoff errors
if (MulScale16(xScale, fitwidth) != Width) xScale++; if (MulScale16(xScale, fitwidth) != Width) xScale++;
if (MulScale16(yScale, fitheight) != Height) yScale++; if (MulScale16(yScale, fitheight) != Height) yScale++;

7
src/textures/texturemanager.cpp
View file

@ -822,10 +822,13 @@ void FTextureManager::AddTexturesForWad(int wadnum)
} }
} }
// Seventh step: Check for hires replacements. // Check for text based texture definitions
AddHiresTextures(wadnum);
LoadTextureDefs(wadnum, "TEXTURES"); LoadTextureDefs(wadnum, "TEXTURES");
LoadTextureDefs(wadnum, "HIRESTEX"); LoadTextureDefs(wadnum, "HIRESTEX");
// Seventh step: Check for hires replacements.
AddHiresTextures(wadnum);
SortTexturesByType(firsttexture, Textures.Size()); SortTexturesByType(firsttexture, Textures.Size());
} }