summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-17 18:41:42 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-21 01:37:19 +0300
commit6986718327b15180bed128037addbd6fcd558005 (patch)
tree6c76fad8c1d85a2744ced00389c04fdb817b0eda /src
parent2e76de4a5c6f51dab67b8ee41604d714e3cddd39 (diff)
downloadhercules-6986718327b15180bed128037addbd6fcd558005.tar.gz
hercules-6986718327b15180bed128037addbd6fcd558005.tar.bz2
hercules-6986718327b15180bed128037addbd6fcd558005.tar.xz
hercules-6986718327b15180bed128037addbd6fcd558005.zip
Move mob_db deletion into separate function.
Diffstat (limited to 'src')
-rw-r--r--src/map/mob.c16
-rw-r--r--src/map/mob.h1
2 files changed, 11 insertions, 6 deletions
diff --git a/src/map/mob.c b/src/map/mob.c
index 6171ddb75..ad8615678 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -3550,8 +3550,7 @@ int mob_clone_delete(struct mob_data *md)
const int class_ = md->class_;
if (class_ >= MOB_CLONE_START && class_ < MOB_CLONE_END
&& mob->db_data[class_]!=NULL) {
- aFree(mob->db_data[class_]);
- mob->db_data[class_]=NULL;
+ mob->destroy_mob_db(class_);
//Clear references to the db
md->db = mob->dummy;
md->vd = NULL;
@@ -3574,8 +3573,7 @@ int mob_makedummymobdb(int class_)
return 1; //Using the mob->dummy data already. [Skotlex]
if (class_ > 0 && class_ <= MAX_MOB_DB) {
//Remove the mob data so that it uses the dummy data instead.
- aFree(mob->db_data[class_]);
- mob->db_data[class_] = NULL;
+ mob->destroy_mob_db(class_);
}
return 0;
}
@@ -4701,6 +4699,12 @@ int do_init_mob(bool minimal) {
return 0;
}
+void mob_destroy_mob_db(int index)
+{
+ aFree(mob->db_data[index]);
+ mob->db_data[index] = NULL;
+}
+
/*==========================================
* Clean memory usage.
*------------------------------------------*/
@@ -4716,8 +4720,7 @@ int do_final_mob(void)
{
if (mob->db_data[i] != NULL)
{
- aFree(mob->db_data[i]);
- mob->db_data[i] = NULL;
+ mob->destroy_mob_db(i);
}
}
for (i = 0; i <= MAX_MOB_CHAT; i++)
@@ -4852,4 +4855,5 @@ void mob_defaults(void) {
mob->readdb_itemratio = mob_readdb_itemratio;
mob->load = mob_load;
mob->clear_spawninfo = mob_clear_spawninfo;
+ mob->destroy_mob_db = mob_destroy_mob_db;
}
diff --git a/src/map/mob.h b/src/map/mob.h
index 133107143..9aac2c664 100644
--- a/src/map/mob.h
+++ b/src/map/mob.h
@@ -377,6 +377,7 @@ struct mob_interface {
bool (*readdb_itemratio) (char *str[], int columns, int current);
void (*load) (bool minimal);
void (*clear_spawninfo) ();
+ void (*destroy_mob_db) (int index);
};
struct mob_interface *mob;