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/resources/resourcemanager.cpp | |
| parent | b2c1c301b1e39fbbbb5bde3d4d55d14a9873b51f (diff) | |
| download | manaverse-ff11053f5f638749c3564c464dc41ebc474b4897.tar.gz manaverse-ff11053f5f638749c3564c464dc41ebc474b4897.tar.bz2 manaverse-ff11053f5f638749c3564c464dc41ebc474b4897.tar.xz manaverse-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/resources/resourcemanager.cpp')
| -rw-r--r-- | src/resources/resourcemanager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index 12ad310ed..62a604ebe 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -29,6 +29,7 @@ #include "resources/dye.h" #include "resources/image.h" +#include "resources/imagehelper.h" #include "resources/imageset.h" #include "resources/music.h" #include "resources/soundeffect.h" @@ -456,8 +457,8 @@ struct DyedImageLoader delete d; return nullptr; } - Resource *res = d ? Image::load(rw, *d) - : Image::load(rw); + Resource *res = d ? ImageHelper::load(rw, *d) + : ImageHelper::load(rw); delete d; return res; } |