summaryrefslogtreecommitdiff
path: root/src/map/mercenary.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/mercenary.h')
-rw-r--r--src/map/mercenary.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index e4db4e54a..aae36cbcb 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -3,14 +3,11 @@
int do_init_merc (void);
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);
+void merc_damage(struct homun_data *hd,struct block_list *src,int hp,int sp);
+int merc_dead(struct homun_data *hd, struct block_list *src);
void merc_skillup(struct map_session_data *sd,short skillnum);
-void merc_calc_stats(struct homun_data *hd);
int merc_gainexp(struct homun_data *hd,int exp);
-int merc_heal(struct homun_data *hd,int hp,int sp);
+void 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);