From 490140e0659d3dc99f2b19227410bd279a12fdf6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 28 Apr 2016 18:01:11 +0300 Subject: Remove useless function ResourceManager::load. --- src/resources/resourcemanager.cpp | 12 ++++-------- src/resources/resourcemanager.h | 11 ----------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index cc990f811..0f3f10f76 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -542,20 +542,16 @@ struct ResourceLoader final } }; -Resource *ResourceManager::load(const std::string &path, const loader fun) -{ - ResourceLoader rl = { this, path, fun }; - return get(path, ResourceLoader::load, &rl); -} - SDLMusic *ResourceManager::getMusic(const std::string &idPath) { - return static_cast(load(idPath, &SDLMusic::load)); + ResourceLoader rl = { this, idPath, &SDLMusic::load }; + return static_cast(get(idPath, ResourceLoader::load, &rl)); } SoundEffect *ResourceManager::getSoundEffect(const std::string &idPath) { - return static_cast(load(idPath, &SoundEffect::load)); + ResourceLoader rl = { this, idPath, &SoundEffect::load }; + return static_cast(get(idPath, ResourceLoader::load, &rl)); } struct DyedImageLoader final diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h index 651142e29..92454c0c7 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -123,17 +123,6 @@ class ResourceManager final : public MemoryCounter Resource *getFromCache(const std::string &filename, const int variant) A_WARN_UNUSED; - /** - * Loads a resource from a file and adds it to the resource map. - * - * @param path The file name. - * @param fun A function for parsing the file. - * @return A valid resource or NULL if the resource could - * not be loaded. - */ - Resource *load(const std::string &path, - const loader fun) A_WARN_UNUSED; - /** * Adds a preformatted resource to the resource map. * -- cgit v1.2.3-70-g09d2