summaryrefslogtreecommitdiff
path: root/src/resources/resourcemanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-29 03:41:11 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-29 03:41:11 +0300
commit7c020abf511236e2c56fa1c6b6c1b8f248aa8582 (patch)
treeaae0dbb1e1203ea33d1dbf1ff4185268d02a1943 /src/resources/resourcemanager.cpp
parentfdfd38278cba5fa37d203d0d29b4981e400a529a (diff)
downloadmanaplus-7c020abf511236e2c56fa1c6b6c1b8f248aa8582.tar.gz
manaplus-7c020abf511236e2c56fa1c6b6c1b8f248aa8582.tar.bz2
manaplus-7c020abf511236e2c56fa1c6b6c1b8f248aa8582.tar.xz
manaplus-7c020abf511236e2c56fa1c6b6c1b8f248aa8582.zip
Add name into memory usage tree for SDLMusic and SoundEffect.
Diffstat (limited to 'src/resources/resourcemanager.cpp')
-rw-r--r--src/resources/resourcemanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 0f3f10f76..2b1c3450d 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -501,7 +501,7 @@ Resource *ResourceManager::get(const std::string &idPath,
logger->log("Error loading image: " + idPath);
}
#else
- Resource *resource = fun(data);
+ Resource *resource = fun(data, idPath);
if (resource)
{
@@ -537,7 +537,7 @@ struct ResourceLoader final
SDL_RWops *const rw = MPHYSFSRWOPS_openRead(rl->path.c_str());
if (!rw)
return nullptr;
- Resource *const res = rl->fun(rw);
+ Resource *const res = rl->fun(rw, rl->path);
return res;
}
};