summaryrefslogtreecommitdiff
path: root/src/char
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-02 02:19:21 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-02 02:19:21 +0000
commit18f9f28313b26c159172fa05204adb6815f81161 (patch)
tree6cf9df1559d5945d2a0a3fea33ced9c8ac3553e7 /src/char
parentb879aa3fc756e6e5557a653420753b97d1af9bde (diff)
downloadhercules-18f9f28313b26c159172fa05204adb6815f81161.tar.gz
hercules-18f9f28313b26c159172fa05204adb6815f81161.tar.bz2
hercules-18f9f28313b26c159172fa05204adb6815f81161.tar.xz
hercules-18f9f28313b26c159172fa05204adb6815f81161.zip
Fixed bugreport:5682 elemental_init was being called instead of final at inter.c
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16033 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char')
-rw-r--r--src/char/int_elemental.c4
-rw-r--r--src/char/int_elemental.h2
-rw-r--r--src/char/inter.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/char/int_elemental.c b/src/char/int_elemental.c
index 0146c8926..d81e10f84 100644
--- a/src/char/int_elemental.c
+++ b/src/char/int_elemental.c
@@ -138,8 +138,8 @@ static void mapif_parse_elemental_save(int fd, struct s_elemental* ele) {
mapif_elemental_saved(fd, result);
}
-int inter_elemental_sql_init(void) {
- return 0;
+void inter_elemental_sql_init(void) {
+ return;
}
void inter_elemental_sql_final(void) {
return;
diff --git a/src/char/int_elemental.h b/src/char/int_elemental.h
index 89001dd95..7eb5c2958 100644
--- a/src/char/int_elemental.h
+++ b/src/char/int_elemental.h
@@ -6,7 +6,7 @@
struct s_elemental;
-int inter_elemental_sql_init(void);
+void inter_elemental_sql_init(void);
void inter_elemental_sql_final(void);
int inter_elemental_parse_frommap(int fd);
diff --git a/src/char/inter.c b/src/char/inter.c
index 8d40963df..16cd356ab 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -815,7 +815,7 @@ void inter_final(void)
inter_pet_sql_final();
inter_homunculus_sql_final();
inter_mercenary_sql_final();
- inter_elemental_sql_init();
+ inter_elemental_sql_final();
inter_mail_sql_final();
inter_auction_sql_final();