diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-05-25 20:48:35 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-05-25 20:48:35 +0300 |
| commit | 5994a6198ac35ea149a7211213dc296ee7406f44 (patch) | |
| tree | eec718594fd23da29f9d39e4c0fb00409d514a8e /src/resources/sprite/spritedef.cpp | |
| parent | 1b1a7cea1c6b81438bacc86b93cb80a78430790f (diff) | |
| download | manaverse-5994a6198ac35ea149a7211213dc296ee7406f44.tar.gz manaverse-5994a6198ac35ea149a7211213dc296ee7406f44.tar.bz2 manaverse-5994a6198ac35ea149a7211213dc296ee7406f44.tar.xz manaverse-5994a6198ac35ea149a7211213dc296ee7406f44.zip | |
Move imageset load function from resourcemanager into separate file.
Diffstat (limited to 'src/resources/sprite/spritedef.cpp')
| -rw-r--r-- | src/resources/sprite/spritedef.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/sprite/spritedef.cpp b/src/resources/sprite/spritedef.cpp index 25c5952e3..7fa53a105 100644 --- a/src/resources/sprite/spritedef.cpp +++ b/src/resources/sprite/spritedef.cpp @@ -39,7 +39,7 @@ #include "resources/dye/dye.h" -#include "resources/resourcemanager/resourcemanager.h" +#include "resources/loaders/imagesetloader.h" #include "resources/sprite/spritereference.h" @@ -241,7 +241,7 @@ void SpriteDef::loadImageSet(const XmlNodePtr node, std::string imageSrc = XML::getProperty(node, "src", ""); Dye::instantiate(imageSrc, palettes); - ImageSet *const imageSet = resourceManager->getImageSet(imageSrc, + ImageSet *const imageSet = Loader::getImageSet(imageSrc, width, height); if (!imageSet) |