diff options
| author | Michał Konopacki <konopacki.m@gmail.com> | 2012-08-13 23:46:47 +0200 |
|---|---|---|
| committer | Michał Konopacki <konopacki.m@gmail.com> | 2012-08-13 23:46:47 +0200 |
| commit | e942400c8bb9b6836bdfe705111f7ec63ef19e28 (patch) | |
| tree | 66d5aea574f5a4530492b6ab69956003427df98b /src/graphics/engine/engine.cpp | |
| parent | 9ee1d2e172162be25b113595ad16779aa0a49a87 (diff) | |
| parent | 8b2bca72dd71a1c23db51269a147443c80758f10 (diff) | |
| download | colobot-e942400c8bb9b6836bdfe705111f7ec63ef19e28.tar.gz colobot-e942400c8bb9b6836bdfe705111f7ec63ef19e28.tar.bz2 colobot-e942400c8bb9b6836bdfe705111f7ec63ef19e28.zip | |
Merge remote-tracking branch 'upstream/dev-ui' into dev-ui
Diffstat (limited to 'src/graphics/engine/engine.cpp')
| -rw-r--r-- | src/graphics/engine/engine.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp index 5988949..3187dde 100644 --- a/src/graphics/engine/engine.cpp +++ b/src/graphics/engine/engine.cpp @@ -2113,8 +2113,7 @@ Gfx::Texture Gfx::CEngine::CreateTexture(const std::string& texName, const Gfx:: if (! img.Load(m_app->GetDataFilePath(m_texPath, texName))) { std::string error = img.GetError(); - GetLogger()->Error("Couldn't load texture '%s': %s\n", texName.c_str(), error.c_str()); - GetLogger()->Error("Blacklisting texture '%s'\n", texName.c_str()); + GetLogger()->Error("Couldn't load texture '%s': %s, blacklisting\n", texName.c_str(), error.c_str()); m_texBlacklist.insert(texName); return Gfx::Texture(); // invalid texture } @@ -2123,9 +2122,7 @@ Gfx::Texture Gfx::CEngine::CreateTexture(const std::string& texName, const Gfx:: if (! tex.Valid()) { - std::string error = m_device->GetError(); - GetLogger()->Error("Couldn't load texture '%s': %s\n", texName.c_str(), error.c_str()); - GetLogger()->Error("Blacklisting texture '%s'\n", texName.c_str()); + GetLogger()->Error("Couldn't load texture '%s', blacklisting\n", texName.c_str()); m_texBlacklist.insert(texName); return tex; } |