From da05d9dd98315378bdded216184294f376643191 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 22 Aug 2015 14:14:34 +0300 Subject: Use resource manager as global variable. --- src/animatedsprite.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/animatedsprite.cpp') 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(); -- cgit v1.2.3-60-g2f50