diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-05-25 22:17:03 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-05-25 22:17:03 +0300 |
| commit | ea0809826d530f82dc84f8e046b3d11a797dd716 (patch) | |
| tree | 65b8141e1c9d3591ad95f771a7ca2c4667865e81 /src/gui | |
| parent | 5994a6198ac35ea149a7211213dc296ee7406f44 (diff) | |
| download | plus-ea0809826d530f82dc84f8e046b3d11a797dd716.tar.gz plus-ea0809826d530f82dc84f8e046b3d11a797dd716.tar.bz2 plus-ea0809826d530f82dc84f8e046b3d11a797dd716.tar.xz plus-ea0809826d530f82dc84f8e046b3d11a797dd716.zip | |
Move subimageset load function from resourcemanager into separate file.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/theme.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index d17f1ae85..f3100a9cb 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -40,8 +40,7 @@ #include "resources/loaders/imageloader.h" #include "resources/loaders/imagesetloader.h" #include "resources/loaders/subimageloader.h" - -#include "resources/resourcemanager/resourcemanager.h" +#include "resources/loaders/subimagesetloader.h" #include "utils/dtor.h" #include "utils/files.h" @@ -1151,7 +1150,7 @@ ImageSet *Theme::getImageSetFromThemeXml(const std::string &name, const SDL_Rect &rect2 = image->mBounds; if (rect2.w && rect2.h) { - ImageSet *const imageSet = resourceManager->getSubImageSet( + ImageSet *const imageSet = Loader::getSubImageSet( image, w, h); theme->unload(skin); return imageSet; |