diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-06-09 22:46:34 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-06-09 23:50:09 +0300 |
| commit | ff11053f5f638749c3564c464dc41ebc474b4897 (patch) | |
| tree | 8cf7ed8485528c7498612199c7ca56a6fd84f5e5 /src/gui/minimap.cpp | |
| parent | b2c1c301b1e39fbbbb5bde3d4d55d14a9873b51f (diff) | |
| download | manaplus-ff11053f5f638749c3564c464dc41ebc474b4897.tar.gz manaplus-ff11053f5f638749c3564c464dc41ebc474b4897.tar.bz2 manaplus-ff11053f5f638749c3564c464dc41ebc474b4897.tar.xz manaplus-ff11053f5f638749c3564c464dc41ebc474b4897.zip | |
Move static methods from Image class to ImageHelper class.
Remove SDL merge method. It was very slow and unused.
Diffstat (limited to 'src/gui/minimap.cpp')
| -rw-r--r-- | src/gui/minimap.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp index e4bf62ec6..30d9f40bb 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -36,6 +36,7 @@ #include "gui/viewport.h" #include "resources/image.h" +#include "resources/imagehelper.h" #include "resources/resourcemanager.h" #include "utils/gettext.h" @@ -142,7 +143,7 @@ void Minimap::setMap(Map *map) SDL_UnlockSurface(surface); - mMapImage = Image::load(surface); + mMapImage = ImageHelper::load(surface); mMapImage->setAlpha(Client::getGuiAlpha()); mCustomMapImage = true; SDL_FreeSurface(surface); |