summaryrefslogtreecommitdiff
path: root/src/map/mercenary.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/mercenary.c')
-rw-r--r--src/map/mercenary.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 8ef7162db..e84acecf6 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -61,7 +61,7 @@ char32 merc_skillname[20] = {"NULL","HLIF_HEAL","HLIF_AVOID","HLIF_BRAIN","HLIF_
"HFLI_MOON","HFLI_FLEET","HFLI_SPEED","HFLI_SBR44",
"HVAN_CAPRICE","HVAN_CHAOTIC","HVAN_INSTRUCT","HVAN_EXPLOSION"};
-void merc_load_exptables();
+void merc_load_exptables(void);
void merc_save(struct map_session_data *sd);
int mercskill_castend_id( int tid, unsigned int tick, int id,int data );
@@ -78,7 +78,7 @@ static int diry[8]={1,1,0,-1,-1,-1,0,1};
static unsigned long hexptbl[126];
-void merc_load_exptables()
+void merc_load_exptables(void)
{
FILE *fl;
int i;
@@ -95,7 +95,7 @@ void merc_load_exptables()
fclose(fl);
}
-char *merc_skill_get_name(id)
+char *merc_skill_get_name(int id)
{
return merc_skillname[id-8000];
}
@@ -498,4 +498,4 @@ int merc_create_homunculus(struct map_session_data *sd,int id,int m,int x,int y)
clif_homuninfo(sd);*/ // send this x2. dunno why, but kRO does that [blackhole89]
}
-int do_final_merc (void); \ No newline at end of file
+int do_final_merc (void);