Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13003 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2008-07-27 07:07:20 +00:00
parent a389d52d34
commit 8fed0c403c
7 changed files with 6 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -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]

3
conf/atcommand_athena.conf
View File

@ -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

36
configure vendored
View File

@ -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]
@ -1810,28 +1807,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)
#
@ -4555,12 +4530,6 @@ if test "$enable_debug" = "yes" ; then
fi
#
# OpenRJ account engine in the txt login server
#
#
# zlib library (required)
#
@ -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

5
src/common/mmo.h
View File

@ -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 {

4
vcproj-6/login-server_txt.dsp
View File

@ -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

3
vcproj-7.1/login-server_txt.vcproj
View File

@ -148,9 +148,6 @@
<File
RelativePath="..\src\login\account.h">
</File>
<File
RelativePath="..\src\login\account_rj.c">
</File>
<File
RelativePath="..\src\login\account_txt.c">
</File>

4
vcproj-8/login-server_txt.vcproj
View File

@ -205,10 +205,6 @@
RelativePath="..\src\login\account.h"
>
</File>
<File
RelativePath="..\src\login\account_rj.c"
>
</File>
<File
RelativePath="..\src\login\account_txt.c"
>