- 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

2 files changed, 4 insertions, 2 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index dda417310..d29d1679d 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.

 

 2006/11/24

+	* Likely fixed Homunculus not disappearing the second their intimacy hit 0.

+	  [Skotlex]

 	* Fixed uninitialized variable fd being used in WFIFOHEAD in a few clif

 	  functions. [Skotlex]

 	* Fixed the fact that the TURBO code breaks when you attempt to handle more

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);

 	}