- Added functions status_revive, pc_revive and mob_revive to handle revival (it doesn't handles player respawning, though)

- Corrected alive, raisemap, raiseall to use these functions.
- Updated resurrection/mob-kaizel to use status_revive
- Added SC_BLADESTOP to the skill enum at the beginning of status.c (fixes Bladestop causing an unknown status change message)
- Fixed MSS_DEAD state skills not triggering.
- Corrected some compilation warnings on the merc.* files. 


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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index 24ef6bbb6..e4db4e54a 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -1,8 +1,8 @@
 // Homunculus and future Mercenary system code go here [Celest]

 

 int do_init_merc (void);

-void merc_load_exptables();

-char *merc_skill_get_name(id);

+void merc_load_exptables(void);

+char *merc_skill_get_name(int id);

 void merc_die(struct map_session_data *sd);

 int merc_damage(struct block_list *src,struct homun_data *hd,int damage,int type);

 void merc_calc_status(struct homun_data *hd);

@@ -13,4 +13,4 @@ int merc_heal(struct homun_data *hd,int hp,int sp);
 void merc_save(struct map_session_data *sd);

 void merc_res(struct map_session_data *sd,int skilllv);

 void merc_load(struct map_session_data *sd);

-int merc_create_homunculus(struct map_session_data *sd,int id,int m,int x,int y);
\ No newline at end of file
+int merc_create_homunculus(struct map_session_data *sd,int id,int m,int x,int y);