Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-20 06:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

merging

Browse Source
This commit is contained in:
Eduardo Bart
2011-05-01 15:51:46 -03:00
parent 32a8ed3871 c1b2b3ed3a
commit f7bb044f48
5 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/framework/graphics/image.cpp
View File

@@ -47,7 +47,8 @@ Image::Image(const std::string& texture, Rect textureCoords) :
void Image::draw(const Rect& screenCoords)
{
g_graphics.drawTexturedRect(screenCoords, m_texture, m_textureCoords);
if(m_texture)
g_graphics.drawTexturedRect(screenCoords, m_texture, m_textureCoords);
}

15
src/framework/graphics/textures.cpp
View File

@@ -45,19 +45,24 @@ TexturePtr Textures::get(const std::string& textureFile)
// texture not found, load it
if(!texture) {
// currently only png textures are supported
if(!boost::ends_with(textureFile, ".png"))
flogFatal("FATAL ERROR: Unable to load texture %s, file format no supported.", textureFile.c_str());
if(!boost::ends_with(textureFile, ".png")) {
flogError("ERROR: Unable to load texture %s, file format no supported.", textureFile.c_str());
return texture;
}
// load texture file data
uint fileSize;
uchar *textureFileData = g_resources.loadFile(textureFile, &fileSize);
if(!textureFileData)
flogFatal("FATAL ERROR: Unable to load texture %s, file could not be read.", textureFile.c_str());
if(!textureFileData) {
flogError("ERROR: Unable to load texture %s, file could not be read.", textureFile.c_str());
return texture;
}
// load the texture
texture = TexturePtr(TextureLoader::loadPNG(textureFileData));
if(!texture)
flogFatal("FATAL ERROR: Unable to load texture %s", textureFile.c_str());
flogError("ERROR: Unable to load texture %s", textureFile.c_str());
delete[] textureFileData;
}