summaryrefslogtreecommitdiff
path: root/src/resources/sprite
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-27 21:37:03 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-27 21:37:03 +0300
commitc18d789b35f29611c88d0e3bdbb5619500ea7a2a (patch)
treecdc7e6d57305bba43859b5a669df1e975220dc3f /src/resources/sprite
parent6ed4f7f09a297e9afb829634399c94ccc542729e (diff)
downloadplus-c18d789b35f29611c88d0e3bdbb5619500ea7a2a.tar.gz
plus-c18d789b35f29611c88d0e3bdbb5619500ea7a2a.tar.bz2
plus-c18d789b35f29611c88d0e3bdbb5619500ea7a2a.tar.xz
plus-c18d789b35f29611c88d0e3bdbb5619500ea7a2a.zip
Move spritedef load function from resourcemanager into separate file.
Diffstat (limited to 'src/resources/sprite')
-rw-r--r--src/resources/sprite/animatedsprite.cpp4
-rw-r--r--src/resources/sprite/animationdelayload.cpp4
2 files changed, 5 insertions, 3 deletions
diff --git a/src/resources/sprite/animatedsprite.cpp b/src/resources/sprite/animatedsprite.cpp
index 6ada9c394..8a60de0f3 100644
--- a/src/resources/sprite/animatedsprite.cpp
+++ b/src/resources/sprite/animatedsprite.cpp
@@ -32,6 +32,8 @@
#include "resources/animation/animation.h"
+#include "resources/loaders/spritedefloader.h"
+
#include "resources/resourcemanager/resourcemanager.h"
#include "resources/sprite/animationdelayload.h"
@@ -67,7 +69,7 @@ AnimatedSprite::AnimatedSprite(SpriteDef *restrict const sprite) :
AnimatedSprite *AnimatedSprite::load(const std::string &restrict filename,
const int variant)
{
- SpriteDef *restrict const s = resourceManager->getSprite(
+ SpriteDef *restrict const s = Loader::getSprite(
filename, variant);
if (!s)
return nullptr;
diff --git a/src/resources/sprite/animationdelayload.cpp b/src/resources/sprite/animationdelayload.cpp
index fa33ff5f5..838dad42d 100644
--- a/src/resources/sprite/animationdelayload.cpp
+++ b/src/resources/sprite/animationdelayload.cpp
@@ -22,7 +22,7 @@
#include "const/resources/spriteaction.h"
-#include "resources/resourcemanager/resourcemanager.h"
+#include "resources/loaders/spritedefloader.h"
#include "resources/sprite/animatedsprite.h"
@@ -56,7 +56,7 @@ void AnimationDelayLoad::load()
{
if (mSprite)
{
- SpriteDef *const s = resourceManager->getSprite(mFileName, mVariant);
+ SpriteDef *const s = Loader::getSprite(mFileName, mVariant);
if (!s)
return;
mSprite->setSprite(s);