diff options
author | Björn Steinbrink <B.Steinbrink@gmx.de> | 2005-08-29 22:00:35 +0000 |
---|---|---|
committer | Björn Steinbrink <B.Steinbrink@gmx.de> | 2005-08-29 22:00:35 +0000 |
commit | 5352c44d1ab542c64c421afcc690b200f7231a9d (patch) | |
tree | 4695c79a788c3ab9daeaf2972052a6ea9821bf13 /src/resources/resourcemanager.cpp | |
parent | 52a7af6227d0b2ff94ff2c8fecd708d4d6a71466 (diff) | |
download | mana-client-5352c44d1ab542c64c421afcc690b200f7231a9d.tar.gz mana-client-5352c44d1ab542c64c421afcc690b200f7231a9d.tar.bz2 mana-client-5352c44d1ab542c64c421afcc690b200f7231a9d.tar.xz mana-client-5352c44d1ab542c64c421afcc690b200f7231a9d.zip |
Clean up of the ConfigListener and Resource interfaces.
Diffstat (limited to 'src/resources/resourcemanager.cpp')
-rw-r--r-- | src/resources/resourcemanager.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index b443c715..3567ac35 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -150,19 +150,19 @@ ResourceManager::get(const E_RESOURCE_TYPE &type, const std::string &idPath) case MUSIC: { // Let the music class load it - resource = Music::load(buffer, fileSize); + resource = Music::load(buffer, fileSize, idPath); } break; case IMAGE: { // Let the image class load it - resource = Image::load(buffer, fileSize); + resource = Image::load(buffer, fileSize, idPath); } break; case SOUND_EFFECT: { // Let the sound effect class load it - resource = SoundEffect::load(buffer, fileSize); + resource = SoundEffect::load(buffer, fileSize, idPath); } break; default: @@ -174,7 +174,6 @@ ResourceManager::get(const E_RESOURCE_TYPE &type, const std::string &idPath) if (resource) { resource->incRef(); - resource->setIdPath(idPath); resources[idPath] = resource; } |