summaryrefslogtreecommitdiff
path: root/src/char
diff options
context:
space:
mode:
authormarkzd <markzd@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-12 00:21:47 +0000
committermarkzd <markzd@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-12 00:21:47 +0000
commit2ad53bc87be9c4c5e071e3d9372f38edd327e892 (patch)
tree5dff3f7175b93dbfde2f118b96ad939f16cb7c10 /src/char
parent9c09b5aa848716f478b55624a7fb1bd1bc5fba82 (diff)
downloadhercules-2ad53bc87be9c4c5e071e3d9372f38edd327e892.tar.gz
hercules-2ad53bc87be9c4c5e071e3d9372f38edd327e892.tar.bz2
hercules-2ad53bc87be9c4c5e071e3d9372f38edd327e892.tar.xz
hercules-2ad53bc87be9c4c5e071e3d9372f38edd327e892.zip
- Follow up r17004 & bugreport:6995, added safer calculation to strategic points at battle.c&status.c.
- Implemented reading of renewal exp_guild.txt. (tid:75398) - Fixed Status Fogwall(Blinding Mist) to be reduced by status/card. (bugreport:4543) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17017 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char')
-rw-r--r--src/char/char.h1
-rw-r--r--src/char/int_guild.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/char/char.h b/src/char/char.h
index dd1c80f9d..e16350cb3 100644
--- a/src/char/char.h
+++ b/src/char/char.h
@@ -4,6 +4,7 @@
#ifndef _CHAR_SQL_H_
#define _CHAR_SQL_H_
+#include "../config/core.h"
#include "../common/core.h" // CORE_ST_LAST
enum E_CHARSERVER_ST
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index c66f43613..661d57c1f 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -726,8 +726,8 @@ int inter_guild_sql_init(void)
castle_db = idb_alloc(DB_OPT_RELEASE_DATA);
//Read exp file
- sv_readdb("db/pre-re", "exp_guild.txt", ',', 1, 1, 100, exp_guild_parse_row);
-
+ sv_readdb("db/"DBPATH, "exp_guild.txt", ',', 1, 1, 100, exp_guild_parse_row);
+
add_timer_func_list(guild_save_timer, "guild_save_timer");
add_timer(gettick() + 10000, guild_save_timer, 0, 0);
return 0;