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

- fixed checkForHacks placement.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-19 19:52:03 +02:00
parent 8dbc727178
commit b7ea483323
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/textures/multipatchtexturebuilder.cpp
View file

@ -843,8 +843,6 @@ void FMultipatchTextureBuilder::ResolvePatches(BuildInfo &buildinfo)
i--;
}
}
checkForHacks(buildinfo);
}
void FMultipatchTextureBuilder::ResolveAllPatches()
@ -891,6 +889,7 @@ void FMultipatchTextureBuilder::ResolveAllPatches()
{
// If this texture is just a wrapper around a single patch, we can simply
// use that patch's image directly here.
checkForHacks(buildinfo);
bool done = false;
if (buildinfo.Parts.Size() == 1)
@ -912,7 +911,6 @@ void FMultipatchTextureBuilder::ResolveAllPatches()
auto itex = new FImageTexture(img);
AddImageToTexture(itex, buildinfo);
}
BuiltTextures.Delete(i);
donesomething = true;
}

5
src/d_main.cpp
View file

@ -112,6 +112,7 @@
#include "formats/multipatchtexture.h"
#include "scriptutil.h"
#include "v_palette.h"
#include "texturemanager.h"
#ifdef __unix__
#include "i_system.h" // for SHARE_DIR
@ -2681,9 +2682,7 @@ static void CheckForHacks(BuildInfo& buildinfo)
buildinfo.Parts.Size() == 1)
{
// This must alter the size of both the texture image and the game texture.
buildinfo.Height = buildinfo.Parts[0].TexImage->GetHeight();
buildinfo.texture->GetTexture()->SetSize(buildinfo.texture->GetTexelWidth(), buildinfo.Height);
buildinfo.texture->SetSize(buildinfo.texture->GetTexelWidth(), buildinfo.Height);
buildinfo.Height = buildinfo.Parts[0].TexImage->GetImage()->GetHeight();
return;
}