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.h6
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);