mmo-ref/rathena
1
0
Fork 0
mirror of https://github.com/rathena/rathena synced 2026-08-16 22:26:42 -04:00
Code Issues Projects Releases Packages Wiki Activity

TXT reference removal from emulator.

Browse source 
- Removed any remaining TXT and SQL references from files.
- The 'make sql' command is now replaced by 'make server'.
- Removed account.engine feature as it is no longer needed.
- Moved login and IP ban configs to inter_athena.conf.
- Cleaned up cmake files.
- Miscellaneous clean ups.
This commit is contained in:
aleos89 2014-09-03 17:44:35 -04:00
parent 3c24f458ce
commit 2d2991a1fd
66 changed files with 1152 additions and 1251 deletions
Download patch file Download diff file Expand all files Collapse all files

30
.gitignore vendored
View file

@ -22,17 +22,17 @@ Thumbs.db
/*.sdf
/*.stackdump
/*.suo
/char-server_sql
/char-server
/char-server
/config.log
/config.status
/core
/ipch
/login-server_sql
/login-server
/login-server
/Makefile
/Makefile.cache
/map-server_sql
/map-server
/map-server
/mapcache
/nbproject
@ -98,30 +98,30 @@ Thumbs.db
/tools/*.pdb
# /vcproj-13/
/vcproj-13/char-server_sql
/vcproj-13/login-server_sql
/vcproj-13/char-server
/vcproj-13/login-server
/vcproj-13/mapcache
/vcproj-13/map-server_sql
/vcproj-13/map-server
/vcproj-13/*.user
# /vcproj-12/
/vcproj-12/char-server_sql
/vcproj-12/login-server_sql
/vcproj-12/char-server
/vcproj-12/login-server
/vcproj-12/mapcache
/vcproj-12/map-server_sql
/vcproj-12/map-server
/vcproj-12/*.user
# /vcproj-10/
/vcproj-10/char-server_sql
/vcproj-10/login-server_sql
/vcproj-10/char-server
/vcproj-10/login-server
/vcproj-10/mapcache
/vcproj-10/map-server_sql
/vcproj-10/map-server
/vcproj-10/*.user
# /vcproj-9/
/vcproj-9/*.user
/vcproj-9/char-server_sql
/vcproj-9/login-server_sql
/vcproj-9/map-server_sql
/vcproj-9/char-server
/vcproj-9/login-server
/vcproj-9/map-server
/vcproj-9/mapcache
/conf/.tmp-desd_conf.yml

4
.travis.yml
View file

@ -7,9 +7,9 @@ before_script:
- uname -a
script:
- ./configure && make sql
- ./configure && make server
- make clean
- ./configure --enable-prere && make sql
- ./configure --enable-prere && make server
notifications:
email: false

17
3rdparty/libconfig/Makefile.in vendored
View file

@ -7,9 +7,9 @@ LIBCONFIG_AR = obj/libconfig.a
@SET_MAKE@
#####################################################################
.PHONY : all clean help
.PHONY : all clean help libconfig
all: $(LIBCONFIG_AR)
all: libconfig
clean:
@echo " CLEAN libconfig"
@ -17,13 +17,14 @@ clean:
help:
@echo "possible targets are 'all' 'clean' 'help'"
@echo "'all' - builds $(LIBCONFIG_DIR_OBJ)"
@echo "'clean' - deletes $(LIBCONFIG_DIR_OBJ)"
@echo "'help' - outputs this message"
@echo "'libconfig' - build $(LIBCONFIG_AR)
@echo "'all' - builds $(LIBCONFIG_DIR_OBJ)"
@echo "'clean' - deletes $(LIBCONFIG_DIR_OBJ)"
@echo "'help' - outputs this message"
#####################################################################
obj_dir:
obj:
@echo " MKDIR obj"
@-mkdir obj
@ -31,6 +32,8 @@ obj/%.o: %.c $(LIBCONFIG_H)
@echo " CC $<"
@@CC@ @CFLAGS@ @DEFS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
$(LIBCONFIG_AR): obj_dir $(LIBCONFIG_DIR_OBJ)
libconfig: obj $(LIBCONFIG_DIR_OBJ) $(LIBCONFIG_AR)
$(LIBCONFIG_AR): $(LIBCONFIG_DIR_OBJ)
@echo " AR $@"
@@AR@ rcs obj/libconfig.a $(LIBCONFIG_DIR_OBJ)

48
CMakeLists.txt
View file

@ -14,9 +14,10 @@
# ENABLE_* : option to use an internal feature/code or not
# HAVE_* : internal variable indicating if we have and are using something
#
# Maintainer: Fl<46>vio J. Saraiva (feel free to send complaints or suggestions)
# Maintainers: Flavio J. Saraiva (feel free to send complaints or suggestions)
# flaviojs @ rAthena forum/irc
# flaviojs2005 \A-T/ gmail <D.o,T> com
# lightaisme \A-T/ gmail <D.o,T> com
#
#####################################################################
@ -28,7 +29,7 @@
# CYGWIN no longer defines WIN32
# CMP0017: Prefer files from the CMake module directory when including from there.
set( CMAKE_LEGACY_CYGWIN_WIN32 0 )
cmake_minimum_required( VERSION 2.8.3 )
cmake_minimum_required( VERSION 2.8.8 )
project( rAthena C )
if( CYGWIN )
unset( WIN32 )
@ -82,6 +83,27 @@ include( CheckFunctionExists )
include( FindFunctionLibrary )
include( TestBigEndian )
#
# PACKETVER
#
set( PACKETVER CACHE STRING "Sets the PACKETVER define of the servers. (see src/common/mmo.h)" )
if( PACKETVER )
list( APPEND GLOBAL_DEFINITIONS PACKETVER=${PACKETVER} )
endif()
#
# Find git
#
message( STATUS "Detecting git" )
find_package(Git)
if(GIT_FOUND)
if(GIT_VERSION_STRING)
message(STATUS "Found git : ${GIT_EXECUTABLE} version (${GIT_VERSION_STRING})")
else()
message(STATUS "Found git : ${GIT_EXECUTABLE}")
endif()
endif()
#
# Find svnversion
@ -93,24 +115,12 @@ if( SVNVERSION_EXECUTABLE )
message( STATUS "Found svnversion: ${SVNVERSION_EXECUTABLE}" )
endif()
message( STATUS "Detecting svnversion - done" )
#
# Find Subversion
#
message( STATUS "Detecting Subversion" )
find_package( Subversion )
message( STATUS "Detecting Subversion - done" )
#
# PACKETVER
#
set( PACKETVER CACHE STRING "Sets the PACKETVER define of the servers. (see src/common/mmo.h)" )
if( PACKETVER )
list( APPEND GLOBAL_DEFINITIONS PACKETVER=${PACKETVER} )
endif()
#
# SVNVERSION
#
@ -123,7 +133,7 @@ if( SVNVERSION_EXECUTABLE )
set( SVNVERSION )
endif()
string( REGEX REPLACE "[^1234567890MSexported]" "_" SVNVERSION "${SVNVERSION}" )
message( STATUS "Found version: ${SVNVERSION}" )
message( STATUS "Found SVNversion: ${SVNVERSION}" )
message( STATUS "Getting svn version - done" )
endif()
if( Subversion_FOUND AND SVNVERSION )
@ -471,15 +481,15 @@ set( DEVELOPMENT_DIRECTORIES
)
set( RUNTIME_FILES
"${CMAKE_CURRENT_SOURCE_DIR}/athena-start"
"${CMAKE_CURRENT_SOURCE_DIR}/charserv-sql.bat"
"${CMAKE_CURRENT_SOURCE_DIR}/charserv.bat"
"${CMAKE_CURRENT_SOURCE_DIR}/dbghelp.dll"
"${CMAKE_CURRENT_SOURCE_DIR}/libmysql.dll"
"${CMAKE_CURRENT_SOURCE_DIR}/LICENSE"
"${CMAKE_CURRENT_SOURCE_DIR}/logserv-sql.bat"
"${CMAKE_CURRENT_SOURCE_DIR}/mapserv-sql.bat"
"${CMAKE_CURRENT_SOURCE_DIR}/logserv.bat"
"${CMAKE_CURRENT_SOURCE_DIR}/mapserv.bat"
"${CMAKE_CURRENT_SOURCE_DIR}/pcre3.dll"
"${CMAKE_CURRENT_SOURCE_DIR}/README.txt"
"${CMAKE_CURRENT_SOURCE_DIR}/runserver-sql.bat"
"${CMAKE_CURRENT_SOURCE_DIR}/runserver.bat"
"${CMAKE_CURRENT_SOURCE_DIR}/serv.bat"
"${CMAKE_CURRENT_SOURCE_DIR}/zlib1.dll"
)

53
Makefile.in
View file

@ -3,25 +3,25 @@
HAVE_MYSQL=@HAVE_MYSQL@
OMAP=@OMAP@
ifeq ($(HAVE_MYSQL),yes)
ALL_DEPENDS=sql tools
SQL_DEPENDS=common_sql login char map import
COMMON_SQL_DEPENDS=mt19937ar libconfig
LOGIN_SQL_DEPENDS=mt19937ar libconfig common_sql
CHAR_SQL_DEPENDS=mt19937ar libconfig common_sql
MAP_SQL_DEPENDS=mt19937ar libconfig common_sql
ALL_DEPENDS=server tools
SERVER_DEPENDS=common login char map import
COMMON_DEPENDS=mt19937ar libconfig
LOGIN_DEPENDS=mt19937ar libconfig common
CHAR_DEPENDS=mt19937ar libconfig common
MAP_DEPENDS=mt19937ar libconfig common
else
ALL_DEPENDS=needs_mysql
SQL_DEPENDS=needs_mysql
COMMON_SQL_DEPENDS=needs_mysql
LOGIN_SQL_DEPENDS=needs_mysql
CHAR_SQL_DEPENDS=needs_mysql
MAP_SQL_DEPENDS=needs_mysql
SERVER_DEPENDS=needs_mysql
COMMON_DEPENDS=needs_mysql
LOGIN_DEPENDS=needs_mysql
CHAR_DEPENDS=needs_mysql
MAP_DEPENDS=needs_mysql
endif
#####################################################################
.PHONY: all sql \
common_sql \
.PHONY: all server \
common \
mt19937ar \
login \
char \
@ -34,19 +34,22 @@ endif
all: $(ALL_DEPENDS)
sql: $(SQL_DEPENDS)
sql:
@echo "-!- 'make sql' is now deprecated. Please run 'make server' to continue. -!-"
common_sql: $(COMMON_SQL_DEPENDS)
@$(MAKE) -C src/common sql
server: $(SERVER_DEPENDS)
login: $(LOGIN_SQL_DEPENDS)
@$(MAKE) -C src/login sql
common: $(COMMON_DEPENDS)
@$(MAKE) -C src/common server
char: $(CHAR_SQL_DEPENDS)
login: $(LOGIN_DEPENDS)
@$(MAKE) -C src/login server
char: $(CHAR_DEPENDS)
@$(MAKE) -C src/char
map: $(MAP_SQL_DEPENDS)
@$(MAKE) -C src/map sql
map: $(MAP_DEPENDS)
@$(MAKE) -C src/map server
mt19937ar:
@$(MAKE) -C 3rdparty/mt19937ar
@ -86,18 +89,18 @@ clean:
@$(MAKE) -C src/test $@
help:
@echo "most common targets are 'all' 'sql' 'conf' 'clean' 'help'"
@echo "most common targets are 'all' 'server' 'conf' 'clean' 'help'"
@echo "possible targets are:"
@echo "'common_sql' - builds object files used in SQL servers"
@echo "'common' - builds object files used for the three servers"
@echo "'mt19937ar' - builds object file of Mersenne Twister MT19937"
@echo "'libconfig' - builds object files of libconfig"
@echo "'login' - builds login server"
@echo "'char' - builds char server"
@echo "'map' - builds map server"
@echo "'map' - builds map server"
@echo "'tools' - builds all the tools in src/tools"
@echo "'import' - builds conf/import, conf/msg_conf/import and db/import folders from their template folders (x-tmpl)"
@echo "'all' - builds all the above targets"
@echo "'sql' - builds servers (targets 'common_sql' 'login' 'char' 'map' and 'import')"
@echo "'server' - builds servers (targets 'common' 'login' 'char' 'map' and 'import')"
@echo "'test' - builds tests"
@echo "'clean' - cleans builds and objects"
@echo "'install' - run installer wich setup rathena in /opt/"

2
README.md
View file

@ -102,7 +102,7 @@ can be solved simply by looking at the error messages given.
Examples:
* You get an error on your map-server_sql that looks something like this:
* You get an error on your map-server that looks something like this:
[Error]: npc_parsesrcfile: Unable to parse, probably a missing or extra TAB in
file 'npc/custom/jobmaster.txt', line '17'. Skipping line...

2
README.txt
View file

@ -109,7 +109,7 @@ can be solved simply by looking at the error messages given.
Examples:
1.) You get an error on your map-server_sql that looks something like this:
1.) You get an error on your map-server that looks something like this:
[Error]: npc_parsesrcfile: Unable to parse, probably a missing or extra TAB in
file 'npc/custom/jobmaster.txt', line '17'. Skipping line...

2
charserv-sql.bat
View file

@ -1,2 +0,0 @@
@ECHO OFF
CALL serv.bat char-server_sql.exe Char-Server

2
charserv.bat Normal file
View file

@ -0,0 +1,2 @@
@ECHO OFF
CALL serv.bat char-server.exe Char-Server

38
conf/inter_athena.conf
View file

@ -12,13 +12,10 @@ inter_log_filename: log/inter.log
// Level range for sharing within a party
party_share_level: 15
// SQL version options only
// You can specify the codepage to use in your mySQL tables here.
// You can specify the codepage to use in your MySQL tables here.
// (Note that this feature requires MySQL 4.1+)
//default_codepage:
// For IPs, ideally under linux, you want to use localhost instead of 127.0.0.1
// Under windows, you want to use 127.0.0.1. If you see a message like
// "Can't connect to local MySQL server through socket '/tmp/mysql.sock' (2)"
@ -27,28 +24,38 @@ party_share_level: 15
// Global SQL settings
// overridden by local settings when the hostname is defined there
// (currently only the login-server reads/obeys these settings)
sql.db_hostname: 127.0.0.1
sql.db_port: 3306
sql.db_username: ragnarok
sql.db_password: ragnarok
sql.db_database: ragnarok
sql.codepage:
// MySQL Character SQL server
// MySQL Login server
login_server_ip: 127.0.0.1
login_server_port: 3306
login_server_id: ragnarok
login_server_pw: ragnarok
login_server_db: ragnarok
login_codepage:
login_case_sensitive: no
ipban_db_ip: 127.0.0.1
ipban_db_port: 3306
ipban_db_id: ragnarok
ipban_db_pw: ragnarok
ipban_db_db: ragnarok
ipban_codepage:
// MySQL Character server
char_server_ip: 127.0.0.1
char_server_port: 3306
char_server_id: ragnarok
char_server_pw: ragnarok
char_server_db: ragnarok
// MySQL Map SQL Server
// MySQL Map Server
map_server_ip: 127.0.0.1
map_server_port: 3306
map_server_id: ragnarok
map_server_pw: ragnarok
map_server_db: ragnarok
// MySQL Log SQL Database
// MySQL Log Database
log_db_ip: 127.0.0.1
log_db_port: 3306
log_db_id: ragnarok
@ -71,6 +78,11 @@ mysql_reconnect_count: 1
// ALL MySQL Database Table names
// Login Database Tables
login_server_account_db: login
login_server_accreg_db: global_reg_value
ipban_table: ipbanlist
// Char Database Tables
char_db: char
hotkey_db: hotkey

43
conf/login_athena.conf
View file

@ -56,7 +56,7 @@ time_allowed: 10
login_log_filename: log/login.log
// To log the login server?
// NOTE: The login-sql server needs the login logs to enable dynamic pass failure bans.
// NOTE: The login server needs the login logs to enable dynamic pass failure bans.
log_login: yes
// Indicate how to display date in logs, to players, etc.
@ -105,21 +105,17 @@ client_version_to_connect: 20
// NOTE: Will not work with clients that use <passwordencrypt>
use_MD5_passwords: no
// Ipban features (SQL only)
ipban.enable: yes
//ipban.sql.db_hostname: 127.0.0.1
//ipban.sql.db_port: 3306
//ipban.sql.db_username: ragnarok
//ipban.sql.db_password: ragnarok
//ipban.sql.db_database: ragnarok
//ipban.sql.codepage:
//ipban.sql.ipban_table: ipbanlist
// Ipban features
ipban_enable: yes
// Dynamic password failure ipban system
ipban.dynamic_pass_failure_ban: yes
ipban.dynamic_pass_failure_ban_interval: 5
ipban.dynamic_pass_failure_ban_limit: 7
ipban.dynamic_pass_failure_ban_duration: 5
// Ban user after a number of failed attempts?
ipban_dynamic_pass_failure_ban: yes
// Interval (in minutes) to calculate how many failed attempts.
ipban_dynamic_pass_failure_ban_interval: 5
// Maximum amount of failed attempts before banning.
ipban_dynamic_pass_failure_ban_limit: 7
// Time (in minutes) for ban duration.
ipban_dynamic_pass_failure_ban_duration: 5
// Interval (in seconds) to clean up expired IP bans. 0 = disabled. default = 60.
// NOTE: Even if this is disabled, expired IP bans will be cleaned up on login server start/stop.
// Players will still be able to login if an ipban entry exists but the expiration time has already passed.
@ -145,23 +141,6 @@ dnsbl_servers: bl.blocklist.de, socks.dnsbl.sorbs.net
// socks.dnsbl.sorbs.net Open SOCKS proxy servers
// tor.ahbl.org Current tor relay and exit nodes
// Which account engine to use.
// 'auto' selects the first engine available (txt, sql, then others)
// (defaults to auto)
account.engine: auto
// Account data storage configuration
// SQL
//account.sql.db_hostname: 127.0.0.1
//account.sql.db_port: 3306
//account.sql.db_username: ragnarok
//account.sql.db_password: ragnarok
//account.sql.db_database: ragnarok
//account.sql.codepage:
//account.sql.case_sensitive: no
//account.sql.account_db: login
//account.sql.accreg_db: global_reg_value
// Client MD5 hash check
// If turned on, the login server will check if the client's hash matches
// the value below, and will not connect tampered clients.

4
function.sh
View file

@ -9,14 +9,14 @@ check_files() {
for i in ${L_SRV} ${C_SRV} ${M_SRV}
do
if [ ! -f ./$i ]; then
echo "$i does not exist extiting"
echo "$i does not exist... exiting..."
exit 1;
fi
done
}
check_inst_right(){
if [ ! -w $INST_PATH ]; then echo "You must have sudo right to use this install (writte/read permission in /opt/ )" && exit; fi
if [ ! -w $INST_PATH ]; then echo "You must have sudo right to use this install (write/read permission in /opt/ )" && exit; fi
}
inst_launch_workaround(){

4
install.sh
View file

@ -2,7 +2,7 @@
#source var/function
. ./function.sh
#read -p "WARNING: This target is experimental. Press Ctrl+C to cancel or Enter to continue." readEnterKey
#read -p "WARNING: This script is experimental. Press Ctrl+C to cancel or Enter to continue." readEnterKey
# NOTE: This requires GNU getopt. On Mac OS X and FreeBSD, you have to install this
# separately; see below.
@ -40,4 +40,4 @@ ln -fs $PKG_PATH/var/$PKG/log/ $PKG_PATH/log
ln -fs $PKG_PATH/etc/$PKG/conf/ $PKG_PATH/conf
ln -fs $PKG_PATH/athena-start /usr/bin/$PKG
for f in $(ls $PKG_PATH/bin/) ; do ln -fs $PKG_PATH/bin/$f $PKG_PATH/$f; done
echo "Installation is done you can now control server with '$PKG start'"
echo "Installation is done. You can now control the server with '$PKG start'"

2
logserv-sql.bat
View file

@ -1,2 +0,0 @@
@ECHO OFF
CALL serv.bat login-server_sql.exe Login-Server

2
logserv.bat Normal file
View file

@ -0,0 +1,2 @@
@ECHO OFF
CALL serv.bat login-server.exe Login-Server

2
mapserv-sql.bat
View file

@ -1,2 +0,0 @@
@ECHO OFF
CALL serv.bat map-server_sql.exe Map-Server

2
mapserv.bat Normal file
View file

@ -0,0 +1,2 @@
@ECHO OFF
CALL serv.bat map-server.exe Map-Server

6
rAthena-10.sln
View file

@ -1,10 +1,10 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_sql", "vcproj-10\char-server_sql.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server", "vcproj-10\char-server.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_sql", "vcproj-10\login-server_sql.vcxproj", "{D356871D-58E1-450B-967A-E5E9646175AF}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server", "vcproj-10\login-server.vcxproj", "{D356871D-58E1-450B-967A-E5E9646175AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_sql", "vcproj-10\map-server_sql.vcxproj", "{D356871D-58E1-450B-967A-E6E9646175AF}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server", "vcproj-10\map-server.vcxproj", "{D356871D-58E1-450B-967A-E6E9646175AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-10\mapcache.vcxproj", "{D356871D-58E1-450B-967A-E7E9646175AF}"
EndProject

6
rAthena-12.sln
View file

@ -1,11 +1,11 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_sql", "vcproj-12\char-server_sql.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server", "vcproj-12\char-server.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_sql", "vcproj-12\login-server_sql.vcxproj", "{D356871D-58E1-450B-967A-E5E9646175AF}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server", "vcproj-12\login-server.vcxproj", "{D356871D-58E1-450B-967A-E5E9646175AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_sql", "vcproj-12\map-server_sql.vcxproj", "{D356871D-58E1-450B-967A-E6E9646175AF}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server", "vcproj-12\map-server.vcxproj", "{D356871D-58E1-450B-967A-E6E9646175AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-12\mapcache.vcxproj", "{D356871D-58E1-450B-967A-E7E9646175AF}"
EndProject

6
rAthena-13.sln
View file

@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_sql", "vcproj-13\char-server_sql.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server", "vcproj-13\char-server.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_sql", "vcproj-13\login-server_sql.vcxproj", "{D356871D-58E1-450B-967A-E5E9646175AF}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server", "vcproj-13\login-server.vcxproj", "{D356871D-58E1-450B-967A-E5E9646175AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_sql", "vcproj-13\map-server_sql.vcxproj", "{D356871D-58E1-450B-967A-E6E9646175AF}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server", "vcproj-13\map-server.vcxproj", "{D356871D-58E1-450B-967A-E6E9646175AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-13\mapcache.vcxproj", "{D356871D-58E1-450B-967A-E7E9646175AF}"
EndProject

6
rAthena-9.sln
View file

@ -1,10 +1,10 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_sql", "vcproj-9\char-server_sql.vcproj", "{D356871D-58E1-450B-967A-E4E9646175AF}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server", "vcproj-9\char-server.vcproj", "{D356871D-58E1-450B-967A-E4E9646175AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_sql", "vcproj-9\login-server_sql.vcproj", "{D356871D-58E1-450B-967A-E5E9646175AF}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server", "vcproj-9\login-server.vcproj", "{D356871D-58E1-450B-967A-E5E9646175AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_sql", "vcproj-9\map-server_sql.vcproj", "{D356871D-58E1-450B-967A-E6E9646175AF}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server", "vcproj-9\map-server.vcproj", "{D356871D-58E1-450B-967A-E6E9646175AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-9\mapcache.vcproj", "{D356871D-58E1-450B-967A-E7E9646175AF}"
EndProject

6
runserver-sql.bat → runserver.bat Executable file → Normal file
View file

@ -3,6 +3,6 @@ rem This is and auto-restart script for the rAthena Ragnarok Online Server Emula
rem It will also keep the map server OPEN after it crashes to that errors may be
rem more easily identified
rem Writen by Jbain
start cmd /k logserv-sql.bat
start cmd /k charserv-sql.bat
start cmd /k mapserv-sql.bat
start cmd /k logserv.bat
start cmd /k charserv.bat
start cmd /k mapserv.bat

6
src/CMakeLists.txt
View file

@ -3,10 +3,10 @@
# setup and static libraries
#
add_subdirectory( common )
if( HAVE_common_sql )
option( BUILD_SQL_SERVERS "build sql server executables" ON )
if( HAVE_common )
option( BUILD_SERVERS "build server executables" ON )
else()
message( STATUS "Disabled sql server targets (requires common_sql)" )
message( STATUS "Disabled server targets (requires common)" )
endif()

104
src/char/CMakeLists.txt
View file

@ -1,68 +1,68 @@
#
# setup
#
set( SQL_CHAR_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "" )
set( SERVER_CHAR_SOURCE_DIR ${SERVER_CHAR_SOURCE_DIR} CACHE INTERNAL "" )
#
# char sql
# char server
#
if( BUILD_SQL_SERVERS )
message( STATUS "Creating target char-server_sql" )
set( SQL_CHAR_HEADERS
"${CMAKE_CURRENT_SOURCE_DIR}/char.h"
"${CMAKE_CURRENT_SOURCE_DIR}/char_clif.h"
"${CMAKE_CURRENT_SOURCE_DIR}/char_cnslif.h"
"${CMAKE_CURRENT_SOURCE_DIR}/char_logif.h"
"${CMAKE_CURRENT_SOURCE_DIR}/char_mapif.h"
"${CMAKE_CURRENT_SOURCE_DIR}/int_auction.h"
"${CMAKE_CURRENT_SOURCE_DIR}/int_elemental.h"
"${CMAKE_CURRENT_SOURCE_DIR}/int_guild.h"
"${CMAKE_CURRENT_SOURCE_DIR}/int_homun.h"
"${CMAKE_CURRENT_SOURCE_DIR}/int_mail.h"
"${CMAKE_CURRENT_SOURCE_DIR}/int_mercenary.h"
"${CMAKE_CURRENT_SOURCE_DIR}/int_party.h"
"${CMAKE_CURRENT_SOURCE_DIR}/int_pet.h"
"${CMAKE_CURRENT_SOURCE_DIR}/int_quest.h"
"${CMAKE_CURRENT_SOURCE_DIR}/int_storage.h"
"${CMAKE_CURRENT_SOURCE_DIR}/inter.h"
if( BUILD_SERVERS )
message( STATUS "Creating target char-server" )
set( CHAR_HEADERS
"${SERVER_CHAR_SOURCE_DIR}/char.h"
"${SERVER_CHAR_SOURCE_DIR}/char_clif.h"
"${SERVER_CHAR_SOURCE_DIR}/char_cnslif.h"
"${SERVER_CHAR_SOURCE_DIR}/char_logif.h"
"${SERVER_CHAR_SOURCE_DIR}/char_mapif.h"
"${SERVER_CHAR_SOURCE_DIR}/int_auction.h"
"${SERVER_CHAR_SOURCE_DIR}/int_elemental.h"
"${SERVER_CHAR_SOURCE_DIR}/int_guild.h"
"${SERVER_CHAR_SOURCE_DIR}/int_homun.h"
"${SERVER_CHAR_SOURCE_DIR}/int_mail.h"
"${SERVER_CHAR_SOURCE_DIR}/int_mercenary.h"
"${SERVER_CHAR_SOURCE_DIR}/int_party.h"
"${SERVER_CHAR_SOURCE_DIR}/int_pet.h"
"${SERVER_CHAR_SOURCE_DIR}/int_quest.h"
"${SERVER_CHAR_SOURCE_DIR}/int_storage.h"
"${SERVER_CHAR_SOURCE_DIR}/inter.h"
)
set( SQL_CHAR_SOURCES
"${CMAKE_CURRENT_SOURCE_DIR}/char.c"
"${CMAKE_CURRENT_SOURCE_DIR}/char_clif.c"
"${CMAKE_CURRENT_SOURCE_DIR}/char_cnslif.c"
"${CMAKE_CURRENT_SOURCE_DIR}/char_logif.c"
"${CMAKE_CURRENT_SOURCE_DIR}/char_mapif.c"
"${CMAKE_CURRENT_SOURCE_DIR}/int_auction.c"
"${CMAKE_CURRENT_SOURCE_DIR}/int_elemental.c"
"${CMAKE_CURRENT_SOURCE_DIR}/int_guild.c"
"${CMAKE_CURRENT_SOURCE_DIR}/int_homun.c"
"${CMAKE_CURRENT_SOURCE_DIR}/int_mail.c"
"${CMAKE_CURRENT_SOURCE_DIR}/int_mercenary.c"
"${CMAKE_CURRENT_SOURCE_DIR}/int_party.c"
"${CMAKE_CURRENT_SOURCE_DIR}/int_pet.c"
"${CMAKE_CURRENT_SOURCE_DIR}/int_quest.c"
"${CMAKE_CURRENT_SOURCE_DIR}/int_storage.c"
"${CMAKE_CURRENT_SOURCE_DIR}/inter.c"
set( CHAR_SOURCES
"${SERVER_CHAR_SOURCE_DIR}/char.c"
"${SERVER_CHAR_SOURCE_DIR}/char_clif.c"
"${SERVER_CHAR_SOURCE_DIR}/char_cnslif.c"
"${SERVER_CHAR_SOURCE_DIR}/char_logif.c"
"${SERVER_CHAR_SOURCE_DIR}/char_mapif.c"
"${SERVER_CHAR_SOURCE_DIR}/int_auction.c"
"${SERVER_CHAR_SOURCE_DIR}/int_elemental.c"
"${SERVER_CHAR_SOURCE_DIR}/int_guild.c"
"${SERVER_CHAR_SOURCE_DIR}/int_homun.c"
"${SERVER_CHAR_SOURCE_DIR}/int_mail.c"
"${SERVER_CHAR_SOURCE_DIR}/int_mercenary.c"
"${SERVER_CHAR_SOURCE_DIR}/int_party.c"
"${SERVER_CHAR_SOURCE_DIR}/int_pet.c"
"${SERVER_CHAR_SOURCE_DIR}/int_quest.c"
"${SERVER_CHAR_SOURCE_DIR}/int_storage.c"
"${SERVER_CHAR_SOURCE_DIR}/inter.c"
)
set( DEPENDENCIES common_sql )
set( DEPENDENCIES common )
set( LIBRARIES ${GLOBAL_LIBRARIES} )
set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} )
set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS}" )
set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} ${SQL_CHAR_HEADERS} ${SQL_CHAR_SOURCES} )
source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} )
source_group( char FILES ${SQL_CHAR_HEADERS} ${SQL_CHAR_SOURCES} )
set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} ${CHAR_HEADERS} ${CHAR_SOURCES} )
source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} )
source_group( char FILES ${CHAR_HEADERS} ${CHAR_SOURCES} )
include_directories( ${INCLUDE_DIRS} )
add_executable( char-server_sql ${SOURCE_FILES} )
add_dependencies( char-server_sql ${DEPENDENCIES} )
target_link_libraries( char-server_sql ${LIBRARIES} ${DEPENDENCIES} )
set_target_properties( char-server_sql PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
add_executable( char-server ${SOURCE_FILES} )
add_dependencies( char-server ${DEPENDENCIES} )
target_link_libraries( char-server ${LIBRARIES} ${DEPENDENCIES} )
set_target_properties( char-server PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
if( INSTALL_COMPONENT_RUNTIME )
cpack_add_component( Runtime_charserver_sql DESCRIPTION "char-server (sql version)" DISPLAY_NAME "char-server_sql" GROUP Runtime )
install( TARGETS char-server_sql
cpack_add_component( Runtime_charserver DESCRIPTION "char-server" DISPLAY_NAME "char-server" GROUP Runtime )
install( TARGETS char-server
DESTINATION "."
COMPONENT Runtime_charserver_sql )
COMPONENT Runtime_charserver )
endif( INSTALL_COMPONENT_RUNTIME )
message( STATUS "Creating target char-server_sql - done" )
endif( BUILD_SQL_SERVERS )
set( TARGET_LIST ${TARGET_LIST} char-server CACHE INTERNAL "" )
message( STATUS "Creating target char-server - done" )
endif( BUILD_SERVERS )

40
src/char/Makefile.in
View file

@ -1,7 +1,6 @@
COMMON_H = $(shell ls ../common/*.h)
COMMON_AR = ../common/obj_all/common.a
COMMON_SQL_AR = ../common/obj_sql/common_sql.a
COMMON_AR = ../common/obj/common.a
COMMON_INCLUDE = -I../common/
MT19937AR_OBJ = ../../3rdparty/mt19937ar/mt19937ar.o
@ -12,37 +11,37 @@ LIBCONFIG_H = $(shell ls ../../3rdparty/libconfig/*.h)
LIBCONFIG_AR = ../../3rdparty/libconfig/obj/libconfig.a
LIBCONFIG_INCLUDE = -I../../3rdparty/libconfig
COMMON_SQL_OBJ = ../common/obj_sql/sql.o
COMMON_OBJ = ../common/obj/sql.o
COMMON_H = ../common/sql.h
CHAR_OBJ = $(shell ls *.c | sed -e "s/\.c/\.o/g")
CHAR_SQL_OBJ = $(CHAR_OBJ:%=obj_sql/%)
CHAR_DIR_OBJ = $(CHAR_OBJ:%=obj/%)
CHAR_H = $(shell ls ../char/*.h)
HAVE_MYSQL=@HAVE_MYSQL@
ifeq ($(HAVE_MYSQL),yes)
SQL_DEPENDS=char-server
SERVER_DEPENDS=char-server
else
SQL_DEPENDS=needs_mysql
SERVER_DEPENDS=needs_mysql
endif
ALL_DEPENDS=sql
ALL_DEPENDS=server
@SET_MAKE@
#####################################################################
.PHONY : all sql clean help
.PHONY : all server clean help
all: $(ALL_DEPENDS)
sql: $(SQL_DEPENDS)
server: $(SERVER_DEPENDS)
clean:
@echo " CLEAN char"
@rm -rf *.o obj_sql ../../@OCHR@@EXEEXT@
@rm -rf *.o obj ../../@OCHR@@EXEEXT@
help:
@echo "possible targets are 'sql' 'all' 'clean' 'help'"
@echo "'sql' - char server"
@echo "possible targets are 'server' 'all' 'clean' 'help'"
@echo "'server' - char server"
@echo "'all' - builds all above targets"
@echo "'clean' - cleans builds and objects"
@echo "'help' - outputs this message"
@ -50,28 +49,25 @@ help:
#####################################################################
char-server: obj_sql $(CHAR_SQL_OBJ) $(LIBCONFIG_AR) $(COMMON_SQL_AR) $(COMMON_AR)
char-server: obj $(CHAR_DIR_OBJ) $(LIBCONFIG_AR) $(COMMON_AR)
@echo " LD @OCHR@@EXEEXT@"
@@CC@ @LDFLAGS@ -o ../../@OCHR@@EXEEXT@ $(CHAR_SQL_OBJ) $(LIBCONFIG_AR) $(COMMON_SQL_AR) $(COMMON_AR) $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@
@@CC@ @LDFLAGS@ -o ../../@OCHR@@EXEEXT@ $(CHAR_DIR_OBJ) $(LIBCONFIG_AR) $(COMMON_AR) $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@
needs_mysql:
@echo "MySQL not found or disabled by the configure script"
@exit 1
obj_sql:
@echo " MKDIR obj_sql"
@-mkdir obj_sql
obj:
@echo " MKDIR obj"
@-mkdir obj
obj_sql/%.o: %.c $(CHAR_H) $(COMMON_H) $(COMMON_SQL_H) $(MT19937AR_H) $(LIBCONFIG_H)
obj/%.o: %.c $(CHAR_H) $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H)
@echo " CC $<"
@@CC@ @CFLAGS@ $(COMMON_INCLUDE) $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
# missing object files
$(COMMON_AR):
@$(MAKE) -C ../common sql
$(COMMON_SQL_AR):
@$(MAKE) -C ../common sql
@$(MAKE) -C ../common server
$(MT19937AR_OBJ):
@$(MAKE) -C ../../3rdparty/mt19937ar

1
src/char/int_pet.h
View file

@ -15,7 +15,6 @@ int inter_pet_parse_frommap(int fd);
int inter_pet_sql_init(void);
//extern char pet_txt[256];
//Exported for use in the TXT-SQL converter.
int inter_pet_tosql(int pet_id, struct s_pet *p);
#endif /* _INT_PET_SQL_H_ */

