summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-25 19:51:31 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-25 19:51:31 +0000
commit38670608588af6fae4f1de2890262a8e22f684fa (patch)
tree176d21f9a467d5b1a5805d58f790e40feaaf1b53
parent0aa8d501408119e45d3b08eaf9160f99b749b341 (diff)
downloadhercules-38670608588af6fae4f1de2890262a8e22f684fa.tar.gz
hercules-38670608588af6fae4f1de2890262a8e22f684fa.tar.bz2
hercules-38670608588af6fae4f1de2890262a8e22f684fa.tar.xz
hercules-38670608588af6fae4f1de2890262a8e22f684fa.zip
* Fixed a compile error in txt-converter-char caused by 'save_log' being declared by both SQL and TXT (bugreport:4671, since r14619).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14622 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/char/char.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 49b72e0f5..ef4c2a7cf 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,7 @@
Date Added
2010/12/25
+ * Fixed a compile error in txt-converter-char caused by 'save_log' being declared by both SQL and TXT (bugreport:4671, since r14619). [Ai4rei]
* Made SQL char-server options 'chars_per_account' and 'char_del_level' work on TXT as well (follow up to r1063 and r8420). [Ai4rei]
2010/12/24
* Added support for new /remove and /recall packets for 2010-08-03aRagexeRE and newer. [Ai4rei]
diff --git a/src/char/char.c b/src/char/char.c
index 1459d1ef2..6dd131976 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -41,9 +41,7 @@ char hotkeys_txt[1024] = "save/hotkeys.txt";
char char_log_filename[1024] = "log/char.log";
// show loading/saving messages
-#ifdef TXT_SQL_CONVERT
-int save_log = 0; //Have the logs be off by default when converting
-#else
+#ifndef TXT_SQL_CONVERT
int save_log = 1;
#endif