summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-29 16:32:50 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-29 16:32:50 +0000
commita33f7874d58bbb99fdfc5d07c30e4aabdba91791 (patch)
tree309d5951b8b46448f76c9035d778c31719392eb2
parentf4cba158b785aa5dc93c6273fddc066297c470b4 (diff)
downloadhercules-a33f7874d58bbb99fdfc5d07c30e4aabdba91791.tar.gz
hercules-a33f7874d58bbb99fdfc5d07c30e4aabdba91791.tar.bz2
hercules-a33f7874d58bbb99fdfc5d07c30e4aabdba91791.tar.xz
hercules-a33f7874d58bbb99fdfc5d07c30e4aabdba91791.zip
- Fixed (likely) deleting homs from the menu causing a double free'd error.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9362 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/mercenary.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 91446580d..ccdc24361 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_free(&hd->bl,0);
+ return unit_remove_map(&hd->bl,0);
}
int merc_hom_calc_skilltree(struct homun_data *hd)