summaryrefslogtreecommitdiff
path: root/src/map/map.c
diff options
context:
space:
mode:
authorDracoRPG <DracoRPG@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-17 00:15:33 +0000
committerDracoRPG <DracoRPG@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-17 00:15:33 +0000
commit7b2f7c0503cb5be8bc45f57353d838a4dbf84d7b (patch)
tree34fb42eb5bf938c6c02b56e26931c6b1937e4c89 /src/map/map.c
parent5a064d5a6723601d08610082ab6c203bc94cdab0 (diff)
downloadhercules-7b2f7c0503cb5be8bc45f57353d838a4dbf84d7b.tar.gz
hercules-7b2f7c0503cb5be8bc45f57353d838a4dbf84d7b.tar.bz2
hercules-7b2f7c0503cb5be8bc45f57353d838a4dbf84d7b.tar.xz
hercules-7b2f7c0503cb5be8bc45f57353d838a4dbf84d7b.zip
Orn's and Albator's Homunculus system, finally, YAY!!
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7706 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.c')
-rw-r--r--src/map/map.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/map.c b/src/map/map.c
index 15a41f4c1..a34805997 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -39,6 +39,7 @@
#include "script.h"
#include "guild.h"
#include "pet.h"
+#include "mercenary.h" //[orn]
#include "atcommand.h"
#include "charcommand.h"
@@ -1664,6 +1665,8 @@ int map_quit(struct map_session_data *sd) {
sd->state.waitingdisconnect = 1;
if (sd->pd) unit_free(&sd->pd->bl);
+ if(sd->status.hom_id > 0 && sd->hd) //[orn]
+ merc_hom_delete(sd->hd, 0) ;
unit_free(&sd->bl);
chrif_save(sd,1);
} else { //Try to free some data, without saving anything (this could be invoked on map server change. [Skotlex]
@@ -3886,6 +3889,7 @@ int do_init(int argc, char *argv[]) {
do_init_storage();
do_init_skill();
do_init_pet();
+ do_init_merc(); //[orn]
do_init_npc();
do_init_unit();
#ifndef TXT_ONLY /* mail system [Valaris] */