mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-10-05 13:51:04 +00:00
Code Issues Releases Wiki Activity

Fix rare texture loading problems introduced in 8bd40be8aa and f0d580d873.

Browse source
This commit is contained in:
fgenesis 2016-03-13 01:37:43 +01:00
commit 62c949f640
5 changed files with 29 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
BBGE/Texture.cpp
View file

@ -69,6 +69,7 @@ Texture::Texture()
repeating = false;
pngSetStandardOrientation(0);
ow = oh = -1;
loadResult = TEX_FAILED;
}
Texture::~Texture()
@ -262,6 +263,7 @@ void Texture::reload()
bool Texture::load(std::string file)
{
loadResult = TEX_FAILED;
if (file.size()<4)
{
errorLog("Texture Name is Empty or Too Short");
@ -430,6 +432,7 @@ bool Texture::loadPNG(const std::string &file)
width = info.Width;
height = info.Height;
good = true;
loadResult = TEX_SUCCESS;
}
else
{
@ -486,6 +489,7 @@ bool Texture::loadTGA(ImageTGA *imageTGA)
delete[] (imageTGA->data);
free (imageTGA);
loadResult = TEX_SUCCESS;
return true;
}