1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-12-25 22:25:46 +00:00

Fix regression that prevented few textures from loading (Labyrinth mod icon, for example)

This commit is contained in:
fgenesis 2012-07-12 03:46:18 +00:00
parent 93892ff46a
commit 319b9d09ed
2 changed files with 6 additions and 2 deletions

View file

@ -110,7 +110,7 @@ std::string getSystemLocale()
size_t found = localeStr.find('.');
if (found != string::npos)
if (found != std::string::npos)
localeStr.resize(found);
}
#endif

View file

@ -281,6 +281,9 @@ void Texture::load(std::string file)
return;
}
stringToLowerUserData(file);
file = core->adjustFilenameCase(file);
loadName = file;
repeating = false;
@ -316,6 +319,7 @@ void Texture::load(std::string file)
if (found)
{
file = localisePath(file);
file = core->adjustFilenameCase(file);
/*
std::ostringstream os;
@ -606,7 +610,7 @@ ImageTGA *Texture::TGAloadMem(void *mem, int size)
// Read the width, height and bits per pixel (16, 24 or 32)
bb >> width >> height >> bits;
/*
std::ostringstream os;
os << "TGALoad: width: " << width << " height: " << height << " bits: " << bits;