summaryrefslogtreecommitdiff
path: root/src/resources/imageloader.cpp
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-10-19 17:46:46 +0000
committerGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-10-19 17:46:46 +0000
commit41cf359468d6379bc0e033bee9ac148d1b9255dd (patch)
treed351692d76e861607fd504366ae22374613b0fec /src/resources/imageloader.cpp
parentc3e36e443698b001e98219e48cc97e259ada0a1d (diff)
downloadmana-client-41cf359468d6379bc0e033bee9ac148d1b9255dd.tar.gz
mana-client-41cf359468d6379bc0e033bee9ac148d1b9255dd.tar.bz2
mana-client-41cf359468d6379bc0e033bee9ac148d1b9255dd.tar.xz
mana-client-41cf359468d6379bc0e033bee9ac148d1b9255dd.zip
Factored code between resource handlers. Implemented failure-friendly sprite loader.
Diffstat (limited to 'src/resources/imageloader.cpp')
-rw-r--r--src/resources/imageloader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp
index b2053dcc..6ec5fe8f 100644
--- a/src/resources/imageloader.cpp
+++ b/src/resources/imageloader.cpp
@@ -85,7 +85,7 @@ void ProxyImage::convertToDisplayFormat()
font. Get rid of them. */
SDL_SetColorKey(mSDLImage, SDL_SRCCOLORKEY,
SDL_MapRGB(mSDLImage->format, 255, 0, 255));
- mImage = ::Image::load(mSDLImage, std::string());
+ mImage = ::Image::load(mSDLImage);
SDL_FreeSurface(mSDLImage);
mSDLImage = NULL;
}