- Updated battle_check_target so that all alchemist summoned mobs can be target by everyone.

- Cleaned up skill_check_condition_mob_master_sub, it will now count both total number of summoned mobs and amount that belong to the same type.
- Corrected AM_CANNIBALIZE so it will fail if you already have plants of another type out.
- Using NPC_SELFDESTRUCTION no longer will make the caster stop walking.
- Removed SI_GUILDAURA, and replaced it with SI_LANDENDOW, now Volcano/Deluge/V. Gale will get that funky icon instead.
- Changed clif_hominfo to receive both sd and hd as parameters
- Some redundancy cleaning in mercenary.c
- Moved updating of sd->mercenary.hp from merc_damage to pc_makesavestatus.


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

1 files changed, 1 insertions, 1 deletions

diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index 965557759..41f5540de 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -60,7 +60,7 @@ int merc_hom_checkskill(struct map_session_data *sd,int skill_id) ;
 int merc_hom_gainexp(struct homun_data *hd,int exp) ;

 int merc_hom_levelup(struct homun_data *hd) ;

 int merc_hom_evolution(struct homun_data *hd) ;

-int merc_hom_heal(struct homun_data *hd,int hp,int sp);

+void merc_hom_heal(struct homun_data *hd,int hp,int sp);

 int merc_hom_delete(struct homun_data *hd, int flag) ;

 int merc_hom_revive(struct map_session_data *sd, int per);

 void merc_save(struct homun_data *hd);