diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-09-28 03:08:30 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-09-28 03:08:30 +0300 |
commit | 5986e192171faa3f7a1422b1f8fd3e561ed5f693 (patch) | |
tree | 224533452bb32762c5ca2467c3b8464d0d4c2f2a /src/resources | |
parent | 282101785316498f3d7f194e94815608d39017b7 (diff) | |
download | manaplus-5986e192171faa3f7a1422b1f8fd3e561ed5f693.tar.gz manaplus-5986e192171faa3f7a1422b1f8fd3e561ed5f693.tar.bz2 manaplus-5986e192171faa3f7a1422b1f8fd3e561ed5f693.tar.xz manaplus-5986e192171faa3f7a1422b1f8fd3e561ed5f693.zip |
Add source field to each resources.
Diffstat (limited to 'src/resources')
-rw-r--r-- | src/resources/resource.h | 8 | ||||
-rw-r--r-- | src/resources/resourcemanager.cpp | 9 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/resources/resource.h b/src/resources/resource.h index d8f4a7f11..76dd71b4f 100644 --- a/src/resources/resource.h +++ b/src/resources/resource.h @@ -75,6 +75,12 @@ class Resource unsigned getRefCount() const { return mRefCount; } + void setSource(const std::string str) + { mSource = str; } + + std::string getSource() const + { return mSource; } + #ifdef DEBUG_DUMP_LEAKS bool getDumped() const { return mDumped; } @@ -94,7 +100,7 @@ class Resource private: time_t mTimeStamp; /**< Time at which the resource was orphaned. */ unsigned mRefCount; /**< Reference count. */ - std::string mName; + std::string mSource; #ifdef DEBUG_DUMP_LEAKS bool mDumped; #endif diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index 7d80e8bcc..f398c4b45 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -214,15 +214,16 @@ bool ResourceManager::cleanOrphans(const bool always) { #ifdef USE_OPENGL const Image *const image = dynamic_cast<Image*>(res); + const std::string src = image->getSource(); if (image && image->getGLImage()) { - logger->log("ResourceManager::release(%s, %u)", - res->mIdPath.c_str(), image->getGLImage()); + logger->log("ResourceManager::release(%s, %u) %s", + res->mIdPath.c_str(), image->getGLImage(), src.c_str()); } else { - logger->log("ResourceManager::release(%s)", - res->mIdPath.c_str()); + logger->log("ResourceManager::release(%s) %s", + res->mIdPath.c_str(), src.c_str()); } #else logger->log("ResourceManager::release(%s)", res->mIdPath.c_str()); |