34
src/common/CMakeLists.txt
View file

@ -136,32 +136,32 @@ endif()
#
# common_sql
# common
#
if( HAVE_common_base AND WITH_MYSQL )
message( STATUS "Creating target common_sql" )
set( COMMON_SQL_HEADERS
message( STATUS "Creating target common" )
set( COMMON_HEADERS
${COMMON_ALL_HEADERS}
"${CMAKE_CURRENT_SOURCE_DIR}/sql.h"
CACHE INTERNAL "common_sql headers" )
set( COMMON_SQL_SOURCES
CACHE INTERNAL "common headers" )
set( COMMON_SOURCES
"${CMAKE_CURRENT_SOURCE_DIR}/sql.c"
CACHE INTERNAL "common_sql sources" )
CACHE INTERNAL "common sources" )
set( DEPENDENCIES common_base )
set( LIBRARIES ${GLOBAL_LIBRARIES} ${MYSQL_LIBRARIES} )
set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${MYSQL_INCLUDE_DIRS} )
set( DEFINITIONS "${GLOBAL_DEFINITIONS}" )
set( SOURCE_FILES ${COMMON_SQL_HEADERS} ${COMMON_SQL_SOURCES} )
source_group( common FILES ${COMMON_SQL_HEADERS} ${COMMON_SQL_SOURCES} )
add_library( common_sql ${SOURCE_FILES} )
add_dependencies( common_sql ${DEPENDENCIES} )
target_link_libraries( common_sql ${LIBRARIES} ${DEPENDENCIES} )
set_target_properties( common_sql PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
set( SOURCE_FILES ${COMMON_HEADERS} ${COMMON_SOURCES} )
source_group( common FILES ${COMMON_HEADERS} ${COMMON_SOURCES} )
add_library( common ${SOURCE_FILES} )
add_dependencies( common ${DEPENDENCIES} )
target_link_libraries( common ${LIBRARIES} ${DEPENDENCIES} )
set_target_properties( common PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
include_directories( ${INCLUDE_DIRS} )
set( HAVE_common_sql ON CACHE INTERNAL "" )
set( TARGET_LIST ${TARGET_LIST} common_sql CACHE INTERNAL "" )
message( STATUS "Creating target common_sql - done" )
set( HAVE_common ON CACHE INTERNAL "" )
set( TARGET_LIST ${TARGET_LIST} common CACHE INTERNAL "" )
message( STATUS "Creating target common - done" )
else()
message( STATUS "Skipping target common_sql (requires common_base and MYSQL)" )
unset( HAVE_common_sql CACHE )
message( STATUS "Skipping target common (requires common_base and MYSQL)" )
unset( HAVE_common CACHE )
endif()

57
src/common/Makefile.in
View file

@ -2,13 +2,10 @@
#COMMON_OBJ = $(ls *.c | grep -viw sql.c | sed -e "s/\.c/\.o/g")
COMMON_OBJ = core.o socket.o timer.o db.o nullpo.o malloc.o showmsg.o strlib.o utils.o \
grfio.o mapindex.o ers.o md5calc.o minicore.o minisocket.o minimalloc.o random.o des.o \
conf.o thread.o mutex.o raconf.o mempool.o msg_conf.o cli.o
COMMON_DIR_OBJ = $(COMMON_OBJ:%=obj_all/%)
conf.o thread.o mutex.o raconf.o mempool.o msg_conf.o cli.o sql.o
COMMON_DIR_OBJ = $(COMMON_OBJ:%=obj/%)
COMMON_H = $(shell ls ../common/*.h)
COMMON_SQL_OBJ = obj_sql/sql.o
COMMON_SQL_H = sql.h
COMMON_AR = obj_all/common.a
COMMON_SQL_AR = obj_sql/common_sql.a
COMMON_AR = obj/common.a
MT19937AR_OBJ = ../../3rdparty/mt19937ar/mt19937ar.o
MT19937AR_H = ../../3rdparty/mt19937ar/mt19937ar.h
@ -20,28 +17,28 @@ LIBCONFIG_INCLUDE = -I../../3rdparty/libconfig
HAVE_MYSQL=@HAVE_MYSQL@
ifeq ($(HAVE_MYSQL),yes)
SQL_DEPENDS=common common_sql
SERVER_DEPENDS=common
else
SQL_DEPENDS=needs_mysql
SERVER_DEPENDS=needs_mysql
endif
ALL_DEPENDS=sql
ALL_DEPENDS=server
@SET_MAKE@
#####################################################################
.PHONY : all sql clean help
.PHONY : all server clean help
all: $(ALL_DEPENDS)
sql: $(SQL_DEPENDS)
server: $(SERVER_DEPENDS)
clean:
@echo " CLEAN common"
@rm -rf *.o obj_all obj_sql
@rm -rf *.o obj
help:
@echo "possible targets are 'sql' 'all' 'clean' 'help'"
@echo "'sql' - builds object files used in sql servers"
@echo "possible targets are 'server' 'all' 'clean' 'help'"
@echo "'server' - builds object files used in servers"
@echo "'all' - builds all above targets"
@echo "'clean' - cleans builds and objects"
@echo "'help' - outputs this message"
@ -52,39 +49,23 @@ needs_mysql:
@echo "MySQL not found or disabled by the configure script"
@exit 1
obj_all:
@echo " MKDIR obj_all"
@-mkdir obj_all
obj_sql:
@echo " MKDIR obj_sql"
@-mkdir obj_sql
obj:
@echo " MKDIR obj"
@-mkdir obj
$(COMMON_AR): $(COMMON_DIR_OBJ)
@echo " AR $@"
@@AR@ rcs $(COMMON_AR) $(COMMON_DIR_OBJ)
$(COMMON_SQL_AR): $(COMMON_SQL_OBJ)
@echo " AR $@"
@@AR@ rcs $(COMMON_SQL_AR) $(COMMON_SQL_OBJ)
common: obj $(COMMON_DIR_OBJ) $(MT19937AR_OBJ) $(LIBCONFIG_AR) $(COMMON_AR)
common: obj_all $(COMMON_DIR_OBJ) $(MT19937AR_OBJ) $(LIBCONFIG_AR) $(COMMON_AR)
common_sql: obj_sql $(COMMON_SQL_OBJ) $(COMMON_SQL_AR)
obj_all/%.o: %.c $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H)
obj/%.o: %.c $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H)
@echo " CC $<"
@@CC@ @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
@@CC@ @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
obj_all/mini%.o: %.c $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H)
obj/mini%.o: %.c $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H)
@echo " CC $<"
@@CC@ @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) -DMINICORE @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
obj_sql/%.o: %.c $(COMMON_H) $(COMMON_SQL_H) $(LIBCONFIG_H)
@echo " CC $<"
@@CC@ @CFLAGS@ $(LIBCONFIG_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
@@CC@ @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) @MYSQL_CFLAGS@ -DMINICORE @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
# missing object files
$(MT19937AR_OBJ):

4
src/common/mmo.h
View file

@ -553,8 +553,8 @@ struct guild {
struct guild_skill skill[MAX_GUILDSKILL];
struct Channel *channel;
/* TODO: still used for something? */
unsigned short save_flag; // for TXT saving
/* Used by char-server to save events for guilds */
unsigned short save_flag;
};
struct guild_castle {

48
src/login/CMakeLists.txt
View file

@ -1,12 +1,48 @@
#
# setup
#
set( LOGIN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "" )
set( SQL_LOGIN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "" )
# login server
#
# targets
#
add_subdirectory( sql )
if( BUILD_SERVERS )
message( STATUS "Creating target login-server" )
set( LOGIN_HEADERS
"${LOGIN_SOURCE_DIR}/account.h"
"${LOGIN_SOURCE_DIR}/ipban.h"
"${LOGIN_SOURCE_DIR}/login.h"
"${LOGIN_SOURCE_DIR}/loginclif.h"
"${LOGIN_SOURCE_DIR}/loginchrif.h"
"${LOGIN_SOURCE_DIR}/logincnslif.h"
"${LOGIN_SOURCE_DIR}/loginlog.h"
)
set( LOGIN_SOURCES
"${LOGIN_SOURCE_DIR}/account.c"
"${LOGIN_SOURCE_DIR}/ipban.c"
"${LOGIN_SOURCE_DIR}/login.c"
"${LOGIN_SOURCE_DIR}/loginclif.c"
"${LOGIN_SOURCE_DIR}/loginchrif.c"
"${LOGIN_SOURCE_DIR}/logincnslif.c"
"${LOGIN_SOURCE_DIR}/loginlog.c"
)
set( DEPENDENCIES common )
set( LIBRARIES ${GLOBAL_LIBRARIES} )
set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} )
set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS} -DWITH_SQL" )
set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} ${LOGIN_HEADERS} ${LOGIN_SOURCES} )
source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} )
source_group( login FILES ${LOGIN_HEADERS} ${LOGIN_SOURCES} )
include_directories( ${INCLUDE_DIRS} )
add_executable( login-server ${SOURCE_FILES} )
add_dependencies( login-server ${DEPENDENCIES} )
target_link_libraries( login-server ${LIBRARIES} ${DEPENDENCIES} )
set_target_properties( login-server PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
if( INSTALL_COMPONENT_RUNTIME )
cpack_add_component( Runtime_loginserver DESCRIPTION "login-server" DISPLAY_NAME "login-server" GROUP Runtime )
install( TARGETS login-server
DESTINATION "."
COMPONENT Runtime_loginserver )
endif( INSTALL_COMPONENT_RUNTIME )
set( TARGET_LIST ${TARGET_LIST} login-server CACHE INTERNAL "" )
message( STATUS "Creating target login-server - done" )
endif( BUILD_SERVERS )

38
src/login/Makefile.in
View file

@ -1,7 +1,6 @@
COMMON_H = $(shell ls ../common/*.h)
COMMON_AR = ../common/obj_all/common.a
COMMON_SQL_AR = ../common/obj_sql/common_sql.a
COMMON_AR = ../common/obj/common.a
COMMON_INCLUDE = -I../common
MT19937AR_OBJ = ../../3rdparty/mt19937ar/mt19937ar.o
@ -13,33 +12,33 @@ LIBCONFIG_AR = ../../3rdparty/libconfig/obj/libconfig.a
LIBCONFIG_INCLUDE = -I../../3rdparty/libconfig
LOGIN_OBJ = $(shell ls *.c | sed -e "s/\.c/\.o/g")
LOGIN_SQL_OBJ = $(LOGIN_OBJ:%=obj_sql/%)
LOGIN_DIR_OBJ = $(LOGIN_OBJ:%=obj/%)
LOGIN_H = $(shell ls *.h)
HAVE_MYSQL=@HAVE_MYSQL@
ifeq ($(HAVE_MYSQL),yes)
SQL_DEPENDS=login-server
SERVER_DEPENDS=login-server
else
SQL_DEPENDS=needs_mysql
SERVER_DEPENDS=needs_mysql
endif
ALL_DEPENDS= sql
ALL_DEPENDS=server
@SET_MAKE@
#####################################################################
.PHONY :all sql clean help
.PHONY :all server clean help
all: $(ALL_DEPENDS)
sql: $(SQL_DEPENDS)
server: $(SERVER_DEPENDS)
clean:
@echo " CLEAN login"
@rm -rf *.o obj_sql ../../@OLOG@@EXEEXT@
@rm -rf *.o obj ../../@OLOG@@EXEEXT@
help:
@echo "possible targets are 'sql' 'all' 'clean' 'help'"
@echo "'sql' - login server (SQL version)"
@echo "possible targets are 'server' 'all' 'clean' 'help'"
@echo "'server' - login server"
@echo "'all' - builds all above targets"
@echo "'clean' - cleans builds and objects"
@echo "'help' - outputs this message"
@ -52,29 +51,26 @@ needs_mysql:
# object directories
obj_sql:
@echo " MKDIR obj_sql"
@-mkdir obj_sql
obj:
@echo " MKDIR obj"
@-mkdir obj
#executables
login-server: obj_sql $(LOGIN_SQL_OBJ) $(COMMON_SQL_AR) $(COMMON_AR) $(MT19937AR_OBJ)
login-server: obj $(LOGIN_DIR_OBJ) $(COMMON_AR) $(MT19937AR_OBJ)
@echo " LD @OLOG@@EXEEXT@"
@@CC@ @LDFLAGS@ -o ../../@OLOG@@EXEEXT@ $(LOGIN_SQL_OBJ) $(COMMON_SQL_AR) $(COMMON_AR) $(MT19937AR_OBJ) $(LIBCONFIG_AR) @LIBS@ @MYSQL_LIBS@
@@CC@ @LDFLAGS@ -o ../../@OLOG@@EXEEXT@ $(LOGIN_DIR_OBJ) $(COMMON_AR) $(MT19937AR_OBJ) $(LIBCONFIG_AR) @LIBS@ @MYSQL_LIBS@
# login object files
obj_sql/%.o: %.c $(LOGIN_H) $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H)
obj/%.o: %.c $(LOGIN_H) $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H)
@echo " CC $<"
@@CC@ @CFLAGS@ $(COMMON_INCLUDE) $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) -DWITH_SQL @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
# missing object files
$(COMMON_AR):
@$(MAKE) -C ../common sql
$(COMMON_SQL_AR):
@$(MAKE) -C ../common sql
@$(MAKE) -C ../common server
$(MT19937AR_OBJ):
@$(MAKE) -C ../../3rdparty/mt19937ar

154
src/login/account.c
View file

@ -19,22 +19,12 @@
#include <string.h>
/// global defines
#define ACCOUNT_SQL_DB_VERSION 20110114
#define ACCOUNT_SQL_DB_VERSION 20140928
/// internal structure
typedef struct AccountDB_SQL {
AccountDB vtable; // public interface
Sql* accounts; // SQL accounts storage
// global sql settings
char global_db_hostname[32];
uint16 global_db_port;
char global_db_username[32];
char global_db_password[32];
char global_db_database[32];
char global_codepage[32];
// local sql settings
Sql* accounts; // SQL handle accounts storage
char db_hostname[64]; // Doubled for long hostnames (bugreport:8003)
uint16 db_port;
char db_username[32];
@ -43,6 +33,7 @@ typedef struct AccountDB_SQL {
char codepage[32];
// other settings
bool case_sensitive;
//table name
char account_db[32];
char accreg_db[32];
@ -90,19 +81,12 @@ AccountDB* account_db_sql(void) {
// initialize to default values
db->accounts = NULL;
// global sql settings
safestrncpy(db->global_db_hostname, "127.0.0.1", sizeof(db->global_db_hostname));
db->global_db_port = 3306;
safestrncpy(db->global_db_username, "ragnarok", sizeof(db->global_db_username));
safestrncpy(db->global_db_password, "ragnarok", sizeof(db->global_db_password));
safestrncpy(db->global_db_database, "ragnarok", sizeof(db->global_db_database));
safestrncpy(db->global_codepage, "", sizeof(db->global_codepage));
// local sql settings
safestrncpy(db->db_hostname, "", sizeof(db->db_hostname));
safestrncpy(db->db_hostname, "127.0.0.1", sizeof(db->db_hostname));
db->db_port = 3306;
safestrncpy(db->db_username, "", sizeof(db->db_username));
safestrncpy(db->db_password, "", sizeof(db->db_password));
safestrncpy(db->db_database, "", sizeof(db->db_database));
safestrncpy(db->db_username, "ragnarok", sizeof(db->db_username));
safestrncpy(db->db_password, "ragnarok", sizeof(db->db_password));
safestrncpy(db->db_database, "ragnarok", sizeof(db->db_database));
safestrncpy(db->codepage, "", sizeof(db->codepage));
// other settings
db->case_sensitive = false;
@ -142,15 +126,6 @@ static bool account_db_sql_init(AccountDB* self) {
database = db->db_database;
codepage = db->codepage;
}
else
{// global settings
username = db->global_db_username;
password = db->global_db_password;
hostname = db->global_db_hostname;
port = db->global_db_port;
database = db->global_db_database;
codepage = db->global_codepage;
}
if( SQL_ERROR == Sql_Connect(sql_handle, username, password, hostname, port, database) )
{
@ -192,74 +167,24 @@ static bool account_db_sql_get_property(AccountDB* self, const char* key, char*
AccountDB_SQL* db = (AccountDB_SQL*)self;
const char* signature;
signature = "engine.";
if( strncmpi(key, signature, strlen(signature)) == 0 )
{
signature = "login_server_";
if( strncmpi(key, signature, strlen(signature)) == 0 ) {
key += strlen(signature);
if( strcmpi(key, "name") == 0 )
safesnprintf(buf, buflen, "sql");
else
if( strcmpi(key, "version") == 0 )
safesnprintf(buf, buflen, "%d", ACCOUNT_SQL_DB_VERSION);
else
if( strcmpi(key, "comment") == 0 )
safesnprintf(buf, buflen, "SQL Account Database");
else
return false;// not found
return true;
}
signature = "sql.";
if( strncmpi(key, signature, strlen(signature)) == 0 )
{
key += strlen(signature);
if( strcmpi(key, "db_hostname") == 0 )
safesnprintf(buf, buflen, "%s", db->global_db_hostname);
else
if( strcmpi(key, "db_port") == 0 )
safesnprintf(buf, buflen, "%d", db->global_db_port);
else
if( strcmpi(key, "db_username") == 0 )
safesnprintf(buf, buflen, "%s", db->global_db_username);
else
if( strcmpi(key, "db_password") == 0 )
safesnprintf(buf, buflen, "%s", db->global_db_password);
else
if( strcmpi(key, "db_database") == 0 )
safesnprintf(buf, buflen, "%s", db->global_db_database);
else
if( strcmpi(key, "codepage") == 0 )
safesnprintf(buf, buflen, "%s", db->global_codepage);
else
return false;// not found
return true;
}
signature = "account.sql.";
if( strncmpi(key, signature, strlen(signature)) == 0 )
{
key += strlen(signature);
if( strcmpi(key, "db_hostname") == 0 )
if( strcmpi(key, "ip") == 0 )
safesnprintf(buf, buflen, "%s", db->db_hostname);
else
if( strcmpi(key, "db_port") == 0 )
if( strcmpi(key, "port") == 0 )
safesnprintf(buf, buflen, "%d", db->db_port);
else
if( strcmpi(key, "db_username") == 0 )
if( strcmpi(key, "id") == 0 )
safesnprintf(buf, buflen, "%s", db->db_username);
else
if( strcmpi(key, "db_password") == 0 )
if( strcmpi(key, "pw") == 0 )
safesnprintf(buf, buflen, "%s", db->db_password);
else
if( strcmpi(key, "db_database") == 0 )
if( strcmpi(key, "db") == 0 )
safesnprintf(buf, buflen, "%s", db->db_database);
else
if( strcmpi(key, "codepage") == 0 )
safesnprintf(buf, buflen, "%s", db->codepage);
else
if( strcmpi(key, "case_sensitive") == 0 )
safesnprintf(buf, buflen, "%d", (db->case_sensitive ? 1 : 0));
else
if( strcmpi(key, "account_db") == 0 )
safesnprintf(buf, buflen, "%s", db->account_db);
else
@ -270,6 +195,19 @@ static bool account_db_sql_get_property(AccountDB* self, const char* key, char*
return true;
}
signature = "login_";
if( strncmpi(key, signature, strlen(signature)) == 0 ) {
key += strlen(signature);
if( strcmpi(key, "codepage") == 0 )
safesnprintf(buf, buflen, "%s", db->codepage);
else
if( strcmpi(key, "case_sensitive") == 0 )
safesnprintf(buf, buflen, "%d", (db->case_sensitive ? 1 : 0));
else
return false;// not found
return true;
}
return false;// not found
}
@ -285,49 +223,23 @@ static bool account_db_sql_set_property(AccountDB* self, const char* key, const
AccountDB_SQL* db = (AccountDB_SQL*)self;
const char* signature;
signature = "sql.";
signature = "login_server_";
if( strncmp(key, signature, strlen(signature)) == 0 )
{
key += strlen(signature);
if( strcmpi(key, "db_hostname") == 0 )
safestrncpy(db->global_db_hostname, value, sizeof(db->global_db_hostname));
else
if( strcmpi(key, "db_port") == 0 )
db->global_db_port = (uint16)strtoul(value, NULL, 10);
else
if( strcmpi(key, "db_username") == 0 )
safestrncpy(db->global_db_username, value, sizeof(db->global_db_username));
else
if( strcmpi(key, "db_password") == 0 )
safestrncpy(db->global_db_password, value, sizeof(db->global_db_password));
else
if( strcmpi(key, "db_database") == 0 )
safestrncpy(db->global_db_database, value, sizeof(db->global_db_database));
else
if( strcmpi(key, "codepage") == 0 )
safestrncpy(db->global_codepage, value, sizeof(db->global_codepage));
else
return false;// not found
return true;
}
signature = "account.sql.";
if( strncmp(key, signature, strlen(signature)) == 0 )
{
key += strlen(signature);
if( strcmpi(key, "db_hostname") == 0 )
if( strcmpi(key, "ip") == 0 )
safestrncpy(db->db_hostname, value, sizeof(db->db_hostname));
else
if( strcmpi(key, "db_port") == 0 )
if( strcmpi(key, "port") == 0 )
db->db_port = (uint16)strtoul(value, NULL, 10);
else
if( strcmpi(key, "db_username") == 0 )
if( strcmpi(key, "id") == 0 )
safestrncpy(db->db_username, value, sizeof(db->db_username));
else
if( strcmpi(key, "db_password") == 0 )
if( strcmpi(key, "pw") == 0 )
safestrncpy(db->db_password, value, sizeof(db->db_password));
else
if( strcmpi(key, "db_database") == 0 )
if( strcmpi(key, "db") == 0 )
safestrncpy(db->db_database, value, sizeof(db->db_database));
else
if( strcmpi(key, "codepage") == 0 )

23
src/login/account.h
View file

@ -21,26 +21,6 @@ typedef struct AccountDBIterator AccountDBIterator;
// standard engines
AccountDB* account_db_sql(void);
// extra engines (will probably use the other txt functions)
#define ACCOUNTDB_CONSTRUCTOR_(engine) account_db_##engine
#define ACCOUNTDB_CONSTRUCTOR(engine) ACCOUNTDB_CONSTRUCTOR_(engine)
#ifdef ACCOUNTDB_ENGINE_0
AccountDB* ACCOUNTDB_CONSTRUCTOR(ACCOUNTDB_ENGINE_0)(void);
#endif
#ifdef ACCOUNTDB_ENGINE_1
AccountDB* ACCOUNTDB_CONSTRUCTOR(ACCOUNTDB_ENGINE_1)(void);
#endif
#ifdef ACCOUNTDB_ENGINE_2
AccountDB* ACCOUNTDB_CONSTRUCTOR(ACCOUNTDB_ENGINE_2)(void);
#endif
#ifdef ACCOUNTDB_ENGINE_3
AccountDB* ACCOUNTDB_CONSTRUCTOR(ACCOUNTDB_ENGINE_3)(void);
#endif
#ifdef ACCOUNTDB_ENGINE_4
AccountDB* ACCOUNTDB_CONSTRUCTOR(ACCOUNTDB_ENGINE_4)(void);
#endif
struct mmo_account {
int account_id;
char userid[NAME_LENGTH];
@ -98,9 +78,6 @@ struct AccountDB {
/// Gets a property from this database.
/// These read-only properties must be implemented:
/// "engine.name" -> "txt", "sql", ...
/// "engine.version" -> internal version
/// "engine.comment" -> anything (suggestion: description or specs of the engine)
///
/// @param self Database
/// @param key Property name

78
src/login/ipban.c
View file

@ -21,19 +21,12 @@
#include <stdlib.h>
#include <string.h>
// global sql settings
static char global_db_hostname[32] = "127.0.0.1";
static uint16 global_db_port = 3306;
static char global_db_username[32] = "ragnarok";
static char global_db_password[32] = "ragnarok";
static char global_db_database[32] = "ragnarok";
static char global_codepage[32] = "";
// local sql settings
static char ipban_db_hostname[32] = "";
static uint16 ipban_db_port = 0;
static char ipban_db_username[32] = "";
static char ipban_db_password[32] = "";
static char ipban_db_database[32] = "";
// login sql settings
static char ipban_db_hostname[32] = "127.0.0.1";
static uint16 ipban_db_port = 3306;
static char ipban_db_username[32] = "ragnarok";
static char ipban_db_password[32] = "ragnarok";
static char ipban_db_database[32] = "ragnarok";
static char ipban_codepage[32] = "";
static char ipban_table[32] = "ipbanlist";
@ -131,65 +124,39 @@ bool ipban_config_read(const char* key, const char* value) {
if( ipban_inited )
return false;// settings can only be changed before init
signature = "sql.";
signature = "ipban_db_";
if( strncmpi(key, signature, strlen(signature)) == 0 )
{
key += strlen(signature);
if( strcmpi(key, "db_hostname") == 0 )
safestrncpy(global_db_hostname, value, sizeof(global_db_hostname));
if( strcmpi(key, "ip") == 0 )
safestrncpy(ipban_db_hostname, value, sizeof(ipban_db_hostname));
else
if( strcmpi(key, "db_port") == 0 )
global_db_port = (uint16)strtoul(value, NULL, 10);
if( strcmpi(key, "port") == 0 )
ipban_db_port = (uint16)strtoul(value, NULL, 10);
else
if( strcmpi(key, "db_username") == 0 )
safestrncpy(global_db_username, value, sizeof(global_db_username));
if( strcmpi(key, "id") == 0 )
safestrncpy(ipban_db_username, value, sizeof(ipban_db_username));
else
if( strcmpi(key, "db_password") == 0 )
safestrncpy(global_db_password, value, sizeof(global_db_password));
if( strcmpi(key, "pw") == 0 )
safestrncpy(ipban_db_password, value, sizeof(ipban_db_password));
else
if( strcmpi(key, "db_database") == 0 )
safestrncpy(global_db_database, value, sizeof(global_db_database));
else
if( strcmpi(key, "codepage") == 0 )
safestrncpy(global_codepage, value, sizeof(global_codepage));
if( strcmpi(key, "db") == 0 )
safestrncpy(ipban_db_database, value, sizeof(ipban_db_database));
else
return false;// not found
return true;
}
signature = "ipban.sql.";
signature = "ipban_";
if( strncmpi(key, signature, strlen(signature)) == 0 )
{
key += strlen(signature);
if( strcmpi(key, "db_hostname") == 0 )
safestrncpy(ipban_db_hostname, value, sizeof(ipban_db_hostname));
else
if( strcmpi(key, "db_port") == 0 )
ipban_db_port = (uint16)strtoul(value, NULL, 10);
else
if( strcmpi(key, "db_username") == 0 )
safestrncpy(ipban_db_username, value, sizeof(ipban_db_username));
else
if( strcmpi(key, "db_password") == 0 )
safestrncpy(ipban_db_password, value, sizeof(ipban_db_password));
else
if( strcmpi(key, "db_database") == 0 )
safestrncpy(ipban_db_database, value, sizeof(ipban_db_database));
else
if( strcmpi(key, "codepage") == 0 )
safestrncpy(ipban_codepage, value, sizeof(ipban_codepage));
else
if( strcmpi(key, "ipban_table") == 0 )
safestrncpy(ipban_table, value, sizeof(ipban_table));
else
return false;// not found
return true;
}
signature = "ipban.";
if( strncmpi(key, signature, strlen(signature)) == 0 )
{
key += strlen(signature);
if( strcmpi(key, "enable") == 0 )
login_config.ipban = (bool)config_switch(value);
else
@ -241,15 +208,6 @@ void ipban_init(void) {
database = ipban_db_database;
codepage = ipban_codepage;
}
else
{// global settings
username = global_db_username;
password = global_db_password;
hostname = global_db_hostname;
port = global_db_port;
database = global_db_database;
codepage = global_codepage;
}
// establish connections
sql_handle = Sql_Malloc();

91
src/login/login.c
View file

@ -44,30 +44,6 @@ struct Login_Config login_config; /// Configuration of login-serv
DBMap* online_db;
DBMap* auth_db;
// Account engines available
static struct{
AccountDB* (*constructor)(void);
AccountDB* db;
} account_engines[] = {
{account_db_sql, NULL},
#ifdef ACCOUNTDB_ENGINE_0
{ACCOUNTDB_CONSTRUCTOR(ACCOUNTDB_ENGINE_0), NULL},
#endif
#ifdef ACCOUNTDB_ENGINE_1
{ACCOUNTDB_CONSTRUCTOR(ACCOUNTDB_ENGINE_1), NULL},
#endif
#ifdef ACCOUNTDB_ENGINE_2
{ACCOUNTDB_CONSTRUCTOR(ACCOUNTDB_ENGINE_2), NULL},
#endif
#ifdef ACCOUNTDB_ENGINE_3
{ACCOUNTDB_CONSTRUCTOR(ACCOUNTDB_ENGINE_3), NULL},
#endif
#ifdef ACCOUNTDB_ENGINE_4
{ACCOUNTDB_CONSTRUCTOR(ACCOUNTDB_ENGINE_4), NULL},
#endif
// end of structure
{NULL, NULL}
};
// account database
AccountDB* accounts = NULL;
// Advanced subnet check [LuzZza]
@ -88,31 +64,6 @@ AccountDB* login_get_accounts_db(void){
return accounts;
}
/**
* Get the engine selected in the config settings.
* Updates the config setting with the selected engine if 'auto'.
* @param key: Key of the database entry
* @param ap: args
* @return : Data identified by the key to be put in the database
*/
static AccountDB* get_account_engine(void) {
int i;
bool get_first = (strcmp(login_config.account_engine,"auto") == 0);
for( i = 0; account_engines[i].constructor; ++i ) {
char name[sizeof(login_config.account_engine)];
AccountDB* db = account_engines[i].db;
if( db && db->get_property(db, "engine.name", name, sizeof(name)) &&
(get_first || strcmp(name, login_config.account_engine) == 0) )
{
if( get_first )
safestrncpy(login_config.account_engine, name, sizeof(login_config.account_engine));
return db;
}
}
return NULL;
}
// Console Command Parser [Wizputer]
//FIXME to be remove (moved to cnslif / will be done once map/char/login, all have their cnslif interface ready)
int parse_console(const char* buf){
@ -707,16 +658,9 @@ int login_config_read(const char* cfgName) {
#endif
else if(!strcmpi(w1, "import"))
login_config_read(w2);
else if(!strcmpi(w1, "account.engine"))
safestrncpy(login_config.account_engine, w2, sizeof(login_config.account_engine));
else {// try the account engines
int i;
for( i = 0; account_engines[i].constructor; ++i )
{
AccountDB* db = account_engines[i].db;
if( db && db->set_property(db, w1, w2) )
break;
}
if (accounts && accounts->set_property(accounts, w1, w2))
continue;
// try others
ipban_config_read(w1, w2);
loginlog_config_read(w1, w2);
@ -754,7 +698,6 @@ void login_set_defaults() {
login_config.dynamic_pass_failure_ban_duration = 5;
login_config.use_dnsbl = false;
safestrncpy(login_config.dnsbl_servs, "", sizeof(login_config.dnsbl_servs));
safestrncpy(login_config.account_engine, "auto", sizeof(login_config.account_engine));
login_config.allowed_regs = 1;
login_config.time_allowed = 10; //in second
@ -782,8 +725,8 @@ void login_set_defaults() {
* dealloc..., function called at exit of the login-serv
*/
void do_final(void) {
int i;
struct client_hash_node *hn = login_config.client_hash_nodes;
AccountDB* db = accounts;
while (hn)
{
@ -803,16 +746,12 @@ void do_final(void) {
do_final_loginclif();
do_final_logincnslif();
for( i = 0; account_engines[i].constructor; ++i )
{// destroy all account engines
AccountDB* db = account_engines[i].db;
if( db )
{
db->destroy(db);
account_engines[i].db = NULL;
}
if (db) { // destroy account engine
db->destroy(db);
db = NULL;
}
accounts = NULL; // destroyed in account_engines
accounts = NULL; // destroyed in account_engine
online_db->destroy(online_db, NULL);
auth_db->destroy(auth_db, NULL);
@ -864,12 +803,10 @@ void set_server_type(void) {
* @return 0 everything ok else stopping programme execution.
*/
int do_init(int argc, char** argv) {
int i;
runflag = LOGINSERVER_ST_STARTING;
// intialize engines (to accept config settings)
for( i = 0; account_engines[i].constructor; ++i )
account_engines[i].db = account_engines[i].constructor();
// initialize engine
accounts = account_db_sql();
// read login-server configuration
login_set_defaults();
@ -907,14 +844,12 @@ int do_init(int argc, char** argv) {
add_timer_interval(gettick() + 600*1000, login_online_data_cleanup, 0, 0, 600*1000);
// Account database init
accounts = get_account_engine();
if( accounts == NULL ) {
ShowFatalError("do_init: account engine '%s' not found.\n", login_config.account_engine);
ShowFatalError("do_init: account engine not found.\n");
exit(EXIT_FAILURE);
} else {
if(!accounts->init(accounts)) {
ShowFatalError("do_init: Failed to initialize account engine '%s'.\n", login_config.account_engine);
ShowFatalError("do_init: Failed to initialize account engine.\n");
exit(EXIT_FAILURE);
}
}

29
src/login/login.h
View file

@ -86,28 +86,27 @@ struct Login_Config {
uint32 client_version_to_connect; /// the client version needed to connect (if checking is enabled)
bool ipban; /// perform IP blocking (via contents of `ipbanlist`) ?
bool dynamic_pass_failure_ban; /// automatic IP blocking due to failed login attemps ?
unsigned int dynamic_pass_failure_ban_interval; /// how far to scan the loginlog for password failures
bool dynamic_pass_failure_ban; /// automatic IP blocking due to failed login attempts ?
unsigned int dynamic_pass_failure_ban_interval; /// how far to scan the loginlog for password failures in minutes
unsigned int dynamic_pass_failure_ban_limit; /// number of failures needed to trigger the ipban
unsigned int dynamic_pass_failure_ban_duration; /// duration of the ipban
unsigned int dynamic_pass_failure_ban_duration; /// duration of the ipban in minutes
bool use_dnsbl; /// dns blacklist blocking ?
char dnsbl_servs[1024]; /// comma-separated list of dnsbl servers
char account_engine[256]; // name of the engine to use (defaults to auto, for the first available engine)
int allowed_regs; //max number of registration
int time_allowed; //registration intervall in seconds
int allowed_regs; /// max number of registration
int time_allowed; /// registration interval in seconds
int client_hash_check; // flags for checking client md5
struct client_hash_node *client_hash_nodes; // linked list containg md5 hash for each gm group
char loginconf_name[256]; //name of main config file
char msgconf_name[256]; //name of msg_conf config file
char lanconf_name[256]; //name of lan config file
int char_per_account; /// number of characters an account can have
int client_hash_check; /// flags for checking client md5
struct client_hash_node *client_hash_nodes; /// linked list containing md5 hash for each gm group
char loginconf_name[256]; /// name of main config file
char msgconf_name[256]; /// name of msg_conf config file
char lanconf_name[256]; /// name of lan config file
int char_per_account; /// number of characters an account can have
#ifdef VIP_ENABLE
struct {
unsigned int group; /// Vip groupid
unsigned int char_increase; /// number of char-slot to increase in vip state
unsigned int group; /// VIP group ID
unsigned int char_increase; /// number of char-slot to increase in VIP state
} vip_sys;
#endif
};

45
src/login/server/CMakeLists.txt Normal file
View file

@ -0,0 +1,45 @@
#
# login server
#
if( BUILD_SERVERS )
message( STATUS "Creating target login-server" )
set( LOGIN_HEADERS
"${SERVER_LOGIN_SOURCE_DIR}/account.h"
"${SERVER_LOGIN_SOURCE_DIR}/ipban.h"
"${SERVER_LOGIN_SOURCE_DIR}/login.h"
"${SERVER_LOGIN_SOURCE_DIR}/loginclif.h"
"${SERVER_LOGIN_SOURCE_DIR}/loginchrif.h"
"${SERVER_LOGIN_SOURCE_DIR}/logincnslif.h"
"${SERVER_LOGIN_SOURCE_DIR}/loginlog.h"
)
set( LOGIN_SOURCES
"${SERVER_LOGIN_SOURCE_DIR}/account.c"
"${SERVER_LOGIN_SOURCE_DIR}/ipban.c"
"${SERVER_LOGIN_SOURCE_DIR}/login.c"
"${SERVER_LOGIN_SOURCE_DIR}/loginclif.c"
"${SERVER_LOGIN_SOURCE_DIR}/loginchrif.c"
"${SERVER_LOGIN_SOURCE_DIR}/logincnslif.c"
"${SERVER_LOGIN_SOURCE_DIR}/loginlog.c"
)
set( DEPENDENCIES common )
set( LIBRARIES ${GLOBAL_LIBRARIES} )
set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} )
set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS} -DWITH_SQL" )
set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} ${LOGIN_HEADERS} ${LOGIN_SOURCES} )
source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} )
source_group( login FILES ${LOGIN_HEADERS} ${LOGIN_SOURCES} )
include_directories( ${INCLUDE_DIRS} )
add_executable( login-server ${SOURCE_FILES} )
add_dependencies( login-server ${DEPENDENCIES} )
target_link_libraries( login-server ${LIBRARIES} ${DEPENDENCIES} )
set_target_properties( login-server PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
if( INSTALL_COMPONENT_RUNTIME )
cpack_add_component( Runtime_loginserver DESCRIPTION "login-server" DISPLAY_NAME "login-server" GROUP Runtime )
install( TARGETS login-server
DESTINATION "."
COMPONENT Runtime_loginserver )
endif( INSTALL_COMPONENT_RUNTIME )
set( TARGET_LIST ${TARGET_LIST} login-server CACHE INTERNAL "" )
message( STATUS "Creating target login-server - done" )
endif( BUILD_SERVERS )

45
src/login/sql/CMakeLists.txt
View file

@ -1,45 +0,0 @@
#
# login sql
#
if( BUILD_SQL_SERVERS )
message( STATUS "Creating target login-server_sql" )
set( SQL_LOGIN_HEADERS
"${SQL_LOGIN_SOURCE_DIR}/account.h"
"${SQL_LOGIN_SOURCE_DIR}/ipban.h"
"${SQL_LOGIN_SOURCE_DIR}/login.h"
"${SQL_LOGIN_SOURCE_DIR}/loginclif.h"
"${SQL_LOGIN_SOURCE_DIR}/loginchrif.h"
"${SQL_LOGIN_SOURCE_DIR}/logincnslif.h"
"${SQL_LOGIN_SOURCE_DIR}/loginlog.h"
)
set( SQL_LOGIN_SOURCES
"${SQL_LOGIN_SOURCE_DIR}/account.c"
"${SQL_LOGIN_SOURCE_DIR}/ipban.c"
"${SQL_LOGIN_SOURCE_DIR}/login.c"
"${SQL_LOGIN_SOURCE_DIR}/loginclif.c"
"${SQL_LOGIN_SOURCE_DIR}/loginchrif.c"
"${SQL_LOGIN_SOURCE_DIR}/logincnslif.c"
"${SQL_LOGIN_SOURCE_DIR}/loginlog.c"
)
set( DEPENDENCIES common_sql )
set( LIBRARIES ${GLOBAL_LIBRARIES} )
set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} )
set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS} -DWITH_SQL" )
set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} ${SQL_LOGIN_HEADERS} ${SQL_LOGIN_SOURCES} )
source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} )
source_group( login FILES ${SQL_LOGIN_HEADERS} ${SQL_LOGIN_SOURCES} )
include_directories( ${INCLUDE_DIRS} )
add_executable( login-server_sql ${SOURCE_FILES} )
add_dependencies( login-server_sql ${DEPENDENCIES} )
target_link_libraries( login-server_sql ${LIBRARIES} ${DEPENDENCIES} )
set_target_properties( login-server_sql PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
if( INSTALL_COMPONENT_RUNTIME )
cpack_add_component( Runtime_loginserver_sql DESCRIPTION "login-server (sql version)" DISPLAY_NAME "login-server_sql" GROUP Runtime )
install( TARGETS login-server_sql
DESTINATION "."
COMPONENT Runtime_loginserver_sql )
endif( INSTALL_COMPONENT_RUNTIME )
set( TARGET_LIST ${TARGET_LIST} login-server_sql CACHE INTERNAL "" )
message( STATUS "Creating target login-server_sql - done" )
endif( BUILD_SQL_SERVERS )

117
src/map/CMakeLists.txt
View file

@ -1,12 +1,121 @@
#
# setup
#
set( MAP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "" )
set( SQL_MAP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "" )
#
# targets
# map server
#
add_subdirectory( sql )
if( BUILD_SERVERS )
message( STATUS "Creating target map-server" )
set( MAP_HEADERS
"${MAP_SOURCE_DIR}/atcommand.h"
"${MAP_SOURCE_DIR}/battle.h"
"${MAP_SOURCE_DIR}/battleground.h"
"${MAP_SOURCE_DIR}/buyingstore.h"
"${MAP_SOURCE_DIR}/chat.h"
"${MAP_SOURCE_DIR}/chrif.h"
"${MAP_SOURCE_DIR}/clif.h"
"${MAP_SOURCE_DIR}/date.h"
"${MAP_SOURCE_DIR}/duel.h"
"${MAP_SOURCE_DIR}/elemental.h"
"${MAP_SOURCE_DIR}/guild.h"
"${MAP_SOURCE_DIR}/homunculus.h"
"${MAP_SOURCE_DIR}/instance.h"
"${MAP_SOURCE_DIR}/intif.h"
"${MAP_SOURCE_DIR}/itemdb.h"
"${MAP_SOURCE_DIR}/log.h"
"${MAP_SOURCE_DIR}/mail.h"
"${MAP_SOURCE_DIR}/map.h"
"${MAP_SOURCE_DIR}/mapreg.h"
"${MAP_SOURCE_DIR}/mercenary.h"
"${MAP_SOURCE_DIR}/mob.h"
"${MAP_SOURCE_DIR}/npc.h"
"${MAP_SOURCE_DIR}/party.h"
"${MAP_SOURCE_DIR}/path.h"
"${MAP_SOURCE_DIR}/pc.h"
"${MAP_SOURCE_DIR}/pc_groups.h"
"${MAP_SOURCE_DIR}/pet.h"
"${MAP_SOURCE_DIR}/quest.h"
"${MAP_SOURCE_DIR}/script.h"
"${MAP_SOURCE_DIR}/searchstore.h"
"${MAP_SOURCE_DIR}/skill.h"
"${MAP_SOURCE_DIR}/status.h"
"${MAP_SOURCE_DIR}/storage.h"
"${MAP_SOURCE_DIR}/trade.h"
"${MAP_SOURCE_DIR}/unit.h"
"${MAP_SOURCE_DIR}/vending.h"
"${MAP_SOURCE_DIR}/cashshop.h"
"${MAP_SOURCE_DIR}/channel.h"
)
set( MAP_SOURCES
"${MAP_SOURCE_DIR}/atcommand.c"
"${MAP_SOURCE_DIR}/battle.c"
"${MAP_SOURCE_DIR}/battleground.c"
"${MAP_SOURCE_DIR}/buyingstore.c"
"${MAP_SOURCE_DIR}/chat.c"
"${MAP_SOURCE_DIR}/chrif.c"
"${MAP_SOURCE_DIR}/clif.c"
"${MAP_SOURCE_DIR}/date.c"
"${MAP_SOURCE_DIR}/duel.c"
"${MAP_SOURCE_DIR}/elemental.c"
"${MAP_SOURCE_DIR}/guild.c"
"${MAP_SOURCE_DIR}/homunculus.c"
"${MAP_SOURCE_DIR}/instance.c"
"${MAP_SOURCE_DIR}/intif.c"
"${MAP_SOURCE_DIR}/itemdb.c"
"${MAP_SOURCE_DIR}/log.c"
"${MAP_SOURCE_DIR}/mail.c"
"${MAP_SOURCE_DIR}/map.c"
"${MAP_SOURCE_DIR}/mapreg.c"
"${MAP_SOURCE_DIR}/mercenary.c"
"${MAP_SOURCE_DIR}/mob.c"
"${MAP_SOURCE_DIR}/npc.c"
"${MAP_SOURCE_DIR}/npc_chat.c"
"${MAP_SOURCE_DIR}/party.c"
"${MAP_SOURCE_DIR}/path.c"
"${MAP_SOURCE_DIR}/pc.c"
"${MAP_SOURCE_DIR}/pc_groups.c"
"${MAP_SOURCE_DIR}/pet.c"
"${MAP_SOURCE_DIR}/quest.c"
"${MAP_SOURCE_DIR}/script.c"
"${MAP_SOURCE_DIR}/searchstore.c"
"${MAP_SOURCE_DIR}/skill.c"
"${MAP_SOURCE_DIR}/status.c"
"${MAP_SOURCE_DIR}/storage.c"
"${MAP_SOURCE_DIR}/trade.c"
"${MAP_SOURCE_DIR}/unit.c"
"${MAP_SOURCE_DIR}/vending.c"
"${MAP_SOURCE_DIR}/cashshop.c"
"${MAP_SOURCE_DIR}/channel.c"
)
set( DEPENDENCIES common )
set( LIBRARIES ${GLOBAL_LIBRARIES} )
set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} )
set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS}" )
if( WITH_PCRE )
message( STATUS "Enabled PCRE code" )
set( LIBRARIES ${LIBRARIES} ${PCRE_LIBRARIES} )
set( INCLUDE_DIRS ${INCLUDE_DIRS} ${PCRE_INCLUDE_DIRS} )
set( DEFINITIONS "${DEFINITIONS} -DPCRE_SUPPORT" )
else()
message( STATUS "Disabled PCRE code" )
endif()
set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} ${MAP_HEADERS} ${MAP_SOURCES} )
source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} )
source_group( map FILES ${MAP_HEADERS} ${MAP_SOURCES} )
include_directories( ${INCLUDE_DIRS} )
add_executable( map-server ${SOURCE_FILES} )
add_dependencies( map-server ${DEPENDENCIES} )
target_link_libraries( map-server ${LIBRARIES} ${DEPENDENCIES} )
set_target_properties( map-server PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
if( INSTALL_COMPONENT_RUNTIME )
cpack_add_component( Runtime_mapserver DESCRIPTION "map-server" DISPLAY_NAME "map-server" GROUP Runtime )
install( TARGETS map-server
DESTINATION "."
COMPONENT Runtime_mapserver )
endif( INSTALL_COMPONENT_RUNTIME )
set( TARGET_LIST ${TARGET_LIST} map-server CACHE INTERNAL "" )
message( STATUS "Creating target map-server - done" )
endif( BUILD_SERVERS )

44
src/map/Makefile.in
View file

@ -1,7 +1,6 @@
COMMON_H = $(shell ls ../common/*.h)
COMMON_AR = ../common/obj_all/common.a
COMMON_SQL_AR = ../common/obj_sql/common_sql.a
COMMON_AR = ../common/obj/common.a
COMMON_INCLUDE = -I../common/
MT19937AR_OBJ = ../../3rdparty/mt19937ar/mt19937ar.o
@ -13,17 +12,17 @@ LIBCONFIG_AR = ../../3rdparty/libconfig/obj/libconfig.a
LIBCONFIG_INCLUDE = -I../../3rdparty/libconfig
MAP_OBJ = $(shell ls *.c | sed -e "s/\.c/\.o/g")
MAP_SQL_OBJ = $(MAP_OBJ:%=obj_sql/%)
MAP_DIR_OBJ = $(MAP_OBJ:%=obj/%)
MAP_H = $(shell ls ../map/*.h) \
$(shell ls ../config/*.h)
HAVE_MYSQL=@HAVE_MYSQL@
ifeq ($(HAVE_MYSQL),yes)
SQL_DEPENDS=map-server
SERVER_DEPENDS=map-server
else
SQL_DEPENDS=needs_mysql
SERVER_DEPENDS=needs_mysql
endif
ALL_DEPENDS=sql
ALL_DEPENDS=server
HAVE_PCRE=@HAVE_PCRE@
ifeq ($(HAVE_PCRE),yes)
@ -35,22 +34,22 @@ endif
@SET_MAKE@
#####################################################################
.PHONY : all sql clean help
.PHONY : all server clean help
all: $(ALL_DEPENDS)
sql: $(SQL_DEPENDS)
server: $(SERVER_DEPENDS)
clean:
@echo " CLEAN map"
@rm -rf *.o obj_sql ../../@OMAP@@EXEEXT@
@rm -rf *.o obj ../../@OMAP@@EXEEXT@
help:
@echo "possible targets are 'sql' 'all' 'clean' 'help'"
@echo "'sql' - map server (SQL version)"
@echo "'all' - builds all above targets"
@echo "'clean' - cleans builds and objects"
@echo "'help' - outputs this message"
@echo "possible targets are 'server' 'all' 'clean' 'help'"
@echo "'server' - map server"
@echo "'all' - builds all above targets"
@echo "'clean' - cleans builds and objects"
@echo "'help' - outputs this message"
#####################################################################
@ -60,29 +59,26 @@ needs_mysql:
# object directories
obj_sql:
@echo " MKDIR obj_sql"
@-mkdir obj_sql
obj:
@echo " MKDIR obj"
@-mkdir obj
# executables
map-server: obj_sql $(MAP_SQL_OBJ) $(COMMON_SQL_AR) $(COMMON_AR) $(LIBCONFIG_AR)
map-server: obj $(MAP_DIR_OBJ) $(COMMON_AR) $(LIBCONFIG_AR)
@echo " LD @OMAP@@EXEEXT@"
@@CC@ @LDFLAGS@ -o ../../@OMAP@@EXEEXT@ $(MAP_SQL_OBJ) $(COMMON_SQL_AR) $(COMMON_AR) $(MT19937AR_OBJ) $(LIBCONFIG_AR) @LIBS@ @PCRE_LIBS@ @MYSQL_LIBS@
@@CC@ @LDFLAGS@ -o ../../@OMAP@@EXEEXT@ $(MAP_DIR_OBJ) $(COMMON_AR) $(MT19937AR_OBJ) $(LIBCONFIG_AR) @LIBS@ @PCRE_LIBS@ @MYSQL_LIBS@
# map object files
obj_sql/%.o: %.c $(MAP_H) $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H)
obj/%.o: %.c $(MAP_H) $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H)
@echo " CC $<"
@@CC@ @CFLAGS@ $(COMMON_INCLUDE) $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
# missing object files
$(COMMON_AR):
@$(MAKE) -C ../common sql
$(COMMON_SQL_AR):
@$(MAKE) -C ../common sql
@$(MAKE) -C ../common server
$(MT19937AR_OBJ):
@$(MAKE) -C ../../3rdparty/mt19937ar

0
src/map/mapreg_sql.c → src/map/mapreg.c
View file

116
src/map/server/CMakeLists.txt Normal file
View file

@ -0,0 +1,116 @@
#
# map server
#
if( BUILD_SERVERS )
message( STATUS "Creating target map-server" )
set( MAP_HEADERS
"${SERVER_MAP_SOURCE_DIR}/atcommand.h"
"${SERVER_MAP_SOURCE_DIR}/battle.h"
"${SERVER_MAP_SOURCE_DIR}/battleground.h"
"${SERVER_MAP_SOURCE_DIR}/buyingstore.h"
"${SERVER_MAP_SOURCE_DIR}/chat.h"
"${SERVER_MAP_SOURCE_DIR}/chrif.h"
"${SERVER_MAP_SOURCE_DIR}/clif.h"
"${SERVER_MAP_SOURCE_DIR}/date.h"
"${SERVER_MAP_SOURCE_DIR}/duel.h"
"${SERVER_MAP_SOURCE_DIR}/elemental.h"
"${SERVER_MAP_SOURCE_DIR}/guild.h"
"${SERVER_MAP_SOURCE_DIR}/homunculus.h"
"${SERVER_MAP_SOURCE_DIR}/instance.h"
"${SERVER_MAP_SOURCE_DIR}/intif.h"
"${SERVER_MAP_SOURCE_DIR}/itemdb.h"
"${SERVER_MAP_SOURCE_DIR}/log.h"
"${SERVER_MAP_SOURCE_DIR}/mail.h"
"${SERVER_MAP_SOURCE_DIR}/map.h"
"${SERVER_MAP_SOURCE_DIR}/mapreg.h"
"${SERVER_MAP_SOURCE_DIR}/mercenary.h"
"${SERVER_MAP_SOURCE_DIR}/mob.h"
"${SERVER_MAP_SOURCE_DIR}/npc.h"
"${SERVER_MAP_SOURCE_DIR}/party.h"
"${SERVER_MAP_SOURCE_DIR}/path.h"
"${SERVER_MAP_SOURCE_DIR}/pc.h"
"${SERVER_MAP_SOURCE_DIR}/pc_groups.h"
"${SERVER_MAP_SOURCE_DIR}/pet.h"
"${SERVER_MAP_SOURCE_DIR}/quest.h"
"${SERVER_MAP_SOURCE_DIR}/script.h"
"${SERVER_MAP_SOURCE_DIR}/searchstore.h"
"${SERVER_MAP_SOURCE_DIR}/skill.h"
"${SERVER_MAP_SOURCE_DIR}/status.h"
"${SERVER_MAP_SOURCE_DIR}/storage.h"
"${SERVER_MAP_SOURCE_DIR}/trade.h"
"${SERVER_MAP_SOURCE_DIR}/unit.h"
"${SERVER_MAP_SOURCE_DIR}/vending.h"
"${SERVER_MAP_SOURCE_DIR}/cashshop.h"
"${SERVER_MAP_SOURCE_DIR}/channel.h"
)
set( MAP_SOURCES
"${SERVER_MAP_SOURCE_DIR}/atcommand.c"
"${SERVER_MAP_SOURCE_DIR}/battle.c"
"${SERVER_MAP_SOURCE_DIR}/battleground.c"
"${SERVER_MAP_SOURCE_DIR}/buyingstore.c"
"${SERVER_MAP_SOURCE_DIR}/chat.c"
"${SERVER_MAP_SOURCE_DIR}/chrif.c"
"${SERVER_MAP_SOURCE_DIR}/clif.c"
"${SERVER_MAP_SOURCE_DIR}/date.c"
"${SERVER_MAP_SOURCE_DIR}/duel.c"
"${SERVER_MAP_SOURCE_DIR}/elemental.c"
"${SERVER_MAP_SOURCE_DIR}/guild.c"
"${SERVER_MAP_SOURCE_DIR}/homunculus.c"
"${SERVER_MAP_SOURCE_DIR}/instance.c"
"${SERVER_MAP_SOURCE_DIR}/intif.c"
"${SERVER_MAP_SOURCE_DIR}/itemdb.c"
"${SERVER_MAP_SOURCE_DIR}/log.c"
"${SERVER_MAP_SOURCE_DIR}/mail.c"
"${SERVER_MAP_SOURCE_DIR}/map.c"
"${SERVER_MAP_SOURCE_DIR}/mapreg.c"
"${SERVER_MAP_SOURCE_DIR}/mercenary.c"
"${SERVER_MAP_SOURCE_DIR}/mob.c"
"${SERVER_MAP_SOURCE_DIR}/npc.c"
"${SERVER_MAP_SOURCE_DIR}/npc_chat.c"
"${SERVER_MAP_SOURCE_DIR}/party.c"
"${SERVER_MAP_SOURCE_DIR}/path.c"
"${SERVER_MAP_SOURCE_DIR}/pc.c"
"${SERVER_MAP_SOURCE_DIR}/pc_groups.c"
"${SERVER_MAP_SOURCE_DIR}/pet.c"
"${SERVER_MAP_SOURCE_DIR}/quest.c"
"${SERVER_MAP_SOURCE_DIR}/script.c"
"${SERVER_MAP_SOURCE_DIR}/searchstore.c"
"${SERVER_MAP_SOURCE_DIR}/skill.c"
"${SERVER_MAP_SOURCE_DIR}/status.c"
"${SERVER_MAP_SOURCE_DIR}/storage.c"
"${SERVER_MAP_SOURCE_DIR}/trade.c"
"${SERVER_MAP_SOURCE_DIR}/unit.c"
"${SERVER_MAP_SOURCE_DIR}/vending.c"
"${SERVER_MAP_SOURCE_DIR}/cashshop.c"
"${SERVER_MAP_SOURCE_DIR}/channel.c"
)
set( DEPENDENCIES common )
set( LIBRARIES ${GLOBAL_LIBRARIES} )
set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} )
set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS}" )
if( WITH_PCRE )
message( STATUS "Enabled PCRE code" )
set( LIBRARIES ${LIBRARIES} ${PCRE_LIBRARIES} )
set( INCLUDE_DIRS ${INCLUDE_DIRS} ${PCRE_INCLUDE_DIRS} )
set( DEFINITIONS "${DEFINITIONS} -DPCRE_SUPPORT" )
else()
message( STATUS "Disabled PCRE code" )
endif()
set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} ${MAP_HEADERS} ${MAP_SOURCES} )
source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} )
source_group( map FILES ${MAP_HEADERS} ${MAP_SOURCES} )
include_directories( ${INCLUDE_DIRS} )
add_executable( map-server ${SOURCE_FILES} )
add_dependencies( map-server ${DEPENDENCIES} )
target_link_libraries( map-server ${LIBRARIES} ${DEPENDENCIES} )
set_target_properties( map-server PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
if( INSTALL_COMPONENT_RUNTIME )
cpack_add_component( Runtime_mapserver DESCRIPTION "map-server" DISPLAY_NAME "map-server" GROUP Runtime )
install( TARGETS map-server
DESTINATION "."
COMPONENT Runtime_mapserver )
endif( INSTALL_COMPONENT_RUNTIME )
set( TARGET_LIST ${TARGET_LIST} map-server CACHE INTERNAL "" )
message( STATUS "Creating target map-server - done" )
endif( BUILD_SERVERS )

116
src/map/sql/CMakeLists.txt
View file

@ -1,116 +0,0 @@
#
# map sql
#
if( BUILD_SQL_SERVERS )
message( STATUS "Creating target map-server_sql" )
set( SQL_MAP_HEADERS
"${SQL_MAP_SOURCE_DIR}/atcommand.h"
"${SQL_MAP_SOURCE_DIR}/battle.h"
"${SQL_MAP_SOURCE_DIR}/battleground.h"
"${SQL_MAP_SOURCE_DIR}/buyingstore.h"
"${SQL_MAP_SOURCE_DIR}/chat.h"
"${SQL_MAP_SOURCE_DIR}/chrif.h"
"${SQL_MAP_SOURCE_DIR}/clif.h"
"${SQL_MAP_SOURCE_DIR}/date.h"
"${SQL_MAP_SOURCE_DIR}/duel.h"
"${SQL_MAP_SOURCE_DIR}/elemental.h"
"${SQL_MAP_SOURCE_DIR}/guild.h"
"${SQL_MAP_SOURCE_DIR}/homunculus.h"
"${SQL_MAP_SOURCE_DIR}/instance.h"
"${SQL_MAP_SOURCE_DIR}/intif.h"
"${SQL_MAP_SOURCE_DIR}/itemdb.h"
"${SQL_MAP_SOURCE_DIR}/log.h"
"${SQL_MAP_SOURCE_DIR}/mail.h"
"${SQL_MAP_SOURCE_DIR}/map.h"
"${SQL_MAP_SOURCE_DIR}/mapreg.h"
"${SQL_MAP_SOURCE_DIR}/mercenary.h"
"${SQL_MAP_SOURCE_DIR}/mob.h"
"${SQL_MAP_SOURCE_DIR}/npc.h"
"${SQL_MAP_SOURCE_DIR}/party.h"
"${SQL_MAP_SOURCE_DIR}/path.h"
"${SQL_MAP_SOURCE_DIR}/pc.h"
"${SQL_MAP_SOURCE_DIR}/pc_groups.h"
"${SQL_MAP_SOURCE_DIR}/pet.h"
"${SQL_MAP_SOURCE_DIR}/quest.h"
"${SQL_MAP_SOURCE_DIR}/script.h"
"${SQL_MAP_SOURCE_DIR}/searchstore.h"
"${SQL_MAP_SOURCE_DIR}/skill.h"
"${SQL_MAP_SOURCE_DIR}/status.h"
"${SQL_MAP_SOURCE_DIR}/storage.h"
"${SQL_MAP_SOURCE_DIR}/trade.h"
"${SQL_MAP_SOURCE_DIR}/unit.h"
"${SQL_MAP_SOURCE_DIR}/vending.h"
"${SQL_MAP_SOURCE_DIR}/cashshop.h"
"${SQL_MAP_SOURCE_DIR}/channel.h"
)
set( SQL_MAP_SOURCES
"${SQL_MAP_SOURCE_DIR}/atcommand.c"
"${SQL_MAP_SOURCE_DIR}/battle.c"
"${SQL_MAP_SOURCE_DIR}/battleground.c"
"${SQL_MAP_SOURCE_DIR}/buyingstore.c"
"${SQL_MAP_SOURCE_DIR}/chat.c"
"${SQL_MAP_SOURCE_DIR}/chrif.c"
"${SQL_MAP_SOURCE_DIR}/clif.c"
"${SQL_MAP_SOURCE_DIR}/date.c"
"${SQL_MAP_SOURCE_DIR}/duel.c"
"${SQL_MAP_SOURCE_DIR}/elemental.c"
"${SQL_MAP_SOURCE_DIR}/guild.c"
"${SQL_MAP_SOURCE_DIR}/homunculus.c"
"${SQL_MAP_SOURCE_DIR}/instance.c"
"${SQL_MAP_SOURCE_DIR}/intif.c"
"${SQL_MAP_SOURCE_DIR}/itemdb.c"
"${SQL_MAP_SOURCE_DIR}/log.c"
"${SQL_MAP_SOURCE_DIR}/mail.c"
"${SQL_MAP_SOURCE_DIR}/map.c"
"${SQL_MAP_SOURCE_DIR}/mapreg_sql.c"
"${SQL_MAP_SOURCE_DIR}/mercenary.c"
"${SQL_MAP_SOURCE_DIR}/mob.c"
"${SQL_MAP_SOURCE_DIR}/npc.c"
"${SQL_MAP_SOURCE_DIR}/npc_chat.c"
"${SQL_MAP_SOURCE_DIR}/party.c"
"${SQL_MAP_SOURCE_DIR}/path.c"
"${SQL_MAP_SOURCE_DIR}/pc.c"
"${SQL_MAP_SOURCE_DIR}/pc_groups.c"
"${SQL_MAP_SOURCE_DIR}/pet.c"
"${SQL_MAP_SOURCE_DIR}/quest.c"
"${SQL_MAP_SOURCE_DIR}/script.c"
"${SQL_MAP_SOURCE_DIR}/searchstore.c"
"${SQL_MAP_SOURCE_DIR}/skill.c"
"${SQL_MAP_SOURCE_DIR}/status.c"
"${SQL_MAP_SOURCE_DIR}/storage.c"
"${SQL_MAP_SOURCE_DIR}/trade.c"
"${SQL_MAP_SOURCE_DIR}/unit.c"
"${SQL_MAP_SOURCE_DIR}/vending.c"
"${SQL_MAP_SOURCE_DIR}/cashshop.c"
"${SQL_MAP_SOURCE_DIR}/channel.c"
)
set( DEPENDENCIES common_sql )
set( LIBRARIES ${GLOBAL_LIBRARIES} )
set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} )
set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS}" )
if( WITH_PCRE )
message( STATUS "Enabled PCRE code" )
set( LIBRARIES ${LIBRARIES} ${PCRE_LIBRARIES} )
set( INCLUDE_DIRS ${INCLUDE_DIRS} ${PCRE_INCLUDE_DIRS} )
set( DEFINITIONS "${DEFINITIONS} -DPCRE_SUPPORT" )
else()
message( STATUS "Disabled PCRE code" )
endif()
set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} ${SQL_MAP_HEADERS} ${SQL_MAP_SOURCES} )
source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} )
source_group( map FILES ${SQL_MAP_HEADERS} ${SQL_MAP_SOURCES} )
include_directories( ${INCLUDE_DIRS} )
add_executable( map-server_sql ${SOURCE_FILES} )
add_dependencies( map-server_sql ${DEPENDENCIES} )
target_link_libraries( map-server_sql ${LIBRARIES} ${DEPENDENCIES} )
set_target_properties( map-server_sql PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
if( INSTALL_COMPONENT_RUNTIME )
cpack_add_component( Runtime_mapserver_sql DESCRIPTION "map-server (sql version)" DISPLAY_NAME "map-server_sql" GROUP Runtime )
install( TARGETS map-server_sql
DESTINATION "."
COMPONENT Runtime_mapserver_sql )
endif( INSTALL_COMPONENT_RUNTIME )
set( TARGET_LIST ${TARGET_LIST} map-server_sql CACHE INTERNAL "" )
message( STATUS "Creating target map-server_sql - done" )
endif( BUILD_SQL_SERVERS )

2
src/tool/Makefile.in
View file

@ -45,7 +45,7 @@ obj_all/%.o: %.c $(COMMON_H) $(OTHER_H) $(LIBCONFIG_H)
# missing common object files
$(COMMON_DIR_OBJ):
@$(MAKE) -C ../common sql
@$(MAKE) -C ../common server
$(LIBCONFIG_AR):
@$(MAKE) -C ../../3rdparty/libconfig

10
uninstall.sh
View file

@ -4,19 +4,19 @@
echo "My pkg path is $PKG_PATH"
check_inst_right
read -p "WARNING: This target dis experimental. Press Ctrl+C to cancel or Enter to continue." readEnterKey
read -p "WARNING: This script is experimental. Press Ctrl+C to cancel or Enter to continue." readEnterKey
case $1 in
'bin')
echo "Starting binary cleanup"
rm -rf $PKG_PATH/bin/*
echo "Binary file was deleted"
echo "Binary files have been deleted"
;;
'all')
echo "Starting uninstalling "
echo "Starting uninstall"
rm -rf $PKG_PATH
rm -rf /usr/bin/$PKG
echo "Uninstallation succed"
echo "Uninstallation has succeed"
;;
'*')
echo "Please enter a target usage './uninstall { all | bin }'"
echo "Usage: Please enter a target './uninstall { all | bin }'"
esac

8
vcproj-10/char-server_sql.vcxproj → vcproj-10/char-server.vcxproj
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@ -12,7 +12,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{D356871D-58E1-450B-967A-E4E9646175AF}</ProjectGuid>
<RootNamespace>char-server_sql</RootNamespace>
<RootNamespace>char-server</RootNamespace>
<Keyword>Win32Proj</Keyword>
<VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and $(VisualStudioVersion) == ''">$(VCTargetsPath11)</VCTargetsPath>
</PropertyGroup>
@ -47,8 +47,8 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">char-server_sql</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">char-server_sql</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">char-server</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">char-server</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>

68
vcproj-10/char-server_sql.vcxproj.filters → vcproj-10/char-server.vcxproj.filters
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\src\common\core.c">
@ -41,52 +41,52 @@
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="..\src\char\char.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\char_clif.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\char_cnslif.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\char_logif.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\char_mapif.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_auction.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_elemental.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_guild.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_homun.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_mail.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_mercenary.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_party.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_pet.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_quest.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_storage.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\inter.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c">
<Filter>3rdparty\mt19937ar</Filter>
@ -171,52 +171,52 @@
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\src\char\inter.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\char.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\char_clif.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\char_cnslif.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\char_logif.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\char_mapif.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_auction.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_elemental.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_guild.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_homun.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_mail.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_mercenary.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_party.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_pet.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_quest.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_storage.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h">
<Filter>3rdparty\mt19937ar</Filter>
@ -267,7 +267,7 @@
<Filter Include="common">
<UniqueIdentifier>{623f21b1-c166-4848-83d8-8b4fe0e2e2df}</UniqueIdentifier>
</Filter>
<Filter Include="char_sql">
<Filter Include="char">
<UniqueIdentifier>{83b1ecf5-21d1-4dac-915f-95ff77a90899}</UniqueIdentifier>
</Filter>
<Filter Include="3rdparty">

8
vcproj-10/login-server_sql.vcxproj → vcproj-10/login-server.vcxproj
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@ -12,7 +12,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{D356871D-58E1-450B-967A-E5E9646175AF}</ProjectGuid>
<RootNamespace>login-server_sql</RootNamespace>
<RootNamespace>login-server</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@ -45,8 +45,8 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">login-server_sql</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">login-server_sql</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">login-server</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">login-server</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>

48
vcproj-13/login-server_sql.vcxproj.filters → vcproj-10/login-server.vcxproj.filters
View file

@ -1,33 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\src\login\account.c">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClCompile>
<ClCompile Include="..\src\login\ipban.c">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClCompile>
<ClCompile Include="..\src\login\login.c">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClCompile>
<ClCompile Include="..\src\login\loginchrif.c">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClCompile>
<ClCompile Include="..\src\login\loginclif.c">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClCompile>
<ClCompile Include="..\src\login\logincnslif.c">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClCompile>
<ClCompile Include="..\src\login\loginlog.c">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClCompile>
<ClCompile Include="..\src\common\core.c">
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="..\src\common\conf.c">
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="..\src\common\db.c">
<Filter>common</Filter>
</ClCompile>
@ -94,30 +91,33 @@
<ClCompile Include="..\src\common\raconf.c">
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="..\src\common\cli.c" />
<ClCompile Include="..\src\common\msg_conf.c" />
<ClCompile Include="..\src\common\cli.c" />
<ClCompile Include="..\src\common\conf.c">
<Filter>common</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\login\account.h">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClInclude>
<ClInclude Include="..\src\login\ipban.h">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClInclude>
<ClInclude Include="..\src\login\login.h">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClInclude>
<ClInclude Include="..\src\login\loginchrif.h">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClInclude>
<ClInclude Include="..\src\login\loginclif.h">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClInclude>
<ClInclude Include="..\src\login\logincnslif.h">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClInclude>
<ClInclude Include="..\src\login\loginlog.h">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClInclude>
<ClInclude Include="..\src\common\cbasetypes.h">
<Filter>common</Filter>
@ -125,9 +125,6 @@
<ClInclude Include="..\src\common\core.h">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\src\common\conf.h">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\src\common\db.h">
<Filter>common</Filter>
</ClInclude>
@ -206,14 +203,17 @@
<ClInclude Include="..\src\common\raconf.h">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\src\common\cli.h" />
<ClInclude Include="..\src\common\msg_conf.h" />
<ClInclude Include="..\src\common\cli.h" />
<ClInclude Include="..\src\common\conf.h">
<Filter>common</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="common">
<UniqueIdentifier>{b50ee803-e71d-4d41-8f7d-2dad5839df50}</UniqueIdentifier>
</Filter>
<Filter Include="login_sql">
<Filter Include="login">
<UniqueIdentifier>{8eea96ed-d379-4694-ae2e-ffb0be95170c}</UniqueIdentifier>
</Filter>
<Filter Include="3rdparty">

10
vcproj-10/map-server_sql.vcxproj → vcproj-10/map-server.vcxproj
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@ -12,7 +12,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{D356871D-58E1-450B-967A-E6E9646175AF}</ProjectGuid>
<RootNamespace>map-server_sql</RootNamespace>
<RootNamespace>map-server</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@ -44,8 +44,8 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">map-server_sql</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">map-server_sql</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">map-server</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">map-server</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@ -252,7 +252,7 @@
<ClCompile Include="..\src\map\log.c" />
<ClCompile Include="..\src\map\mail.c" />
<ClCompile Include="..\src\map\map.c" />
<ClCompile Include="..\src\map\mapreg_sql.c" />
<ClCompile Include="..\src\map\mapreg.c" />
<ClCompile Include="..\src\map\homunculus.c" />
<ClCompile Include="..\src\map\instance.c" />
<ClCompile Include="..\src\map\mercenary.c" />

160
vcproj-10/map-server_sql.vcxproj.filters → vcproj-10/map-server.vcxproj.filters
View file

@ -1,119 +1,119 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\src\map\atcommand.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\battle.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\battleground.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\buyingstore.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\cashshop.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\channel.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\chat.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\chrif.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\clif.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\date.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\duel.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\elemental.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\guild.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\homunculus.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\instance.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\intif.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\itemdb.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\log.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\mail.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\map.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\mapreg_sql.c">
<Filter>map_sql</Filter>
<ClCompile Include="..\src\map\mapreg.c">
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\mercenary.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\mob.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\npc.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\npc_chat.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\party.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\path.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\pc.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\pet.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\quest.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\script.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\searchstore.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\skill.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\status.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\storage.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\trade.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\unit.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\vending.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\common\core.c">
<Filter>common</Filter>
@ -164,7 +164,7 @@
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="..\src\map\pc_groups.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\common\showmsg.c">
<Filter>common</Filter>
@ -202,115 +202,115 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\map\atcommand.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\battle.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\battleground.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\buyingstore.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\cashshop.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\channel.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\chat.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\chrif.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\clif.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\date.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\duel.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\elemental.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\guild.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\homunculus.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\instance.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\intif.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\itemdb.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\log.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\mail.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\map.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\mapreg.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\mercenary.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\mob.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\npc.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\party.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\path.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\pc.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\pet.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\quest.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\script.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\searchstore.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\skill.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\status.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\storage.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\trade.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\unit.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\vending.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\common\cbasetypes.h">
<Filter>common</Filter>
@ -372,7 +372,7 @@
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\src\map\pc_groups.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\common\showmsg.h">
<Filter>common</Filter>
@ -421,7 +421,7 @@
<Filter Include="common">
<UniqueIdentifier>{3a137217-ebf7-44ee-95d9-3d7c51d2a199}</UniqueIdentifier>
</Filter>
<Filter Include="map_sql">
<Filter Include="map">
<UniqueIdentifier>{8c01a080-5a78-4fb7-96f2-862c33a02230}</UniqueIdentifier>
</Filter>
<Filter Include="3rdparty">

8
vcproj-12/char-server_sql.vcxproj → vcproj-12/char-server.vcxproj
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@ -12,7 +12,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{D356871D-58E1-450B-967A-E4E9646175AF}</ProjectGuid>
<RootNamespace>char-server_sql</RootNamespace>
<RootNamespace>char-server</RootNamespace>
<Keyword>Win32Proj</Keyword>
<VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and $(VisualStudioVersion) == ''">$(VCTargetsPath11)</VCTargetsPath>
</PropertyGroup>
@ -48,8 +48,8 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">char-server_sql</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">char-server_sql</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">char-server</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">char-server</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>

68
vcproj-12/char-server_sql.vcxproj.filters → vcproj-12/char-server.vcxproj.filters
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\src\common\core.c">
@ -44,52 +44,52 @@
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="..\src\char\char.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\char_clif.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\char_cnslif.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\char_logif.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\char_mapif.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_auction.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_elemental.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_guild.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_homun.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_mail.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_mercenary.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_party.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_pet.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_quest.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_storage.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\inter.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c">
<Filter>3rdparty\mt19937ar</Filter>
@ -172,52 +172,52 @@
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\src\char\inter.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\char.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\char_clif.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\char_cnslif.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\char_logif.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\char_mapif.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_auction.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_elemental.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_guild.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_homun.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_mail.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_mercenary.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_party.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_pet.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_quest.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_storage.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h">
<Filter>3rdparty\mt19937ar</Filter>
@ -263,7 +263,7 @@
<Filter Include="common">
<UniqueIdentifier>{623f21b1-c166-4848-83d8-8b4fe0e2e2df}</UniqueIdentifier>
</Filter>
<Filter Include="char_sql">
<Filter Include="char">
<UniqueIdentifier>{83b1ecf5-21d1-4dac-915f-95ff77a90899}</UniqueIdentifier>
</Filter>
<Filter Include="3rdparty">

8
vcproj-12/login-server_sql.vcxproj → vcproj-12/login-server.vcxproj
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@ -12,7 +12,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{D356871D-58E1-450B-967A-E5E9646175AF}</ProjectGuid>
<RootNamespace>login-server_sql</RootNamespace>
<RootNamespace>login-server</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@ -47,8 +47,8 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">login-server_sql</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">login-server_sql</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">login-server</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">login-server</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>

32
vcproj-12/login-server_sql.vcxproj.filters → vcproj-12/login-server.vcxproj.filters
View file

@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\src\login\account.c">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClCompile>
<ClCompile Include="..\src\login\ipban.c">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClCompile>
<ClCompile Include="..\src\login\login.c">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClCompile>
<ClCompile Include="..\src\login\loginchrif.c">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClCompile>
<ClCompile Include="..\src\login\loginclif.c">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClCompile>
<ClCompile Include="..\src\login\logincnslif.c">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClCompile>
<ClCompile Include="..\src\login\loginlog.c">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClCompile>
<ClCompile Include="..\src\common\core.c">
<Filter>common</Filter>
@ -97,25 +97,25 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\login\account.h">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClInclude>
<ClInclude Include="..\src\login\ipban.h">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClInclude>
<ClInclude Include="..\src\login\login.h">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClInclude>
<ClInclude Include="..\src\login\loginchrif.h">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClInclude>
<ClInclude Include="..\src\login\loginclif.h">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClInclude>
<ClInclude Include="..\src\login\logincnslif.h">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClInclude>
<ClInclude Include="..\src\login\loginlog.h">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClInclude>
<ClInclude Include="..\src\common\cbasetypes.h">
<Filter>common</Filter>
@ -209,7 +209,7 @@
<Filter Include="common">
<UniqueIdentifier>{b50ee803-e71d-4d41-8f7d-2dad5839df50}</UniqueIdentifier>
</Filter>
<Filter Include="login_sql">
<Filter Include="login">
<UniqueIdentifier>{8eea96ed-d379-4694-ae2e-ffb0be95170c}</UniqueIdentifier>
</Filter>
<Filter Include="3rdparty">

10
vcproj-12/map-server_sql.vcxproj → vcproj-12/map-server.vcxproj
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@ -12,7 +12,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{D356871D-58E1-450B-967A-E6E9646175AF}</ProjectGuid>
<RootNamespace>map-server_sql</RootNamespace>
<RootNamespace>map-server</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@ -46,8 +46,8 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">map-server_sql</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">map-server_sql</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">map-server</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">map-server</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@ -256,7 +256,7 @@
<ClCompile Include="..\src\map\log.c" />
<ClCompile Include="..\src\map\mail.c" />
<ClCompile Include="..\src\map\map.c" />
<ClCompile Include="..\src\map\mapreg_sql.c" />
<ClCompile Include="..\src\map\mapreg.c" />
<ClCompile Include="..\src\map\homunculus.c" />
<ClCompile Include="..\src\map\instance.c" />
<ClCompile Include="..\src\map\mercenary.c" />

160
vcproj-13/map-server_sql.vcxproj.filters → vcproj-12/map-server.vcxproj.filters
View file

@ -1,119 +1,119 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\src\map\atcommand.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\battle.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\battleground.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\buyingstore.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\channel.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\cashshop.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\chat.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\chrif.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\clif.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\date.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\duel.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\elemental.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\guild.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\homunculus.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\instance.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\intif.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\itemdb.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\log.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\mail.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\map.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\mapreg_sql.c">
<Filter>map_sql</Filter>
<ClCompile Include="..\src\map\mapreg.c">
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\mercenary.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\mob.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\npc.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\npc_chat.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\party.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\path.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\pc.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\pet.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\quest.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\script.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\searchstore.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\skill.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\status.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\storage.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\trade.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\unit.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\vending.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\common\core.c">
<Filter>common</Filter>
@ -164,7 +164,7 @@
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="..\src\map\pc_groups.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\common\showmsg.c">
<Filter>common</Filter>
@ -208,115 +208,115 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\map\atcommand.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\battle.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\battleground.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\buyingstore.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\channel.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\cashshop.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\chat.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\chrif.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\clif.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\date.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\duel.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\elemental.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\guild.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\homunculus.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\instance.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\intif.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\itemdb.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\log.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\mail.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\map.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\mapreg.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\mercenary.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\mob.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\npc.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\party.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\path.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\pc.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\pet.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\quest.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\script.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\searchstore.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\skill.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\status.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\storage.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\trade.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\unit.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\vending.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\common\cbasetypes.h">
<Filter>common</Filter>
@ -378,7 +378,7 @@
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\src\map\pc_groups.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\common\showmsg.h">
<Filter>common</Filter>
@ -433,7 +433,7 @@
<Filter Include="common">
<UniqueIdentifier>{3a137217-ebf7-44ee-95d9-3d7c51d2a199}</UniqueIdentifier>
</Filter>
<Filter Include="map_sql">
<Filter Include="map">
<UniqueIdentifier>{8c01a080-5a78-4fb7-96f2-862c33a02230}</UniqueIdentifier>
</Filter>
<Filter Include="3rdparty">

8
vcproj-13/char-server_sql.vcxproj → vcproj-13/char-server.vcxproj
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@ -12,7 +12,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{D356871D-58E1-450B-967A-E4E9646175AF}</ProjectGuid>
<RootNamespace>char-server_sql</RootNamespace>
<RootNamespace>char-server</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@ -47,8 +47,8 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">char-server_sql</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">char-server_sql</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">char-server</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">char-server</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>

68
vcproj-13/char-server_sql.vcxproj.filters → vcproj-13/char-server.vcxproj.filters
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\src\common\core.c">
@ -44,52 +44,52 @@
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="..\src\char\char.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\char_clif.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\char_cnslif.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\char_logif.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\char_mapif.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_auction.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_elemental.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_guild.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_homun.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_mail.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_mercenary.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_party.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_pet.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_quest.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_storage.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\src\char\inter.c">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClCompile>
<ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c">
<Filter>3rdparty\mt19937ar</Filter>
@ -174,52 +174,52 @@
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\src\char\inter.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\char.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\char_clif.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\char_cnslif.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\char_logif.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\char_mapif.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_auction.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_elemental.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_guild.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_homun.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_mail.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_mercenary.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_party.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_pet.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_quest.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_storage.h">
<Filter>char_sql</Filter>
<Filter>char</Filter>
</ClInclude>
<ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h">
<Filter>3rdparty\mt19937ar</Filter>
@ -267,7 +267,7 @@
<Filter Include="common">
<UniqueIdentifier>{623f21b1-c166-4848-83d8-8b4fe0e2e2df}</UniqueIdentifier>
</Filter>
<Filter Include="char_sql">
<Filter Include="char">
<UniqueIdentifier>{83b1ecf5-21d1-4dac-915f-95ff77a90899}</UniqueIdentifier>
</Filter>
<Filter Include="3rdparty">

10
vcproj-13/login-server_sql.vcxproj → vcproj-13/login-server.vcxproj
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@ -12,7 +12,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{D356871D-58E1-450B-967A-E5E9646175AF}</ProjectGuid>
<RootNamespace>login-server_sql</RootNamespace>
<RootNamespace>login-server</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@ -47,8 +47,8 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">login-server_sql</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">login-server_sql</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">login-server</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">login-server</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@ -212,4 +212,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

48
vcproj-10/login-server_sql.vcxproj.filters → vcproj-13/login-server.vcxproj.filters
View file

@ -1,30 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\src\login\account.c">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClCompile>
<ClCompile Include="..\src\login\ipban.c">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClCompile>
<ClCompile Include="..\src\login\login.c">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClCompile>
<ClCompile Include="..\src\login\loginchrif.c">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClCompile>
<ClCompile Include="..\src\login\loginclif.c">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClCompile>
<ClCompile Include="..\src\login\logincnslif.c">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClCompile>
<ClCompile Include="..\src\login\loginlog.c">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClCompile>
<ClCompile Include="..\src\common\core.c">
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="..\src\common\conf.c">
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="..\src\common\db.c">
<Filter>common</Filter>
</ClCompile>
@ -91,33 +94,30 @@
<ClCompile Include="..\src\common\raconf.c">
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="..\src\common\msg_conf.c" />
<ClCompile Include="..\src\common\cli.c" />
<ClCompile Include="..\src\common\conf.c">
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="..\src\common\msg_conf.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\login\account.h">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClInclude>
<ClInclude Include="..\src\login\ipban.h">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClInclude>
<ClInclude Include="..\src\login\login.h">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClInclude>
<ClInclude Include="..\src\login\loginchrif.h">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClInclude>
<ClInclude Include="..\src\login\loginclif.h">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClInclude>
<ClInclude Include="..\src\login\logincnslif.h">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClInclude>
<ClInclude Include="..\src\login\loginlog.h">
<Filter>login_sql</Filter>
<Filter>login</Filter>
</ClInclude>
<ClInclude Include="..\src\common\cbasetypes.h">
<Filter>common</Filter>
@ -125,6 +125,9 @@
<ClInclude Include="..\src\common\core.h">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\src\common\conf.h">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\src\common\db.h">
<Filter>common</Filter>
</ClInclude>
@ -203,17 +206,14 @@
<ClInclude Include="..\src\common\raconf.h">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\src\common\msg_conf.h" />
<ClInclude Include="..\src\common\cli.h" />
<ClInclude Include="..\src\common\conf.h">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\src\common\msg_conf.h" />
</ItemGroup>
<ItemGroup>
<Filter Include="common">
<UniqueIdentifier>{b50ee803-e71d-4d41-8f7d-2dad5839df50}</UniqueIdentifier>
</Filter>
<Filter Include="login_sql">
<Filter Include="login">
<UniqueIdentifier>{8eea96ed-d379-4694-ae2e-ffb0be95170c}</UniqueIdentifier>
</Filter>
<Filter Include="3rdparty">

12
vcproj-13/map-server_sql.vcxproj → vcproj-13/map-server.vcxproj
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@ -12,7 +12,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{D356871D-58E1-450B-967A-E6E9646175AF}</ProjectGuid>
<RootNamespace>map-server_sql</RootNamespace>
<RootNamespace>map-server</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@ -46,8 +46,8 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">map-server_sql</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">map-server_sql</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">map-server</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">map-server</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@ -256,7 +256,7 @@
<ClCompile Include="..\src\map\log.c" />
<ClCompile Include="..\src\map\mail.c" />
<ClCompile Include="..\src\map\map.c" />
<ClCompile Include="..\src\map\mapreg_sql.c" />
<ClCompile Include="..\src\map\mapreg.c" />
<ClCompile Include="..\src\map\homunculus.c" />
<ClCompile Include="..\src\map\instance.c" />
<ClCompile Include="..\src\map\mercenary.c" />
@ -363,4 +363,4 @@
<Copy SourceFiles="..\db\import-tmpl\spellbook_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\spellbook_db.txt')" />
<Copy SourceFiles="..\db\import-tmpl\statpoint.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\statpoint.txt')" />
</Target>
</Project>
</Project>

160
vcproj-12/map-server_sql.vcxproj.filters → vcproj-13/map-server.vcxproj.filters
View file

@ -1,119 +1,119 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\src\map\atcommand.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\battle.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\battleground.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\buyingstore.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\channel.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\cashshop.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\chat.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\chrif.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\clif.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\date.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\duel.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\elemental.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\guild.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\homunculus.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\instance.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\intif.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\itemdb.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\log.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\mail.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\map.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\mapreg_sql.c">
<Filter>map_sql</Filter>
<ClCompile Include="..\src\map\mapreg.c">
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\mercenary.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\mob.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\npc.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\npc_chat.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\party.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\path.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\pc.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\pet.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\quest.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\script.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\searchstore.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\skill.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\status.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\storage.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\trade.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\unit.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\map\vending.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\common\core.c">
<Filter>common</Filter>
@ -164,7 +164,7 @@
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="..\src\map\pc_groups.c">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClCompile>
<ClCompile Include="..\src\common\showmsg.c">
<Filter>common</Filter>
@ -208,115 +208,115 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\map\atcommand.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\battle.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\battleground.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\buyingstore.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\channel.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\cashshop.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\chat.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\chrif.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\clif.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\date.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\duel.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\elemental.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\guild.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\homunculus.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\instance.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\intif.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\itemdb.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\log.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\mail.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\map.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\mapreg.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\mercenary.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\mob.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\npc.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\party.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\path.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\pc.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\pet.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\quest.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\script.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\searchstore.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\skill.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\status.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\storage.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\trade.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\unit.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\map\vending.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\common\cbasetypes.h">
<Filter>common</Filter>
@ -378,7 +378,7 @@
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\src\map\pc_groups.h">
<Filter>map_sql</Filter>
<Filter>map</Filter>
</ClInclude>
<ClInclude Include="..\src\common\showmsg.h">
<Filter>common</Filter>
@ -433,7 +433,7 @@
<Filter Include="common">
<UniqueIdentifier>{3a137217-ebf7-44ee-95d9-3d7c51d2a199}</UniqueIdentifier>
</Filter>
<Filter Include="map_sql">
<Filter Include="map">
<UniqueIdentifier>{8c01a080-5a78-4fb7-96f2-862c33a02230}</UniqueIdentifier>
</Filter>
<Filter Include="3rdparty">

6
vcproj-9/char-server_sql.vcproj → vcproj-9/char-server.vcproj
View file

@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="char-server_sql"
Name="char-server"
ProjectGUID="{D356871D-58E1-450B-967A-E4E9646175AF}"
RootNamespace="char-server_sql"
RootNamespace="char-server"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
@ -446,7 +446,7 @@
</File>
</Filter>
<Filter
Name="char_sql"
Name="char"
>
<File
RelativePath="..\src\char\char.c"

6
vcproj-9/login-server_sql.vcproj → vcproj-9/login-server.vcproj
View file

@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="login-server_sql"
Name="login-server"
ProjectGUID="{D356871D-58E1-450B-967A-E5E9646175AF}"
RootNamespace="login-server_sql"
RootNamespace="login-server"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
@ -204,7 +204,7 @@
</References>
<Files>
<Filter
Name="login_sql"
Name="login"
>
<File
RelativePath="..\src\login\account.h"

8
vcproj-9/map-server_sql.vcproj → vcproj-9/map-server.vcproj
View file

@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="map-server_sql"
Name="map-server"
ProjectGUID="{D356871D-58E1-450B-967A-E6E9646175AF}"
RootNamespace="map-server_sql"
RootNamespace="map-server"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
@ -470,7 +470,7 @@
</Filter>
<Filter
Name="map_sql"
Name="map"
>
<File
RelativePath="..\src\map\atcommand.c"
@ -649,7 +649,7 @@
>
</File>
<File
RelativePath="..\src\map\mapreg_sql.c"
RelativePath="..\src\map\mapreg.c"
>
</File>
<File