From c18d789b35f29611c88d0e3bdbb5619500ea7a2a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 27 May 2016 21:37:03 +0300 Subject: Move spritedef load function from resourcemanager into separate file. --- src/resources/resourcemanager/resourcemanager.cpp | 28 +---------------------- 1 file changed, 1 insertion(+), 27 deletions(-) (limited to 'src/resources/resourcemanager/resourcemanager.cpp') diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp index dd652c22b..2289fcffd 100644 --- a/src/resources/resourcemanager/resourcemanager.cpp +++ b/src/resources/resourcemanager/resourcemanager.cpp @@ -72,8 +72,7 @@ ResourceManager::ResourceManager() : mOrphanedResources(), mDeletedResources(), mOldestOrphan(0), - mDestruction(0), - mUseLongLiveSprites(config.getBoolValue("uselonglivesprites")) + mDestruction(0) { logger->log1("Initializing resource manager..."); } @@ -527,31 +526,6 @@ Resource *ResourceManager::get(const std::string &idPath, return resource; } -struct SpriteDefLoader final -{ - std::string path; - int variant; - bool useLongLiveSprites; - static Resource *load(const void *const v) - { - if (!v) - return nullptr; - - const SpriteDefLoader *const - rl = static_cast(v); - return SpriteDef::load(rl->path, rl->variant, rl->useLongLiveSprites); - } -}; - -SpriteDef *ResourceManager::getSprite(const std::string &path, - const int variant) -{ - SpriteDefLoader rl = { path, variant, mUseLongLiveSprites }; - std::stringstream ss; - ss << path << "[" << variant << "]"; - return static_cast(get(ss.str(), SpriteDefLoader::load, &rl)); -} - void ResourceManager::release(Resource *const res) { if (!res || mDestruction) -- cgit v1.2.3-60-g2f50