summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-29 21:31:36 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-29 21:31:36 +0000
commit5baa12ea4a48b09cfc2007ec5c1f05f60a92fd45 (patch)
tree028b0dca8498480d96997c08c649ca7547b37874 /src/common
parent71201030aedb473d67f15c4ab72ba21c60cca30b (diff)
downloadhercules-5baa12ea4a48b09cfc2007ec5c1f05f60a92fd45.tar.gz
hercules-5baa12ea4a48b09cfc2007ec5c1f05f60a92fd45.tar.bz2
hercules-5baa12ea4a48b09cfc2007ec5c1f05f60a92fd45.tar.xz
hercules-5baa12ea4a48b09cfc2007ec5c1f05f60a92fd45.zip
* Collection of random insignificant changes.
- Added progress indication on map-server shutdown when objects are removed from maps, as it takes significant amount of time to complete. - Moved ers_free in db_obj_vclear, so that the node pointer is not used for comparison after it has been freed. - Some documentation of shop packets. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14639 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
-rw-r--r--src/common/db.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/db.c b/src/common/db.c
index 4dcf1d0b0..550bfd382 100644
--- a/src/common/db.c
+++ b/src/common/db.c
@@ -1976,13 +1976,13 @@ static int db_obj_vclear(DBMap* self, DBApply func, va_list args)
node->deleted = 1;
}
DB_COUNTSTAT(db_node_free);
- ers_free(db->nodes, node);
if (parent) {
if (parent->left == node)
parent->left = NULL;
else
parent->right = NULL;
}
+ ers_free(db->nodes, node);
node = parent;
}
db->ht[i] = NULL;