summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-01-05 21:16:23 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-09 19:45:29 +0100
commit0fd9aef8bf376d44132edded2cdcb41ba7ee5b2f (patch)
tree24c19cd4af285fd8ede2d9d866668d005b5f6e26 /src/resources
parent1a769276ce68285040bffd63bd1c01495ce411a7 (diff)
downloadmana-client-0fd9aef8bf376d44132edded2cdcb41ba7ee5b2f.tar.gz
mana-client-0fd9aef8bf376d44132edded2cdcb41ba7ee5b2f.tar.bz2
mana-client-0fd9aef8bf376d44132edded2cdcb41ba7ee5b2f.tar.xz
mana-client-0fd9aef8bf376d44132edded2cdcb41ba7ee5b2f.zip
Mostly whitespace and formatting changes
(merged from eAthena client)
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/npcdb.cpp1
-rw-r--r--src/resources/resourcemanager.cpp6
2 files changed, 5 insertions, 2 deletions
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index 5cd6d20d..2f8d78d4 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -132,4 +132,3 @@ NPCDB::get(int id)
return *(i->second);
}
}
-
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index bebd17f8..3d42d92e 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -95,11 +95,15 @@ ResourceManager::~ResourceManager()
void ResourceManager::cleanUp(Resource *res)
{
- logger->log("ResourceManager::~ResourceManager() cleaning up %d "
+ if (res->mRefCount > 0)
+ {
+ logger->log("ResourceManager::~ResourceManager() cleaning up %d "
"reference%s to %s",
res->mRefCount,
(res->mRefCount == 1) ? "" : "s",
res->mIdPath.c_str());
+ }
+
delete res;
}