summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-10 14:39:50 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-10 14:39:50 +0000
commitb128e0ac66c33c9095c7374e6f4327e87c94113e (patch)
treeb7fa6de88fd6a5c89995350086ba57e3f7f87ae0
parent5ab87d86bb158110fc7b32d9e1cd9ff39ace37cf (diff)
downloadhercules-b128e0ac66c33c9095c7374e6f4327e87c94113e.tar.gz
hercules-b128e0ac66c33c9095c7374e6f4327e87c94113e.tar.bz2
hercules-b128e0ac66c33c9095c7374e6f4327e87c94113e.tar.xz
hercules-b128e0ac66c33c9095c7374e6f4327e87c94113e.zip
- Fixed a warning GCC kept giving me when including mercenary.h
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8230 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/mercenary.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index 2fee6a0c9..d81cb9be7 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -47,7 +47,7 @@ enum {
SP_HUNGRY = 0x200
};
-int do_init_merc (void);
+int do_init_merc(void);
int merc_hom_recv_data(int account_id, struct s_homunculus *sh, int flag); //albator
void merc_load_sub(struct homun_data *hd, struct map_session_data *sd);
void merc_load_exptables(void);
@@ -78,4 +78,4 @@ int merc_natural_heal_timer_delete(struct homun_data *hd);
int read_homunculusdb(void);
int merc_hom_increase_intimacy(struct homun_data * hd, unsigned int value);
int merc_hom_decrease_intimacy(struct homun_data * hd, unsigned int value);
-int merc_skill_tree_get_max(int id, int b_class); \ No newline at end of file
+int merc_skill_tree_get_max(int id, int b_class);