diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-20 12:27:56 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-20 12:27:56 +0000 |
| commit | ca58ec1faedca0081ecd233f2cefa1ba783cebf4 (patch) | |
| tree | 11216c01bb8867a9bd4ad6d4b8bdefc3c61a952a /src/resources/imageloader.cpp | |
| parent | 5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc (diff) | |
| download | mana-ca58ec1faedca0081ecd233f2cefa1ba783cebf4.tar.gz mana-ca58ec1faedca0081ecd233f2cefa1ba783cebf4.tar.bz2 mana-ca58ec1faedca0081ecd233f2cefa1ba783cebf4.tar.xz mana-ca58ec1faedca0081ecd233f2cefa1ba783cebf4.zip | |
Merged revisions 3642,3662-3664,3667 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk
........
r3642 | gmelquio | 2007-10-19 19:46:46 +0200 (Fri, 19 Oct 2007) | 1 line
Factored code between resource handlers. Implemented failure-friendly sprite loader.
........
r3662 | gmelquio | 2007-10-21 21:01:16 +0200 (Sun, 21 Oct 2007) | 1 line
Added persistent positioning.
........
r3663 | gmelquio | 2007-10-21 21:03:43 +0200 (Sun, 21 Oct 2007) | 1 line
Fixed missing pixels at bottom and right.
........
r3664 | gmelquio | 2007-10-21 21:05:56 +0200 (Sun, 21 Oct 2007) | 1 line
Changed to use default values when restoring missing settings.
........
r3667 | gmelquio | 2007-10-21 22:09:08 +0200 (Sun, 21 Oct 2007) | 1 line
Fixed invisible text in dropboxes and shopboxes.
........
Diffstat (limited to 'src/resources/imageloader.cpp')
| -rw-r--r-- | src/resources/imageloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp index 81a5cf63..d6539b05 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; } |