Bladeren bron

* 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://svn.code.sf.net/p/rathena/svn/trunk@14622 54d463be-8e91-2dee-dedb-b68131a5f0ec
ai4rei 14 jaren geleden
bovenliggende
commit
3eb60a58f7
2 gewijzigde bestanden met toevoegingen van 2 en 3 verwijderingen
  1. 1 0
      Changelog-Trunk.txt
  2. 1 3
      src/char/char.c

+ 1 - 0
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]

+ 1 - 3
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