- Asura Strike now moves you to the target on fail always (unless the target does not exists or is in another map or there's a obstacle on the way)

- Corrected skill_attack_area hitting dead characters on it's splash range.
- Swapped the values for OPTION_XMAS and OPTION_FLYING. This should enable SG to show the fly animation again, even if sometimes others will see him as Santa. As for xmas cloth, it shouldn't make much of a difference since the view class is changed to christmas anyway.
- Moved the AM_CALLHOMUN code from castend_id to castend_pos.
- Made AM_CALLHOMUN and AM_RESURRECTHOMUN be like the wedding skills, where they automatically pick a spot around you.
- Cleaned up some the AM_RESURRECTHOMUN code. Hopefully it works now.
- Cleaned up some the hom evolution code.


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

1 files changed, 3 insertions, 2 deletions

diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index 851abd4ee..1837a7446 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -63,9 +63,10 @@ int merc_hom_levelup(struct homun_data *hd) ;
 int merc_hom_evolution(struct homun_data *hd) ;

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

 int merc_hom_vaporize(struct map_session_data *sd, int flag);

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

+int merc_revive_homunculus(struct map_session_data *sd, unsigned char per, short x, short y);

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

 void merc_save(struct homun_data *hd);

-int merc_call_homunculus(struct map_session_data *sd);

+int merc_call_homunculus(struct map_session_data *sd, short x, short y);

 int merc_create_homunculus(struct map_session_data *sd, int class_);

 int search_homunculusDB_index(int key,int type);

 int merc_menu(struct map_session_data *sd,int menunum);