diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-04-28 18:01:11 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-04-28 18:01:11 +0300 |
commit | 490140e0659d3dc99f2b19227410bd279a12fdf6 (patch) | |
tree | 9b39abcc3c6493f22e7e881c03342a1acd33402d /src/resources/resourcemanager.cpp | |
parent | 37c4338e84265705ec41c5da03e325255a9bce63 (diff) | |
download | manaplus-490140e0659d3dc99f2b19227410bd279a12fdf6.tar.gz manaplus-490140e0659d3dc99f2b19227410bd279a12fdf6.tar.bz2 manaplus-490140e0659d3dc99f2b19227410bd279a12fdf6.tar.xz manaplus-490140e0659d3dc99f2b19227410bd279a12fdf6.zip |
Remove useless function ResourceManager::load.
Diffstat (limited to 'src/resources/resourcemanager.cpp')
-rw-r--r-- | src/resources/resourcemanager.cpp | 12 |
1 files changed, 4 insertions, 8 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<SDLMusic*>(load(idPath, &SDLMusic::load)); + ResourceLoader rl = { this, idPath, &SDLMusic::load }; + return static_cast<SDLMusic*>(get(idPath, ResourceLoader::load, &rl)); } SoundEffect *ResourceManager::getSoundEffect(const std::string &idPath) { - return static_cast<SoundEffect*>(load(idPath, &SoundEffect::load)); + ResourceLoader rl = { this, idPath, &SoundEffect::load }; + return static_cast<SoundEffect*>(get(idPath, ResourceLoader::load, &rl)); } struct DyedImageLoader final |