- Fixed char-sql compilation

- Added support for reading the item_db_db inter config settings (char-sql)
- Fixed some compile warnings (functions with no arguments should have a (void) instead of ()).


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

1 files changed, 7 insertions, 7 deletions

diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 472f402c6..2c3cbdf52 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -793,7 +793,7 @@ void merc_hom_revive(struct homun_data *hd, unsigned int hp, unsigned int sp)
 	clif_homskillinfoblock(sd);

 }

 

-int read_homunculusdb()

+int read_homunculusdb(void)

 {

 	FILE *fp;

 	char line[1024], *p;

@@ -881,7 +881,7 @@ int read_homunculusdb()
 	return 0;

 }

 

-int read_homunculus_skilldb()

+int read_homunculus_skilldb(void)

 {

 	FILE *fp;

 	char line[1024], *p;

@@ -949,7 +949,7 @@ int read_homunculus_skilldb()
 	return 0;

 }

 

-void read_homunculus_expdb()

+void read_homunculus_expdb(void)

 {

 	FILE *fp;

 	char line[1024];

@@ -985,18 +985,18 @@ void read_homunculus_expdb()
 	}

 }

 

-void merc_reload()

+void merc_reload(void)

 {

 	read_homunculusdb();

 	read_homunculus_expdb();

 }

 

-void merc_skill_reload()

+void merc_skill_reload(void)

 {

 	read_homunculus_skilldb();

 }

 

-int do_init_merc()

+int do_init_merc(void)

 {

 	read_homunculusdb();

 	read_homunculus_expdb();

@@ -1006,4 +1006,4 @@ int do_init_merc()
 	return 0;

 }

 

-int do_final_merc();

+int do_final_merc(void);