diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-08-22 14:14:34 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-08-22 14:14:34 +0300 |
commit | da05d9dd98315378bdded216184294f376643191 (patch) | |
tree | ffc4b984c73c3bb68d26a1df6481634254075744 /src/animatedsprite.cpp | |
parent | ec856b2026c7ceecab5f74942bb36661d7c6ae67 (diff) | |
download | manaverse-da05d9dd98315378bdded216184294f376643191.tar.gz manaverse-da05d9dd98315378bdded216184294f376643191.tar.bz2 manaverse-da05d9dd98315378bdded216184294f376643191.tar.xz manaverse-da05d9dd98315378bdded216184294f376643191.zip |
Use resource manager as global variable.
Diffstat (limited to 'src/animatedsprite.cpp')
-rw-r--r-- | src/animatedsprite.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp index 92b7a4cba..785a00e7f 100644 --- a/src/animatedsprite.cpp +++ b/src/animatedsprite.cpp @@ -63,8 +63,7 @@ AnimatedSprite::AnimatedSprite(SpriteDef *const sprite) : AnimatedSprite *AnimatedSprite::load(const std::string &filename, const int variant) { - ResourceManager *const resman = ResourceManager::getInstance(); - SpriteDef *const s = resman->getSprite(filename, variant); + SpriteDef *const s = resourceManager->getSprite(filename, variant); if (!s) return nullptr; AnimatedSprite *const as = new AnimatedSprite(s); @@ -78,8 +77,7 @@ AnimatedSprite *AnimatedSprite::delayedLoad(const std::string &filename, { if (!mEnableCache) return load(filename, variant); - ResourceManager *const resman = ResourceManager::getInstance(); - Resource *const res = resman->getFromCache(filename, variant); + Resource *const res = resourceManager->getFromCache(filename, variant); if (res) { res->decRef(); |