projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4cfce5f
)
Octo's patch from bug 523.
author
Mathnerd314
<man.is.allan@gmail.com>
Wed, 20 Jan 2010 23:35:46 +0000
(23:35 +0000)
committer
Mathnerd314
<man.is.allan@gmail.com>
Wed, 20 Jan 2010 23:35:46 +0000
(23:35 +0000)
SVN-Revision: 6266
src/video/texture_manager.cpp
patch
|
blob
|
history
diff --git
a/src/video/texture_manager.cpp
b/src/video/texture_manager.cpp
index
e49423b
..
83313f3
100644
(file)
--- a/
src/video/texture_manager.cpp
+++ b/
src/video/texture_manager.cpp
@@
-67,7
+67,7
@@
TextureManager::get(const std::string& _filename)
if(!texture) {
texture = create_image_texture(filename);
if(!texture) {
texture = create_image_texture(filename);
- image_textures[
filename
] = texture;
+ image_textures[
texture->get_filename()
] = texture;
}
return texture;
}
return texture;
@@
-111,6
+111,7
@@
TextureManager::create_image_texture(const std::string& filename, const Rect& re
{
log_warning << "Couldn't load texture '" << filename << "' (now using dummy texture): " << err.what() << std::endl;
TexturePtr texture = create_dummy_texture();
{
log_warning << "Couldn't load texture '" << filename << "' (now using dummy texture): " << err.what() << std::endl;
TexturePtr texture = create_dummy_texture();
+ texture->set_filename(filename);
return texture;
}
}
return texture;
}
}
@@
-167,6
+168,7
@@
TextureManager::create_image_texture(const std::string& filename)
{
log_warning << "Couldn't load texture '" << filename << "' (now using dummy texture): " << err.what() << std::endl;
TexturePtr texture = create_dummy_texture();
{
log_warning << "Couldn't load texture '" << filename << "' (now using dummy texture): " << err.what() << std::endl;
TexturePtr texture = create_dummy_texture();
+ texture->set_filename(filename);
return texture;
}
}
return texture;
}
}