- Changed unit_free so that it receives which cleartype should be used when the character is still on a map. Used this on status_damage so that mobs that do not respawn when killed will properly display the death animation.

- Should have fixed the signed/unsigned comparison warnings in the main regen function. 
- Fixed Energy Coat consuming 10x less SP per hit than it should.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8339 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 3 insertions, 3 deletions

diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index fff6a23f1..00759fe0d 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -170,7 +170,7 @@ int merc_hom_delete(struct homun_data *hd, int emote)
 	sd = hd->master;

 

 	if (!sd)

-		return unit_free(&hd->bl);

+		return unit_free(&hd->bl,1);

 

 	if (emote >= 0)

 		clif_emotion(&sd->bl, emote);

@@ -180,7 +180,7 @@ int merc_hom_delete(struct homun_data *hd, int emote)
 	// Send homunculus_dead to client

 	sd->homunculus.hp = 0;

 	clif_hominfo(sd, hd, 0);

-	return unit_free(&hd->bl);

+	return unit_free(&hd->bl,1);

 }

 

 int merc_hom_calc_skilltree(struct map_session_data *sd)

@@ -342,7 +342,7 @@ int merc_hom_evolution(struct homun_data *hd)
 	x = hd->bl.x;

 	y = hd->bl.y;

 	merc_hom_vaporize(sd, 0);

-	unit_free(&hd->bl);

+	unit_free(&hd->bl,0);

 	merc_call_homunculus(sd, x, y);

 	clif_emotion(&sd->bl, 21) ;	//no1

 	clif_misceffect2(&hd->bl,568);