* Removed some leftover code that shouldn't have been merged

* Possibly corrected a guild saving problem (bugreport:1908)

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

7 files changed, 6 insertions, 51 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index f8679cabf..70251b7ba 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2008/07/27
+	* Possibly corrected a guild saving problem (bugreport:1908)
+	* Removed some leftover code that shouldn't have been merged [ultramage]
 	* Fixed a memory leak in mmo_auth_tosql (extra sql statement being allocated).
 	* Added missing option 'log_db_db' to loginlog_config_read(loginlog_sql.c).
 	* Fixed a memory leak in account_db_sql_destroy. [FlavioJS]
diff --git a/conf/atcommand_athena.conf b/conf/atcommand_athena.conf
index d2deb9777..af2fd1c26 100644
--- a/conf/atcommand_athena.conf
+++ b/conf/atcommand_athena.conf
@@ -709,9 +709,6 @@ reloadskilldb: 99
 // Re-load scripts (admin command)
 reloadscript: 99
 
-// Re-load GM level (admin command)
-reloadgmdb: 99
-
 // Change a battle_config flag without rebooting server
 setbattleflag: 99
 
diff --git a/configure b/configure
index 290958782..c94e71e72 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 12731 .
+# From configure.in Revision: 13000 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -663,7 +663,6 @@ OBJEXT
 CPP
 GREP
 EGREP
-HAVE_OPENRJ_TXT
 MYSQL_CONFIG_HOME
 HAVE_MYSQL
 MYSQL_VERSION
@@ -1261,8 +1260,6 @@ Optional Features:
                           instead of TXT files in the sql map-server.
                           (disabled by default)
   --enable-debug          Compiles extra debug code. (disabled by default)
-  --disable-openrj-txt    Disables the openrj-based account engine in the TXT
-                          login-server (enabled by default)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1811,28 +1808,6 @@ fi
 
 
 #
-# OpenRJ account engine in the txt login server
-#
-# Check whether --enable-openrj-txt was given.
-if test "${enable_openrj_txt+set}" = set; then
-  enableval=$enable_openrj_txt;
-		HAVE_OPENRJ_TXT="$enableval"
-		case $enableval in
-			no);;
-			yes);;
-			*) { { echo "$as_me:$LINENO: error: invalid argument --enable-openrj-txt=$enableval... stopping" >&5
-echo "$as_me: error: invalid argument --enable-openrj-txt=$enableval... stopping" >&2;}
-   { (exit 1); exit 1; }; };;
-		esac
-
-else
-  HAVE_OPENRJ_TXT="yes"
-
-fi
-
-
-
-#
 # Enable/disable MySql and optionally specify the path to mysql_config (optional library)
 #
 
@@ -4556,12 +4531,6 @@ fi
 
 
 #
-# OpenRJ account engine in the txt login server
-#
-
-
-
-#
 # zlib library (required)
 #
 if test -n "${ZLIB_HOME}" ; then
@@ -6145,7 +6114,6 @@ OBJEXT!$OBJEXT$ac_delim
 CPP!$CPP$ac_delim
 GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
-HAVE_OPENRJ_TXT!$HAVE_OPENRJ_TXT$ac_delim
 MYSQL_CONFIG_HOME!$MYSQL_CONFIG_HOME$ac_delim
 HAVE_MYSQL!$HAVE_MYSQL$ac_delim
 MYSQL_VERSION!$MYSQL_VERSION$ac_delim
@@ -6159,7 +6127,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 59; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 9e419c65b..858a8a513 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -414,9 +414,8 @@ struct guild {
 	struct guild_alliance alliance[MAX_GUILDALLIANCE];
 	struct guild_expulsion expulsion[MAX_GUILDEXPULSION];
 	struct guild_skill skill[MAX_GUILDSKILL];
-#ifndef TXT_ONLY
-	unsigned short save_flag;
-#endif
+
+	unsigned short save_flag; // for TXT saving
 };
 
 struct guild_castle {
diff --git a/vcproj-6/login-server_txt.dsp b/vcproj-6/login-server_txt.dsp
index 8f93aaa7b..f1d604759 100644
--- a/vcproj-6/login-server_txt.dsp
+++ b/vcproj-6/login-server_txt.dsp
@@ -191,10 +191,6 @@ SOURCE=..\src\login\account.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\login\account_rj.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\login\account_txt.c
 # End Source File
 # Begin Source File
diff --git a/vcproj-7.1/login-server_txt.vcproj b/vcproj-7.1/login-server_txt.vcproj
index 266289303..37086403c 100644
--- a/vcproj-7.1/login-server_txt.vcproj
+++ b/vcproj-7.1/login-server_txt.vcproj
@@ -149,9 +149,6 @@
 				RelativePath="..\src\login\account.h">
 			</File>
 			<File
-				RelativePath="..\src\login\account_rj.c">
-			</File>
-			<File
 				RelativePath="..\src\login\account_txt.c">
 			</File>
 			<File
diff --git a/vcproj-8/login-server_txt.vcproj b/vcproj-8/login-server_txt.vcproj
index 61e395b30..4ed7a7d61 100644
--- a/vcproj-8/login-server_txt.vcproj
+++ b/vcproj-8/login-server_txt.vcproj
@@ -206,10 +206,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\login\account_rj.c"
-				>
-			</File>
-			<File
 				RelativePath="..\src\login\account_txt.c"
 				>
 			</File>