summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-24 16:04:40 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-24 16:04:40 +0000
commitdb1cd48635235a32a7c0d0db4c81eea517a73361 (patch)
tree698cfca652c4f4b9a5a2b10eaeb446a30c8e8229 /src
parent68502123b0f03d87b7bf593e903da369f464255d (diff)
downloadhercules-db1cd48635235a32a7c0d0db4c81eea517a73361.tar.gz
hercules-db1cd48635235a32a7c0d0db4c81eea517a73361.tar.bz2
hercules-db1cd48635235a32a7c0d0db4c81eea517a73361.tar.xz
hercules-db1cd48635235a32a7c0d0db4c81eea517a73361.zip
- Likely fixed Homunculus not disappearing the second their intimacy hit 0.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9313 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/mercenary.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 1b7a3100c..91446580d 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -114,7 +114,7 @@ int merc_hom_delete(struct homun_data *hd, int emote)
// Send homunculus_dead to client
hd->homunculus.hp = 0;
clif_hominfo(sd, hd, 0);
- return unit_remove_map(&hd->bl,0);
+ return unit_free(&hd->bl,0);
}
int merc_hom_calc_skilltree(struct homun_data *hd)
@@ -478,7 +478,7 @@ static int merc_hom_hungry(int tid,unsigned int tick,int id,int data)
hd->homunculus.hunger = 0;
// Delete the homunculus if intimacy <= 100
if ( !merc_hom_decrease_intimacy(hd, 100) )
- return merc_hom_delete(sd->hd, 23); //omg
+ return merc_hom_delete(hd, 23); //omg
clif_send_homdata(sd,SP_INTIMATE,hd->homunculus.intimacy / 100);
}