diff --git a/configure.ac b/configure.ac index bc8fd62b85..6a4a99a7b6 100644 --- a/configure.ac +++ b/configure.ac @@ -620,7 +620,7 @@ if test "$enable_lto" != "no" ; then ) CFLAGS="$OLD_CFLAGS" LDFLAGS="$OLD_LDFLAGS" - + CFLAGS="$CFLAGS -flto -fuse-linker-plugin" LDFLAGS="$LDFLAGS -flto -fuse-linker-plugin" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 92e3e6621c..1410eda33f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,6 +2,14 @@ # # setup and static libraries # + +set(RA_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH + "rathena include directory" +) +mark_as_advanced( RA_INCLUDE_DIRS ) + + + add_subdirectory( common ) if( HAVE_common ) option( BUILD_SERVERS "build server executables" ON ) diff --git a/src/char/CMakeLists.txt b/src/char/CMakeLists.txt index d02a2e93dd..bc9ddfb716 100644 --- a/src/char/CMakeLists.txt +++ b/src/char/CMakeLists.txt @@ -15,7 +15,7 @@ set(CHAR_SOURCES ${CHAR_SOURCES_C} ${CHAR_SOURCES_CXX}) #message( STATUS "CHAR_SOURCES="${CHAR_SOURCES}) set( DEPENDENCIES common ) set( LIBRARIES ${GLOBAL_LIBRARIES} ) -set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} ) +set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} ${RA_INCLUDE_DIRS} ) set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS}" ) set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} ${CHAR_HEADERS} ${CHAR_SOURCES} ) source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} ) diff --git a/src/char/Makefile.in b/src/char/Makefile.in index b11438ec52..4b3816ab50 100644 --- a/src/char/Makefile.in +++ b/src/char/Makefile.in @@ -3,6 +3,8 @@ COMMON_H = $(shell ls ../common/*.hpp) COMMON_AR = ../common/obj/common.a COMMON_INCLUDE = -I../common/ +RA_INCLUDE = -I../ + LIBCONFIG_H = $(shell ls ../../3rdparty/libconfig/*.h) LIBCONFIG_AR = ../../3rdparty/libconfig/obj/libconfig.a LIBCONFIG_INCLUDE = -I../../3rdparty/libconfig @@ -65,7 +67,7 @@ obj: obj/%.o: %.cpp $(CHAR_H) $(COMMON_H) $(LIBCONFIG_H) $(RAPIDYAML_H) @echo " CXX $<" - @@CXX@ @CXXFLAGS@ $(COMMON_INCLUDE) $(LIBCONFIG_INCLUDE) $(RAPIDYAML_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @@CXX@ @CXXFLAGS@ $(COMMON_INCLUDE) $(RA_INCLUDE) $(LIBCONFIG_INCLUDE) $(RAPIDYAML_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing object files $(COMMON_AR): diff --git a/src/char/char-server.vcxproj b/src/char/char-server.vcxproj index f01f4b9cc8..1a18334dc3 100644 --- a/src/char/char-server.vcxproj +++ b/src/char/char-server.vcxproj @@ -109,7 +109,7 @@ Disabled $(DefineConstants);WIN32;FD_SETSIZE=4096;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug - $(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) + $(SolutionDir)src;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) true @@ -126,7 +126,7 @@ Disabled $(DefineConstants);WIN32;FD_SETSIZE=4096;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug - $(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) + $(SolutionDir)src;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) Console @@ -144,7 +144,7 @@ true $(DefineConstants);WIN32;FD_SETSIZE=4096;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded - $(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) + $(SolutionDir)src;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) Console @@ -164,7 +164,7 @@ true $(DefineConstants);WIN32;FD_SETSIZE=4096;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded - $(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) + $(SolutionDir)src;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) Console diff --git a/src/char/char.cpp b/src/char/char.cpp index 11664c8c36..b104ca026d 100644 --- a/src/char/char.cpp +++ b/src/char/char.cpp @@ -13,19 +13,19 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/cli.hpp" -#include "../common/core.hpp" -#include "../common/db.hpp" -#include "../common/malloc.hpp" -#include "../common/mapindex.hpp" -#include "../common/mmo.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utilities.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "char_clif.hpp" #include "char_cnslif.hpp" diff --git a/src/char/char.hpp b/src/char/char.hpp index 75a6d61356..f03dd9b158 100644 --- a/src/char/char.hpp +++ b/src/char/char.hpp @@ -8,11 +8,11 @@ #include #include -#include "../common/core.hpp" // CORE_ST_LAST -#include "../common/mmo.hpp" -#include "../common/msg_conf.hpp" -#include "../common/timer.hpp" -#include "../config/core.hpp" +#include // CORE_ST_LAST +#include +#include +#include +#include #include "packets.hpp" diff --git a/src/char/char_clif.cpp b/src/char/char_clif.cpp index ccd068bfe8..e5ec116ce6 100644 --- a/src/char/char_clif.cpp +++ b/src/char/char_clif.cpp @@ -10,17 +10,17 @@ #include #include -#include "../common/malloc.hpp" -#include "../common/mapindex.hpp" -#include "../common/mmo.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/sql.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utilities.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "char.hpp" #include "char_logif.hpp" diff --git a/src/char/char_clif.hpp b/src/char/char_clif.hpp index 944cf500cd..94cfc71a8a 100644 --- a/src/char/char_clif.hpp +++ b/src/char/char_clif.hpp @@ -4,8 +4,8 @@ #ifndef CHAR_CLIF_HPP #define CHAR_CLIF_HPP -#include "../common/cbasetypes.hpp" -#include "../common/timer.hpp" //time_t +#include +#include //time_t struct char_session_data; enum pincode_state : uint8; diff --git a/src/char/char_cnslif.cpp b/src/char/char_cnslif.cpp index 5a0f2fe2e0..9c1bf2fcfd 100644 --- a/src/char/char_cnslif.cpp +++ b/src/char/char_cnslif.cpp @@ -6,11 +6,11 @@ #include #include -#include "../common/cli.hpp" -#include "../common/ers.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/timer.hpp" +#include +#include +#include +#include +#include #include "char.hpp" diff --git a/src/char/char_logif.cpp b/src/char/char_logif.cpp index 2af0ccd1d0..c656e42fe6 100644 --- a/src/char/char_logif.cpp +++ b/src/char/char_logif.cpp @@ -8,13 +8,13 @@ #include #include -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/sql.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utilities.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include +#include #include "char.hpp" #include "char_clif.hpp" diff --git a/src/char/char_logif.hpp b/src/char/char_logif.hpp index dc1a9b6e88..cf05f9c03d 100644 --- a/src/char/char_logif.hpp +++ b/src/char/char_logif.hpp @@ -4,8 +4,8 @@ #ifndef CHAR_LOGIF_HPP #define CHAR_LOGIF_HPP -#include "../common/cbasetypes.hpp" -#include "../common/timer.hpp" +#include +#include struct char_session_data; diff --git a/src/char/char_mapif.cpp b/src/char/char_mapif.cpp index 9cb3918ac5..97f7c50554 100644 --- a/src/char/char_mapif.cpp +++ b/src/char/char_mapif.cpp @@ -8,13 +8,13 @@ #include #include //memcpy -#include "../common/malloc.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/sql.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utilities.hpp" +#include +#include +#include +#include +#include +#include +#include #include "char.hpp" #include "char_logif.hpp" diff --git a/src/char/char_mapif.hpp b/src/char/char_mapif.hpp index 2bfb1a69e9..cfc5f60f5b 100644 --- a/src/char/char_mapif.hpp +++ b/src/char/char_mapif.hpp @@ -4,7 +4,7 @@ #ifndef CHAR_MAPIF_HPP #define CHAR_MAPIF_HPP -#include "../common/cbasetypes.hpp" +#include int chmapif_sendall(unsigned char *buf, unsigned int len); int chmapif_sendallwos(int sfd, unsigned char *buf, unsigned int len); diff --git a/src/char/int_achievement.cpp b/src/char/int_achievement.cpp index 32e0c914fe..d778fd993b 100644 --- a/src/char/int_achievement.cpp +++ b/src/char/int_achievement.cpp @@ -7,13 +7,13 @@ #include #include -#include "../common/db.hpp" -#include "../common/malloc.hpp" -#include "../common/mmo.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/sql.hpp" -#include "../common/strlib.hpp" +#include +#include +#include +#include +#include +#include +#include #include "char.hpp" #include "inter.hpp" diff --git a/src/char/int_auction.cpp b/src/char/int_auction.cpp index 2959b9e52f..ce4197834a 100644 --- a/src/char/int_auction.cpp +++ b/src/char/int_auction.cpp @@ -10,14 +10,14 @@ #include #include -#include "../common/malloc.hpp" -#include "../common/mmo.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/sql.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utilities.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include "char.hpp" #include "char_mapif.hpp" diff --git a/src/char/int_clan.cpp b/src/char/int_clan.cpp index 5ea0e9b510..9427a4fc1c 100644 --- a/src/char/int_clan.cpp +++ b/src/char/int_clan.cpp @@ -10,12 +10,12 @@ #include #include //memset -#include "../common/cbasetypes.hpp" -#include "../common/malloc.hpp" -#include "../common/mmo.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/strlib.hpp" +#include +#include +#include +#include +#include +#include #include "char.hpp" #include "char_mapif.hpp" diff --git a/src/char/int_elemental.cpp b/src/char/int_elemental.cpp index 2eb3454d3e..b2a64432cc 100644 --- a/src/char/int_elemental.cpp +++ b/src/char/int_elemental.cpp @@ -6,11 +6,11 @@ #include #include -#include "../common/mmo.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/sql.hpp" -#include "../common/strlib.hpp" +#include +#include +#include +#include +#include #include "char.hpp" #include "inter.hpp" diff --git a/src/char/int_guild.cpp b/src/char/int_guild.cpp index f328bed205..1f8cbed0fd 100644 --- a/src/char/int_guild.cpp +++ b/src/char/int_guild.cpp @@ -10,13 +10,13 @@ #define __STDC_WANT_LIB_EXT1__ 1 #include -#include "../common/cbasetypes.hpp" -#include "../common/malloc.hpp" -#include "../common/mmo.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" +#include +#include +#include +#include +#include +#include +#include #include "char.hpp" #include "char_mapif.hpp" diff --git a/src/char/int_guild.hpp b/src/char/int_guild.hpp index 96d5c60c44..564ef824cf 100644 --- a/src/char/int_guild.hpp +++ b/src/char/int_guild.hpp @@ -5,8 +5,9 @@ #define INT_GUILD_HPP #include -#include "../common/cbasetypes.hpp" -#include "../common/database.hpp" + +#include +#include enum e_guild_action : uint32 { GS_BASIC = 0x0001, diff --git a/src/char/int_homun.cpp b/src/char/int_homun.cpp index a5a3b87bdb..856503cb90 100644 --- a/src/char/int_homun.cpp +++ b/src/char/int_homun.cpp @@ -6,12 +6,12 @@ #include #include -#include "../common/mmo.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/sql.hpp" -#include "../common/strlib.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include #include "char.hpp" #include "inter.hpp" diff --git a/src/char/int_homun.hpp b/src/char/int_homun.hpp index a2bf777081..8a1e8a4511 100644 --- a/src/char/int_homun.hpp +++ b/src/char/int_homun.hpp @@ -4,7 +4,7 @@ #ifndef INT_HOMUN_HPP #define INT_HOMUN_HPP -#include "../common/cbasetypes.hpp" +#include struct s_homunculus; diff --git a/src/char/int_mail.cpp b/src/char/int_mail.cpp index ad6534b3d2..819e37c51b 100644 --- a/src/char/int_mail.cpp +++ b/src/char/int_mail.cpp @@ -8,12 +8,12 @@ #include #include -#include "../common/mmo.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/sql.hpp" -#include "../common/strlib.hpp" -#include "../common/utilities.hpp" +#include +#include +#include +#include +#include +#include #include "char.hpp" #include "char_mapif.hpp" diff --git a/src/char/int_mail.hpp b/src/char/int_mail.hpp index 928cff5019..89f83d905c 100644 --- a/src/char/int_mail.hpp +++ b/src/char/int_mail.hpp @@ -4,8 +4,8 @@ #ifndef INT_MAIL_HPP #define INT_MAIL_HPP -#include "../common/cbasetypes.hpp" -#include "../common/timer.hpp" +#include +#include struct mail_message; diff --git a/src/char/int_mercenary.cpp b/src/char/int_mercenary.cpp index ae5347bbcd..50c26aaa06 100644 --- a/src/char/int_mercenary.cpp +++ b/src/char/int_mercenary.cpp @@ -6,11 +6,11 @@ #include #include -#include "../common/mmo.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/sql.hpp" -#include "../common/strlib.hpp" +#include +#include +#include +#include +#include #include "char.hpp" #include "inter.hpp" diff --git a/src/char/int_mercenary.hpp b/src/char/int_mercenary.hpp index c7359c48cd..aedb8f58e2 100644 --- a/src/char/int_mercenary.hpp +++ b/src/char/int_mercenary.hpp @@ -4,7 +4,7 @@ #ifndef INT_MERCENARY_HPP #define INT_MERCENARY_HPP -#include "../common/cbasetypes.hpp" +#include int inter_mercenary_sql_init(void); void inter_mercenary_sql_final(void); diff --git a/src/char/int_party.cpp b/src/char/int_party.cpp index edf7d29707..2576a204e2 100644 --- a/src/char/int_party.cpp +++ b/src/char/int_party.cpp @@ -9,14 +9,14 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/malloc.hpp" -#include "../common/mmo.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/sql.hpp" -#include "../common/strlib.hpp" -#include "../common/utilities.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include "char.hpp" #include "char_mapif.hpp" diff --git a/src/char/int_party.hpp b/src/char/int_party.hpp index 02f7512367..e03f4fdd5c 100644 --- a/src/char/int_party.hpp +++ b/src/char/int_party.hpp @@ -4,7 +4,7 @@ #ifndef INT_PARTY_HPP #define INT_PARTY_HPP -#include "../common/cbasetypes.hpp" +#include //Party Flags on what to save/delete. enum e_PartySaveWhatFlag { diff --git a/src/char/int_pet.cpp b/src/char/int_pet.cpp index 3ffe8532e2..8d2b489218 100644 --- a/src/char/int_pet.cpp +++ b/src/char/int_pet.cpp @@ -6,13 +6,13 @@ #include #include -#include "../common/malloc.hpp" -#include "../common/mmo.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/sql.hpp" -#include "../common/strlib.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include +#include #include "char.hpp" #include "inter.hpp" diff --git a/src/char/int_pet.hpp b/src/char/int_pet.hpp index bb38480306..f20acf5cd1 100644 --- a/src/char/int_pet.hpp +++ b/src/char/int_pet.hpp @@ -4,7 +4,7 @@ #ifndef INT_PET_HPP #define INT_PET_HPP -#include "../common/cbasetypes.hpp" +#include struct s_pet; diff --git a/src/char/int_quest.cpp b/src/char/int_quest.cpp index 7f99991a14..1e1c26fcbf 100644 --- a/src/char/int_quest.cpp +++ b/src/char/int_quest.cpp @@ -6,11 +6,11 @@ #include #include -#include "../common/malloc.hpp" -#include "../common/mmo.hpp" -#include "../common/socket.hpp" -#include "../common/sql.hpp" -#include "../common/strlib.hpp" +#include +#include +#include +#include +#include #include "char.hpp" #include "inter.hpp" diff --git a/src/char/int_storage.cpp b/src/char/int_storage.cpp index 1cd57f725f..f93e637a68 100644 --- a/src/char/int_storage.cpp +++ b/src/char/int_storage.cpp @@ -7,12 +7,12 @@ #include #include -#include "../common/malloc.hpp" -#include "../common/mmo.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/sql.hpp" -#include "../common/strlib.hpp" // StringBuf +#include +#include +#include +#include +#include +#include // StringBuf #include "char.hpp" #include "inter.hpp" diff --git a/src/char/int_storage.hpp b/src/char/int_storage.hpp index aa06c5c856..d713e5fe5f 100644 --- a/src/char/int_storage.hpp +++ b/src/char/int_storage.hpp @@ -4,7 +4,7 @@ #ifndef INT_STORAGE_HPP #define INT_STORAGE_HPP -#include "../common/cbasetypes.hpp" +#include struct s_storage; diff --git a/src/char/inter.cpp b/src/char/inter.cpp index d980e22b56..8eb4503373 100644 --- a/src/char/inter.cpp +++ b/src/char/inter.cpp @@ -12,13 +12,13 @@ #include #include // for stat/lstat/fstat - [Dekamaster/Ultimate GM Tool] -#include "../common/cbasetypes.hpp" -#include "../common/database.hpp" -#include "../common/malloc.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" +#include +#include +#include +#include +#include +#include +#include #include "char.hpp" #include "char_logif.hpp" diff --git a/src/char/inter.hpp b/src/char/inter.hpp index 3baf8e8ce1..862a0a320c 100644 --- a/src/char/inter.hpp +++ b/src/char/inter.hpp @@ -8,9 +8,9 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/database.hpp" -#include "../common/sql.hpp" +#include +#include +#include struct s_storage_table; diff --git a/src/char/packets.hpp b/src/char/packets.hpp index 40aef54257..24b7186e38 100644 --- a/src/char/packets.hpp +++ b/src/char/packets.hpp @@ -4,7 +4,7 @@ #ifndef PACKETS_HPP #define PACKETS_HPP -#include "../common/mmo.hpp" +#include #pragma warning( push ) #pragma warning( disable : 4200 ) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index c55c423257..1e7898912c 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -137,7 +137,7 @@ set( COMMON_BASE_DEFINITIONS ${LIBCONFIG_DEFINITIONS} CACHE INTERNAL "common_base definitions" ) set( LIBRARIES ${GLOBAL_LIBRARIES} ${ZLIB_LIBRARIES} yaml-cpp ryml ) -set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${YAML_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS}} ) +set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${RA_INCLUDE_DIRS} ${YAML_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} ) set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS}" ) set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_BASE_SOURCES} ) source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_BASE_SOURCES} ) diff --git a/src/common/Makefile.in b/src/common/Makefile.in index 29425a6234..114fc52882 100644 --- a/src/common/Makefile.in +++ b/src/common/Makefile.in @@ -6,6 +6,8 @@ COMMON_DIR_OBJ = $(COMMON_OBJ:%=obj/%) COMMON_H = $(shell ls ../common/*.hpp) COMMON_AR = obj/common.a +RA_INCLUDE = -I../ + LIBCONFIG_H = $(shell ls ../../3rdparty/libconfig/*.h) LIBCONFIG_AR = ../../3rdparty/libconfig/obj/libconfig.a LIBCONFIG_INCLUDE = -I../../3rdparty/libconfig @@ -68,11 +70,11 @@ common: obj $(COMMON_DIR_OBJ) $(LIBCONFIG_AR) $(YAML_CPP_AR) $(RAPIDYAML_AR) $(C obj/%.o: %.cpp $(COMMON_H) $(LIBCONFIG_H) $(RAPIDYAML_H) @echo " CXX $<" - @@CXX@ @CXXFLAGS@ @CFLAGS_AR@ $(LIBCONFIG_INCLUDE) $(RAPIDYAML_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @@CXX@ @CXXFLAGS@ @CFLAGS_AR@ $(RA_INCLUDE) $(LIBCONFIG_INCLUDE) $(RAPIDYAML_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< obj/mini%.o: %.cpp $(COMMON_H) $(LIBCONFIG_H) $(YAML_CPP_H) @echo " CXX $<" - @@CXX@ @CXXFLAGS@ @CFLAGS_AR@ $(LIBCONFIG_INCLUDE) $(YAML_CPP_INCLUDE) @MYSQL_CFLAGS@ -DMINICORE @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @@CXX@ @CXXFLAGS@ @CFLAGS_AR@ $(RA_INCLUDE) $(LIBCONFIG_INCLUDE) $(YAML_CPP_INCLUDE) @MYSQL_CFLAGS@ -DMINICORE @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing object files $(LIBCONFIG_AR): diff --git a/src/common/common-minicore.vcxproj b/src/common/common-minicore.vcxproj index 14979e11ba..5dfe58782d 100644 --- a/src/common/common-minicore.vcxproj +++ b/src/common/common-minicore.vcxproj @@ -126,8 +126,7 @@ Disabled $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;_DEBUG;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug - $(SolutionDir)3rdparty\zlib\include\;$(SolutionDir)3rdparty\mysql\include\;$(SolutionDir)3rdparty\libconfig\;$(SolutionDir)3rdparty\yaml-cpp\include\ - $(SolutionDir)3rdparty\zlib\include\;$(SolutionDir)3rdparty\libconfig\ + $(SolutionDir)src;$(SolutionDir)3rdparty\zlib\include\;$(SolutionDir)3rdparty\libconfig\ true @@ -143,8 +142,7 @@ Disabled $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;_DEBUG;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug - $(SolutionDir)3rdparty\zlib\include\;$(SolutionDir)3rdparty\mysql\include\;$(SolutionDir)3rdparty\libconfig\;$(SolutionDir)3rdparty\yaml-cpp\include\ - $(SolutionDir)3rdparty\zlib\include\;$(SolutionDir)3rdparty\libconfig\ + $(SolutionDir)src;$(SolutionDir)3rdparty\zlib\include\;$(SolutionDir)3rdparty\libconfig\ Windows @@ -161,8 +159,7 @@ true $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded - $(SolutionDir)3rdparty\zlib\include\;$(SolutionDir)3rdparty\mysql\include\;$(SolutionDir)3rdparty\libconfig\;$(SolutionDir)3rdparty\yaml-cpp\include\ - $(SolutionDir)3rdparty\zlib\include\;$(SolutionDir)3rdparty\libconfig\ + $(SolutionDir)src;$(SolutionDir)3rdparty\zlib\include\;$(SolutionDir)3rdparty\libconfig\ Windows @@ -181,8 +178,7 @@ true $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded - $(SolutionDir)3rdparty\zlib\include\;$(SolutionDir)3rdparty\mysql\include\;$(SolutionDir)3rdparty\libconfig\;$(SolutionDir)3rdparty\yaml-cpp\include\ - $(SolutionDir)3rdparty\zlib\include\;$(SolutionDir)3rdparty\libconfig\ + $(SolutionDir)src;$(SolutionDir)3rdparty\zlib\include\;$(SolutionDir)3rdparty\libconfig\ Windows diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index 5d39a0e204..440933ac60 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -159,7 +159,7 @@ Disabled $(DefineConstants);WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;_DEBUG;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug - $(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) + $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) true @@ -178,7 +178,7 @@ Disabled $(DefineConstants);WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;_DEBUG;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug - $(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) + $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) Windows @@ -198,7 +198,7 @@ true $(DefineConstants);WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded - $(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) + $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) Default @@ -221,7 +221,7 @@ true $(DefineConstants);WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded - $(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) + $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) Windows diff --git a/src/common/core.cpp b/src/common/core.cpp index 0612dd5c17..2c8d7bc3d5 100644 --- a/src/common/core.cpp +++ b/src/common/core.cpp @@ -3,7 +3,7 @@ #include "core.hpp" -#include "../config/core.hpp" +#include #ifndef MINICORE #include "database.hpp" diff --git a/src/common/database.hpp b/src/common/database.hpp index 567e4568cc..0c6000cd71 100644 --- a/src/common/database.hpp +++ b/src/common/database.hpp @@ -10,7 +10,7 @@ #include #include -#include "../config/core.hpp" +#include #include "cbasetypes.hpp" #include "core.hpp" diff --git a/src/common/mapindex.hpp b/src/common/mapindex.hpp index 17a57fd5d3..8d3fc9f63c 100644 --- a/src/common/mapindex.hpp +++ b/src/common/mapindex.hpp @@ -4,7 +4,7 @@ #ifndef MAPINDEX_HPP #define MAPINDEX_HPP -#include "../common/mmo.hpp" +#include "mmo.hpp" #define MAX_MAPINDEX 2000 diff --git a/src/common/md5calc.cpp b/src/common/md5calc.cpp index 95bea78caf..825887e433 100644 --- a/src/common/md5calc.cpp +++ b/src/common/md5calc.cpp @@ -14,7 +14,7 @@ #include #include -#include "../common/random.hpp" +#include "random.hpp" #ifndef UINT_MAX #define UINT_MAX 4294967295U diff --git a/src/common/mmo.hpp b/src/common/mmo.hpp index b01b9c5bb5..c020334392 100644 --- a/src/common/mmo.hpp +++ b/src/common/mmo.hpp @@ -6,7 +6,7 @@ #include -#include "../config/core.hpp" +#include #include "cbasetypes.hpp" #include "db.hpp" diff --git a/src/common/msg_conf.hpp b/src/common/msg_conf.hpp index f200d50fae..ec10f19538 100644 --- a/src/common/msg_conf.hpp +++ b/src/common/msg_conf.hpp @@ -4,7 +4,7 @@ #ifndef MSG_CONF_HPP #define MSG_CONF_HPP -#include "../config/core.hpp" +#include enum lang_types { LANG_RUS = 0x01, diff --git a/src/common/socket.hpp b/src/common/socket.hpp index 3a5eeeef65..502f9eeea0 100644 --- a/src/common/socket.hpp +++ b/src/common/socket.hpp @@ -4,7 +4,7 @@ #ifndef SOCKET_HPP #define SOCKET_HPP -#include "../config/core.hpp" +#include #ifdef WIN32 #include "winapi.hpp" diff --git a/src/common/winapi.hpp b/src/common/winapi.hpp index c4bef4c0c3..648369aea4 100644 --- a/src/common/winapi.hpp +++ b/src/common/winapi.hpp @@ -4,7 +4,7 @@ #ifndef WINAPI_HPP #define WINAPI_HPP -#include "../config/core.hpp" +#include #ifdef DEPRECATED_WINDOWS_SUPPORT #ifndef NTDDI_VERSION diff --git a/src/config/const.hpp b/src/config/const.hpp index a430ff5168..6b9d5948ba 100644 --- a/src/config/const.hpp +++ b/src/config/const.hpp @@ -4,7 +4,7 @@ #ifndef CONFIG_CONST_H #define CONFIG_CONST_H -#include "../common/cbasetypes.hpp" +#include /** * rAthena configuration file (http://rathena.org) diff --git a/src/login/CMakeLists.txt b/src/login/CMakeLists.txt index 87da45c028..469e13e5e5 100644 --- a/src/login/CMakeLists.txt +++ b/src/login/CMakeLists.txt @@ -13,7 +13,7 @@ set(LOGIN_SOURCES ${LOGIN_SOURCES_C} ${LOGIN_SOURCES_CXX}) #message( STATUS "LOGIN_SOURCES="${LOGIN_SOURCES}) set( DEPENDENCIES common ) set( LIBRARIES ${GLOBAL_LIBRARIES} ) -set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} ) +set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} ${RA_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} ) diff --git a/src/login/Makefile.in b/src/login/Makefile.in index 51e0049fb7..469e092684 100644 --- a/src/login/Makefile.in +++ b/src/login/Makefile.in @@ -1,7 +1,9 @@ COMMON_H = $(shell ls ../common/*.hpp) COMMON_AR = ../common/obj/common.a -COMMON_INCLUDE = -I../common +COMMON_INCLUDE = -I../common/ + +RA_INCLUDE = -I../ LIBCONFIG_H = $(shell ls ../../3rdparty/libconfig/*.h) LIBCONFIG_AR = ../../3rdparty/libconfig/obj/libconfig.a @@ -67,7 +69,7 @@ login-server: obj $(LOGIN_DIR_OBJ) $(COMMON_AR) $(RAPIDYAML_AR) obj/%.o: %.cpp $(LOGIN_H) $(COMMON_H) $(LIBCONFIG_H) $(RAPIDYAML_H) @echo " CXX $<" - @@CXX@ @CXXFLAGS@ $(COMMON_INCLUDE) $(LIBCONFIG_INCLUDE) $(RAPIDYAML_INCLUDE) -DWITH_SQL @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @@CXX@ @CXXFLAGS@ $(COMMON_INCLUDE) $(RA_INCLUDE) $(LIBCONFIG_INCLUDE) $(RAPIDYAML_INCLUDE) -DWITH_SQL @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing object files $(COMMON_AR): diff --git a/src/login/account.cpp b/src/login/account.cpp index 522c07bb07..71b2b84530 100644 --- a/src/login/account.cpp +++ b/src/login/account.cpp @@ -7,12 +7,12 @@ #include #include -#include "../common/malloc.hpp" -#include "../common/mmo.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/sql.hpp" -#include "../common/strlib.hpp" +#include +#include +#include +#include +#include +#include #include "login.hpp" // login_config diff --git a/src/login/account.hpp b/src/login/account.hpp index 82a6317ece..99bfd50f7e 100644 --- a/src/login/account.hpp +++ b/src/login/account.hpp @@ -4,9 +4,9 @@ #ifndef ACCOUNT_HPP #define ACCOUNT_HPP -#include "../common/cbasetypes.hpp" -#include "../common/mmo.hpp" // ACCOUNT_REG2_NUM -#include "../config/core.hpp" +#include +#include // ACCOUNT_REG2_NUM +#include #ifndef WEB_AUTH_TOKEN_LENGTH #define WEB_AUTH_TOKEN_LENGTH 16+1 diff --git a/src/login/ipban.cpp b/src/login/ipban.cpp index e7790923f8..2edf2d8705 100644 --- a/src/login/ipban.cpp +++ b/src/login/ipban.cpp @@ -6,11 +6,11 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/showmsg.hpp" -#include "../common/sql.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" +#include +#include +#include +#include +#include #include "login.hpp" #include "loginlog.hpp" diff --git a/src/login/ipban.hpp b/src/login/ipban.hpp index 3925e2a7ad..27bc930954 100644 --- a/src/login/ipban.hpp +++ b/src/login/ipban.hpp @@ -4,7 +4,7 @@ #ifndef IPBAN_HPP #define IPBAN_HPP -#include "../common/cbasetypes.hpp" +#include /** * Check if ip is in the active bans list. diff --git a/src/login/login-server.vcxproj b/src/login/login-server.vcxproj index 1c726a04b9..58e5450f9b 100644 --- a/src/login/login-server.vcxproj +++ b/src/login/login-server.vcxproj @@ -110,6 +110,7 @@ FD_SETSIZE=4096;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;WIN32;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug true + $(SolutionDir)src;%(AdditionalIncludeDirectories) Console @@ -125,6 +126,7 @@ Disabled FD_SETSIZE=4096;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;WIN32;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug + $(SolutionDir)src;%(AdditionalIncludeDirectories) Console @@ -142,6 +144,7 @@ true FD_SETSIZE=4096;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded + $(SolutionDir)src;%(AdditionalIncludeDirectories) Console @@ -161,6 +164,7 @@ true FD_SETSIZE=4096;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded + $(SolutionDir)src;%(AdditionalIncludeDirectories) Console diff --git a/src/login/login.cpp b/src/login/login.cpp index b35fa5e1b6..a5b5e28eaa 100644 --- a/src/login/login.cpp +++ b/src/login/login.cpp @@ -9,20 +9,20 @@ #include #include -#include "../common/cli.hpp" -#include "../common/core.hpp" -#include "../common/malloc.hpp" -#include "../common/md5calc.hpp" -#include "../common/mmo.hpp" -#include "../common/msg_conf.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" //ip2str -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utilities.hpp" -#include "../common/utils.hpp" -#include "../config/core.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include //ip2str +#include +#include +#include +#include +#include #include "account.hpp" #include "ipban.hpp" diff --git a/src/login/login.hpp b/src/login/login.hpp index 43db92783e..e2fe9170ee 100644 --- a/src/login/login.hpp +++ b/src/login/login.hpp @@ -6,11 +6,11 @@ #include -#include "../common/cbasetypes.hpp" -#include "../common/core.hpp" -#include "../common/mmo.hpp" // NAME_LENGTH,SEX_* -#include "../common/timer.hpp" -#include "../config/core.hpp" +#include +#include +#include // NAME_LENGTH,SEX_* +#include +#include #include "account.hpp" diff --git a/src/login/loginchrif.cpp b/src/login/loginchrif.cpp index bdc681df3a..03f3217ee6 100644 --- a/src/login/loginchrif.cpp +++ b/src/login/loginchrif.cpp @@ -6,10 +6,10 @@ #include #include -#include "../common/showmsg.hpp" //show notice -#include "../common/socket.hpp" //wfifo session -#include "../common/strlib.hpp" //safeprint -#include "../common/timer.hpp" //difftick +#include //show notice +#include //wfifo session +#include //safeprint +#include //difftick #include "account.hpp" #include "login.hpp" diff --git a/src/login/loginchrif.hpp b/src/login/loginchrif.hpp index bb8fe6f45d..5bc85488fe 100644 --- a/src/login/loginchrif.hpp +++ b/src/login/loginchrif.hpp @@ -4,7 +4,7 @@ #ifndef LOGINCHRIF_HPP #define LOGINCHRIF_HPP -#include "../common/cbasetypes.hpp" +#include /** * Entry point from char-server to log-server. diff --git a/src/login/loginclif.cpp b/src/login/loginclif.cpp index d10ee90f0d..9e20a65984 100644 --- a/src/login/loginclif.cpp +++ b/src/login/loginclif.cpp @@ -6,14 +6,14 @@ #include #include -#include "../common/malloc.hpp" -#include "../common/md5calc.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" //show notice -#include "../common/socket.hpp" //wfifo session -#include "../common/strlib.hpp" //safeprint -#include "../common/timer.hpp" //difftick -#include "../common/utils.hpp" +#include +#include +#include +#include //show notice +#include //wfifo session +#include //safeprint +#include //difftick +#include #include "account.hpp" #include "ipban.hpp" //ipban_check diff --git a/src/login/logincnslif.cpp b/src/login/logincnslif.cpp index 2373242a4c..8fbf444486 100644 --- a/src/login/logincnslif.cpp +++ b/src/login/logincnslif.cpp @@ -6,12 +6,12 @@ #include #include -#include "../common/cli.hpp" -#include "../common/md5calc.hpp" -#include "../common/mmo.hpp" //cbasetype + NAME_LENGTH -#include "../common/showmsg.hpp" //show notice -#include "../common/strlib.hpp" -#include "../common/timer.hpp" +#include +#include +#include //cbasetype + NAME_LENGTH +#include //show notice +#include +#include #include "login.hpp" diff --git a/src/login/loginlog.cpp b/src/login/loginlog.cpp index bd9def3743..7a45d21c75 100644 --- a/src/login/loginlog.cpp +++ b/src/login/loginlog.cpp @@ -6,12 +6,12 @@ #include // exit #include -#include "../common/cbasetypes.hpp" -#include "../common/mmo.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/sql.hpp" -#include "../common/strlib.hpp" +#include +#include +#include +#include +#include +#include // global sql settings (in ipban_sql.cpp) static char global_db_hostname[64] = "127.0.0.1"; // Doubled to reflect the change on commit #0f2dd7f diff --git a/src/login/loginlog.hpp b/src/login/loginlog.hpp index 6fd39fc0fa..5258bf4e41 100644 --- a/src/login/loginlog.hpp +++ b/src/login/loginlog.hpp @@ -6,7 +6,7 @@ #include -#include "../common/cbasetypes.hpp" +#include /** * Get the number of failed login attempts by the ip in the last minutes. diff --git a/src/map/CMakeLists.txt b/src/map/CMakeLists.txt index e7e1826b4f..ba3749a320 100644 --- a/src/map/CMakeLists.txt +++ b/src/map/CMakeLists.txt @@ -13,7 +13,7 @@ file(GLOB MAP_HEADERS ${MAP_SOURCE_DIR}/*.hpp) file(GLOB MAP_SOURCES ${MAP_SOURCE_DIR}/*.cpp) set( DEPENDENCIES common ryml) set( LIBRARIES ${GLOBAL_LIBRARIES}) -set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} ) +set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} ${RA_INCLUDE_DIRS} ) set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS}" ) if( WITH_PCRE ) message( STATUS "Enabled PCRE code" ) diff --git a/src/map/Makefile.in b/src/map/Makefile.in index 43ff660caf..66952241c5 100644 --- a/src/map/Makefile.in +++ b/src/map/Makefile.in @@ -3,6 +3,8 @@ COMMON_H = $(shell ls ../common/*.hpp) COMMON_AR = ../common/obj/common.a COMMON_INCLUDE = -I../common/ +RA_INCLUDE = -I../ + LIBCONFIG_H = $(shell ls ../../3rdparty/libconfig/*.h) LIBCONFIG_AR = ../../3rdparty/libconfig/obj/libconfig.a LIBCONFIG_INCLUDE = -I../../3rdparty/libconfig @@ -96,32 +98,32 @@ map-server-generator: obj-gen $(MAP_GEN_DIR_OBJ) $(COMMON_AR) $(LIBCONFIG_AR) $( #cause this one failling otherwise obj/npc.o: npc.cpp $(MAP_H) $(COMMON_H) $(LIBCONFIG_H) $(RAPIDYAML_H) @echo " CXX $< (custom rule)" - @@CXX@ @CXXFLAG_CLEARS@ $(COMMON_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) $(RAPIDYAML_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @@CXX@ @CXXFLAG_CLEARS@ $(COMMON_INCLUDE) $(RA_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) $(RAPIDYAML_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # these have extra dependencies obj/atcommand.o: atcommand.cpp $(MAP_H) $(COMMON_H) $(LIBCONFIG_H) $(RAPIDYAML_H) ../custom/atcommand_def.inc ../custom/atcommand.inc @echo " CXX $<" - @@CXX@ @CXXFLAGS@ $(COMMON_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) $(RAPIDYAML_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @@CXX@ @CXXFLAGS@ $(COMMON_INCLUDE) $(RA_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) $(RAPIDYAML_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< obj/script.o: script.cpp $(MAP_H) $(COMMON_H) $(LIBCONFIG_H) $(RAPIDYAML_H) ../custom/script_def.inc ../custom/script.inc @echo " CXX $<" - @@CXX@ @CXXFLAGS@ $(COMMON_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) $(RAPIDYAML_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @@CXX@ @CXXFLAGS@ $(COMMON_INCLUDE) $(RA_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) $(RAPIDYAML_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< obj/battle.o: battle.cpp $(MAP_H) $(COMMON_H) $(LIBCONFIG_H) $(RAPIDYAML_H) ../custom/battle_config_init.inc @echo " CXX $<" - @@CXX@ @CXXFLAGS@ $(COMMON_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) $(RAPIDYAML_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @@CXX@ @CXXFLAGS@ $(COMMON_INCLUDE) $(RA_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) $(RAPIDYAML_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< obj/%.o: %.cpp $(MAP_H) $(COMMON_H) $(LIBCONFIG_H) $(RAPIDYAML_H) @echo " CXX $<" - @@CXX@ @CXXFLAGS@ $(COMMON_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) $(RAPIDYAML_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @@CXX@ @CXXFLAGS@ $(COMMON_INCLUDE) $(RA_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) $(RAPIDYAML_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< obj-gen/npc.o: npc.cpp $(MAP_H) $(COMMON_H) $(LIBCONFIG_H) $(RAPIDYAML_H) @echo " CXX $< (custom rule)" - @@CXX@ @CXXFLAG_CLEARS@ $(TOOLS_FLAGS) $(COMMON_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) $(RAPIDYAML_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @@CXX@ @CXXFLAG_CLEARS@ $(TOOLS_FLAGS) $(COMMON_INCLUDE) $(RA_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) $(RAPIDYAML_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< obj-gen/%.o: %.cpp $(MAP_H) $(COMMON_H) $(LIBCONFIG_H) $(RAPIDYAML_H) $(NLOHMANN_H) @echo " CXX $<" - @@CXX@ @CXXFLAGS@ $(TOOLS_FLAGS) $(COMMON_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) $(RAPIDYAML_INCLUDE) $(NLOHMANN_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @@CXX@ @CXXFLAGS@ $(TOOLS_FLAGS) $(COMMON_INCLUDE) $(RA_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) $(RAPIDYAML_INCLUDE) $(NLOHMANN_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing object files $(COMMON_AR): diff --git a/src/map/achievement.cpp b/src/map/achievement.cpp index 67a0d89330..7412e94121 100644 --- a/src/map/achievement.cpp +++ b/src/map/achievement.cpp @@ -9,14 +9,14 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/database.hpp" -#include "../common/malloc.hpp" -#include "../common/nullpo.hpp" -#include "../common/showmsg.hpp" -#include "../common/strlib.hpp" -#include "../common/utilities.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include "battle.hpp" #include "chrif.hpp" diff --git a/src/map/achievement.hpp b/src/map/achievement.hpp index ed138fec30..59eeb5c7ae 100644 --- a/src/map/achievement.hpp +++ b/src/map/achievement.hpp @@ -11,9 +11,9 @@ #include #include -#include "../common/mmo.hpp" -#include "../common/database.hpp" -#include "../common/db.hpp" +#include +#include +#include class map_session_data; struct block_list; diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp index 69ec2f1f95..8298a33621 100644 --- a/src/map/atcommand.cpp +++ b/src/map/atcommand.cpp @@ -9,19 +9,19 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/database.hpp" -#include "../common/cli.hpp" -#include "../common/malloc.hpp" -#include "../common/mmo.hpp" -#include "../common/nullpo.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utilities.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "achievement.hpp" #include "battle.hpp" diff --git a/src/map/atcommand.hpp b/src/map/atcommand.hpp index 1879997c4d..a0ddf37b57 100644 --- a/src/map/atcommand.hpp +++ b/src/map/atcommand.hpp @@ -4,8 +4,8 @@ #ifndef ATCOMMAND_HPP #define ATCOMMAND_HPP -#include "../common/cbasetypes.hpp" -#include "../common/mmo.hpp" +#include +#include class map_session_data; diff --git a/src/map/battle.cpp b/src/map/battle.cpp index ce13b0636d..412f8d4298 100644 --- a/src/map/battle.cpp +++ b/src/map/battle.cpp @@ -6,16 +6,16 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/ers.hpp" -#include "../common/malloc.hpp" -#include "../common/nullpo.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "atcommand.hpp" #include "battleground.hpp" diff --git a/src/map/battle.hpp b/src/map/battle.hpp index 3edcde31b2..2412573d99 100644 --- a/src/map/battle.hpp +++ b/src/map/battle.hpp @@ -6,9 +6,9 @@ #include -#include "../common/cbasetypes.hpp" -#include "../common/mmo.hpp" -#include "../config/core.hpp" +#include +#include +#include #include "map.hpp" //ELE_MAX #include "skill.hpp" diff --git a/src/map/battleground.cpp b/src/map/battleground.cpp index 5607b00de6..e17336718b 100644 --- a/src/map/battleground.cpp +++ b/src/map/battleground.cpp @@ -5,14 +5,14 @@ #include -#include "../common/cbasetypes.hpp" -#include "../common/malloc.hpp" -#include "../common/nullpo.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utilities.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include "battle.hpp" #include "clif.hpp" diff --git a/src/map/battleground.hpp b/src/map/battleground.hpp index 84d62f55bc..ccf87a3a92 100644 --- a/src/map/battleground.hpp +++ b/src/map/battleground.hpp @@ -8,9 +8,9 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/database.hpp" -#include "../common/mmo.hpp" // struct party +#include +#include +#include // struct party #define MAX_BG_MEMBERS 30 diff --git a/src/map/buyingstore.cpp b/src/map/buyingstore.cpp index 54c31c0950..a8bf0e4e5e 100644 --- a/src/map/buyingstore.cpp +++ b/src/map/buyingstore.cpp @@ -5,13 +5,13 @@ #include // atoi -#include "../common/db.hpp" // ARR_FIND -#include "../common/malloc.hpp" // aMalloc, aFree -#include "../common/nullpo.hpp" -#include "../common/showmsg.hpp" // ShowWarning -#include "../common/socket.hpp" // RBUF* -#include "../common/strlib.hpp" // safestrncpy -#include "../common/timer.hpp" // gettick +#include // ARR_FIND +#include // aMalloc, aFree +#include +#include // ShowWarning +#include // RBUF* +#include // safestrncpy +#include // gettick #include "atcommand.hpp" // msg_txt #include "battle.hpp" // battle_config.* diff --git a/src/map/buyingstore.hpp b/src/map/buyingstore.hpp index 2bb5b28360..12ba2a7b89 100644 --- a/src/map/buyingstore.hpp +++ b/src/map/buyingstore.hpp @@ -4,7 +4,7 @@ #ifndef BUYINGSTORE_HPP #define BUYINGSTORE_HPP -#include "../common/cbasetypes.hpp" +#include #include "map.hpp" //MESSAGE_SIZE diff --git a/src/map/cashshop.cpp b/src/map/cashshop.cpp index caa0a9781f..47aedbcfc2 100644 --- a/src/map/cashshop.cpp +++ b/src/map/cashshop.cpp @@ -6,9 +6,9 @@ #include // atoi #include // memset -#include "../common/cbasetypes.hpp" // uint16, uint32 -#include "../common/malloc.hpp" // CREATE, RECREATE, aFree -#include "../common/showmsg.hpp" // ShowWarning, ShowStatus +#include // uint16, uint32 +#include // CREATE, RECREATE, aFree +#include // ShowWarning, ShowStatus #include "clif.hpp" #include "log.hpp" diff --git a/src/map/cashshop.hpp b/src/map/cashshop.hpp index ca3eac2ef6..4cf2e514c1 100644 --- a/src/map/cashshop.hpp +++ b/src/map/cashshop.hpp @@ -7,12 +7,12 @@ #include // std::shared_ptr #include // std::vector -#include "../config/core.hpp" +#include -#include "../common/cbasetypes.hpp" // uint16, uint32 -#include "../common/database.hpp" // TypesafeYamlDatabase -#include "../common/mmo.hpp" // t_itemid -#include "../common/timer.hpp" // ShowWarning, ShowStatus +#include // uint16, uint32 +#include // TypesafeYamlDatabase +#include // t_itemid +#include // ShowWarning, ShowStatus class map_session_data; diff --git a/src/map/channel.cpp b/src/map/channel.cpp index 696e598ffe..dae1d4f552 100644 --- a/src/map/channel.cpp +++ b/src/map/channel.cpp @@ -5,14 +5,14 @@ #include -#include "../common/cbasetypes.hpp" -#include "../common/conf.hpp" //libconfig -#include "../common/malloc.hpp" -#include "../common/nullpo.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" //set_eof -#include "../common/strlib.hpp" //safestrncpy -#include "../common/timer.hpp" // DIFF_TICK +#include +#include //libconfig +#include +#include +#include +#include //set_eof +#include //safestrncpy +#include // DIFF_TICK #include "battle.hpp" #include "clif.hpp" //clif_chsys_msg diff --git a/src/map/channel.hpp b/src/map/channel.hpp index 20d80d65b3..78ff16a57f 100644 --- a/src/map/channel.hpp +++ b/src/map/channel.hpp @@ -4,8 +4,8 @@ #ifndef CHANNEL_HPP #define CHANNEL_HPP -#include "../common/cbasetypes.hpp" -#include "../common/mmo.hpp" +#include +#include //namespace rA { diff --git a/src/map/chat.cpp b/src/map/chat.cpp index c429cb34d3..7874d1d4e1 100644 --- a/src/map/chat.cpp +++ b/src/map/chat.cpp @@ -5,12 +5,12 @@ #include -#include "../common/cbasetypes.hpp" -#include "../common/malloc.hpp" -#include "../common/mmo.hpp" -#include "../common/nullpo.hpp" -#include "../common/showmsg.hpp" -#include "../common/strlib.hpp" +#include +#include +#include +#include +#include +#include #include "achievement.hpp" #include "atcommand.hpp" // msg_txt() diff --git a/src/map/chrif.cpp b/src/map/chrif.cpp index 7304c750f3..87b8708484 100644 --- a/src/map/chrif.cpp +++ b/src/map/chrif.cpp @@ -6,14 +6,14 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/ers.hpp" -#include "../common/malloc.hpp" -#include "../common/nullpo.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include "battle.hpp" #include "clan.hpp" diff --git a/src/map/chrif.hpp b/src/map/chrif.hpp index da44d9332f..1fb8ce3f4e 100644 --- a/src/map/chrif.hpp +++ b/src/map/chrif.hpp @@ -6,10 +6,10 @@ #include -#include "../common/cbasetypes.hpp" -#include "../common/mmo.hpp" // NAME_LENGTH -#include "../common/timer.hpp" // t_tick -#include "../common/socket.hpp" // enum chrif_req_op +#include +#include // NAME_LENGTH +#include // t_tick +#include // enum chrif_req_op //fwd declaration class map_session_data; diff --git a/src/map/clan.cpp b/src/map/clan.cpp index 5b26034028..02add781ca 100644 --- a/src/map/clan.cpp +++ b/src/map/clan.cpp @@ -5,11 +5,11 @@ #include //memset -#include "../common/cbasetypes.hpp" -#include "../common/malloc.hpp" -#include "../common/mmo.hpp" -#include "../common/nullpo.hpp" -#include "../common/showmsg.hpp" +#include +#include +#include +#include +#include #include "clif.hpp" #include "instance.hpp" diff --git a/src/map/clan.hpp b/src/map/clan.hpp index 9ba03f8027..a6ab49bc80 100644 --- a/src/map/clan.hpp +++ b/src/map/clan.hpp @@ -4,7 +4,7 @@ #ifndef CLAN_HPP #define CLAN_HPP -#include "../common/mmo.hpp" +#include struct clan; class map_session_data; diff --git a/src/map/clif.cpp b/src/map/clif.cpp index dc0038e1bb..9444efc00d 100644 --- a/src/map/clif.cpp +++ b/src/map/clif.cpp @@ -10,19 +10,19 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/conf.hpp" -#include "../common/ers.hpp" -#include "../common/grfio.hpp" -#include "../common/malloc.hpp" -#include "../common/nullpo.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utilities.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "achievement.hpp" #include "atcommand.hpp" diff --git a/src/map/clif.hpp b/src/map/clif.hpp index 95de965402..30a4c99c88 100644 --- a/src/map/clif.hpp +++ b/src/map/clif.hpp @@ -8,10 +8,10 @@ #include -#include "../common/cbasetypes.hpp" -#include "../common/db.hpp" //dbmap -#include "../common/mmo.hpp" -#include "../common/timer.hpp" // t_tick +#include +#include //dbmap +#include +#include // t_tick #include "packets.hpp" #include "script.hpp" diff --git a/src/map/date.hpp b/src/map/date.hpp index d627f9225a..42b69a5798 100644 --- a/src/map/date.hpp +++ b/src/map/date.hpp @@ -4,7 +4,7 @@ #ifndef DATE_HPP #define DATE_HPP -#include "../common/cbasetypes.hpp" +#include enum e_month{ JANUARY = 1, diff --git a/src/map/duel.cpp b/src/map/duel.cpp index cd9f982380..23c9fb5fe5 100644 --- a/src/map/duel.cpp +++ b/src/map/duel.cpp @@ -7,8 +7,8 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/timer.hpp" +#include +#include #include "atcommand.hpp" // msg_txt #include "battle.hpp" diff --git a/src/map/duel.hpp b/src/map/duel.hpp index b71ec8a454..50ed716891 100644 --- a/src/map/duel.hpp +++ b/src/map/duel.hpp @@ -4,7 +4,8 @@ #ifndef DUEL_HPP #define DUEL_HPP -#include "../common/cbasetypes.hpp" +#include + class map_session_data; struct duel { int members_count; diff --git a/src/map/elemental.cpp b/src/map/elemental.cpp index 2639439e35..962fa4424a 100644 --- a/src/map/elemental.cpp +++ b/src/map/elemental.cpp @@ -8,15 +8,15 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/malloc.hpp" -#include "../common/mmo.hpp" -#include "../common/nullpo.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "battle.hpp" #include "clif.hpp" diff --git a/src/map/elemental.hpp b/src/map/elemental.hpp index fec0ceff0c..777865e5ab 100644 --- a/src/map/elemental.hpp +++ b/src/map/elemental.hpp @@ -4,9 +4,9 @@ #ifndef ELEMENTAL_HPP #define ELEMENTAL_HPP -#include "../common/database.hpp" -#include "../common/mmo.hpp" -#include "../common/timer.hpp" +#include +#include +#include #include "status.hpp" // struct status_data, struct status_change #include "unit.hpp" // struct unit_data diff --git a/src/map/guild.cpp b/src/map/guild.cpp index 0c7ef9a535..cbc45cd64d 100644 --- a/src/map/guild.cpp +++ b/src/map/guild.cpp @@ -5,17 +5,17 @@ #include -#include "../common/cbasetypes.hpp" -#include "../common/database.hpp" -#include "../common/ers.hpp" -#include "../common/malloc.hpp" -#include "../common/mapindex.hpp" -#include "../common/nullpo.hpp" -#include "../common/showmsg.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utilities.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "battle.hpp" #include "channel.hpp" diff --git a/src/map/guild.hpp b/src/map/guild.hpp index 34739a22ec..a674d28950 100644 --- a/src/map/guild.hpp +++ b/src/map/guild.hpp @@ -4,9 +4,9 @@ #ifndef GUILD_HPP #define GUILD_HPP -#include "../common/cbasetypes.hpp" -#include "../common/database.hpp" -#include "../common/mmo.hpp" +#include +#include +#include #include "map.hpp" // NAME_LENGTH diff --git a/src/map/homunculus.cpp b/src/map/homunculus.cpp index 05be16f4f0..7043af1b7e 100644 --- a/src/map/homunculus.cpp +++ b/src/map/homunculus.cpp @@ -5,15 +5,15 @@ #include -#include "../common/cbasetypes.hpp" -#include "../common/malloc.hpp" -#include "../common/mmo.hpp" -#include "../common/nullpo.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "battle.hpp" #include "clif.hpp" diff --git a/src/map/homunculus.hpp b/src/map/homunculus.hpp index 4d7a0753fd..d915641870 100644 --- a/src/map/homunculus.hpp +++ b/src/map/homunculus.hpp @@ -5,8 +5,8 @@ #define HOMUNCULUS_HPP #include -#include "../common/cbasetypes.hpp" -#include "../common/database.hpp" +#include +#include #include "status.hpp" // struct status_data, struct status_change #include "unit.hpp" // struct unit_data diff --git a/src/map/instance.cpp b/src/map/instance.cpp index bb2314af56..9151594e4b 100644 --- a/src/map/instance.cpp +++ b/src/map/instance.cpp @@ -6,16 +6,16 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/db.hpp" -#include "../common/ers.hpp" // ers_destroy -#include "../common/malloc.hpp" -#include "../common/nullpo.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utilities.hpp" +#include +#include +#include // ers_destroy +#include +#include +#include +#include +#include +#include +#include #include "clan.hpp" #include "clif.hpp" diff --git a/src/map/instance.hpp b/src/map/instance.hpp index 653a600202..9fd0ab35d6 100644 --- a/src/map/instance.hpp +++ b/src/map/instance.hpp @@ -10,9 +10,9 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/database.hpp" -#include "../common/mmo.hpp" +#include +#include +#include #include "script.hpp" diff --git a/src/map/intif.cpp b/src/map/intif.cpp index e51feb7dda..eb755cd7c6 100644 --- a/src/map/intif.cpp +++ b/src/map/intif.cpp @@ -5,13 +5,13 @@ #include -#include "../common/malloc.hpp" -#include "../common/mmo.hpp" -#include "../common/nullpo.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" +#include +#include +#include +#include +#include +#include +#include #include "achievement.hpp" #include "battle.hpp" diff --git a/src/map/intif.hpp b/src/map/intif.hpp index 1a6bc5ee4f..8686bc064b 100644 --- a/src/map/intif.hpp +++ b/src/map/intif.hpp @@ -6,8 +6,8 @@ #include -#include "../common/cbasetypes.hpp" -#include "../common/mmo.hpp" +#include +#include struct party_member; struct guild_member; diff --git a/src/map/itemdb.cpp b/src/map/itemdb.cpp index 38c814b58e..1c941b79d1 100644 --- a/src/map/itemdb.cpp +++ b/src/map/itemdb.cpp @@ -11,12 +11,12 @@ #include #include -#include "../common/nullpo.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/strlib.hpp" -#include "../common/utils.hpp" -#include "../common/utilities.hpp" +#include +#include +#include +#include +#include +#include #include "battle.hpp" // struct battle_config #include "cashshop.hpp" diff --git a/src/map/itemdb.hpp b/src/map/itemdb.hpp index 5dc4916630..8aa638bfa4 100644 --- a/src/map/itemdb.hpp +++ b/src/map/itemdb.hpp @@ -8,10 +8,10 @@ #include #include -#include "../common/database.hpp" -#include "../common/db.hpp" -#include "../common/malloc.hpp" -#include "../common/mmo.hpp" // ITEM_NAME_LENGTH +#include +#include +#include +#include // ITEM_NAME_LENGTH #include "script.hpp" #include "status.hpp" diff --git a/src/map/log.cpp b/src/map/log.cpp index 70650d2c68..2b9d6321ab 100644 --- a/src/map/log.cpp +++ b/src/map/log.cpp @@ -5,11 +5,11 @@ #include -#include "../common/cbasetypes.hpp" -#include "../common/nullpo.hpp" -#include "../common/showmsg.hpp" -#include "../common/sql.hpp" // SQL_INNODB -#include "../common/strlib.hpp" +#include +#include +#include +#include // SQL_INNODB +#include #include "battle.hpp" #include "homunculus.hpp" diff --git a/src/map/log.hpp b/src/map/log.hpp index b4a5f079f9..7ba248ddff 100644 --- a/src/map/log.hpp +++ b/src/map/log.hpp @@ -4,8 +4,8 @@ #ifndef LOG_HPP #define LOG_HPP -#include "../common/cbasetypes.hpp" -#include "../common/mmo.hpp" +#include +#include struct block_list; class map_session_data; diff --git a/src/map/mail.cpp b/src/map/mail.cpp index 7e6991cc0d..fd9324a1c4 100644 --- a/src/map/mail.cpp +++ b/src/map/mail.cpp @@ -3,10 +3,10 @@ #include "mail.hpp" -#include "../common/nullpo.hpp" -#include "../common/showmsg.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" +#include +#include +#include +#include #include "atcommand.hpp" #include "battle.hpp" diff --git a/src/map/mail.hpp b/src/map/mail.hpp index 90262396a8..692b9a90cb 100644 --- a/src/map/mail.hpp +++ b/src/map/mail.hpp @@ -4,7 +4,7 @@ #ifndef MAIL_HPP #define MAIL_HPP -#include "../common/mmo.hpp" +#include enum mail_attach_result { MAIL_ATTACH_SUCCESS = 0, diff --git a/src/map/map-server-generator.vcxproj b/src/map/map-server-generator.vcxproj index 68fe0aa66c..ee81d3251e 100644 --- a/src/map/map-server-generator.vcxproj +++ b/src/map/map-server-generator.vcxproj @@ -111,7 +111,7 @@ 4018;4200 true MultiThreadedDebug - $(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;%(AdditionalIncludeDirectories) + $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;$(SolutionDir)\3rdparty\pcre\include;%(AdditionalIncludeDirectories) true @@ -129,7 +129,7 @@ $(DefineConstants);MAP_GENERATOR;WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) 4018 MultiThreadedDebug - $(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;%(AdditionalIncludeDirectories) + $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;$(SolutionDir)\3rdparty\pcre\include;%(AdditionalIncludeDirectories) Console @@ -148,7 +148,7 @@ $(DefineConstants);MAP_GENERATOR;WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded 4018 - $(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;%(AdditionalIncludeDirectories) + $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;$(SolutionDir)\3rdparty\pcre\include;%(AdditionalIncludeDirectories) Console @@ -170,7 +170,7 @@ $(DefineConstants);MAP_GENERATOR;WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded 4018 - $(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;%(AdditionalIncludeDirectories) + $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;$(SolutionDir)\3rdparty\pcre\include;%(AdditionalIncludeDirectories) Console diff --git a/src/map/map-server.vcxproj b/src/map/map-server.vcxproj index 804b273974..9a1809c7b7 100644 --- a/src/map/map-server.vcxproj +++ b/src/map/map-server.vcxproj @@ -111,7 +111,7 @@ 4018;4200 true MultiThreadedDebug - $(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) + $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\pcre\include;%(AdditionalIncludeDirectories) true @@ -129,7 +129,7 @@ $(DefineConstants);WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) 4018 MultiThreadedDebug - $(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) + $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\pcre\include;%(AdditionalIncludeDirectories) Console @@ -148,7 +148,7 @@ $(DefineConstants);WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded 4018 - $(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) + $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\pcre\include;%(AdditionalIncludeDirectories) Console @@ -170,7 +170,7 @@ $(DefineConstants);WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded 4018 - $(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) + $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\pcre\include;%(AdditionalIncludeDirectories) Console diff --git a/src/map/map.cpp b/src/map/map.cpp index fe975f9a17..bc1c03e0c6 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -6,22 +6,22 @@ #include #include -#include "../config/core.hpp" +#include -#include "../common/cbasetypes.hpp" -#include "../common/cli.hpp" -#include "../common/core.hpp" -#include "../common/ers.hpp" -#include "../common/grfio.hpp" -#include "../common/malloc.hpp" -#include "../common/nullpo.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" // WFIFO*() -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utilities.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // WFIFO*() +#include +#include +#include +#include #include "achievement.hpp" #include "atcommand.hpp" diff --git a/src/map/map.hpp b/src/map/map.hpp index 5408807293..fbd6856999 100644 --- a/src/map/map.hpp +++ b/src/map/map.hpp @@ -10,14 +10,14 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/core.hpp" // CORE_ST_LAST -#include "../common/db.hpp" -#include "../common/mapindex.hpp" -#include "../common/mmo.hpp" -#include "../common/msg_conf.hpp" -#include "../common/timer.hpp" -#include "../config/core.hpp" +#include +#include // CORE_ST_LAST +#include +#include +#include +#include +#include +#include #include "navi.hpp" #include "script.hpp" @@ -1241,7 +1241,7 @@ typedef struct s_elemental_data TBL_ELEM; #define BL_CAST(type_, bl) \ ( ((bl) == (struct block_list*)NULL || (bl)->type != (type_)) ? (T ## type_ *)NULL : (T ## type_ *)(bl) ) -#include "../common/sql.hpp" +#include extern int db_use_sqldbs; diff --git a/src/map/mapreg.cpp b/src/map/mapreg.cpp index bea0c517e1..e20464d190 100644 --- a/src/map/mapreg.cpp +++ b/src/map/mapreg.cpp @@ -5,14 +5,14 @@ #include -#include "../common/cbasetypes.hpp" -#include "../common/db.hpp" -#include "../common/ers.hpp" -#include "../common/malloc.hpp" -#include "../common/showmsg.hpp" -#include "../common/sql.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include "map.hpp" // mmysql_handle #include "script.hpp" diff --git a/src/map/mapreg.hpp b/src/map/mapreg.hpp index 35f10528c8..de7eb42641 100644 --- a/src/map/mapreg.hpp +++ b/src/map/mapreg.hpp @@ -4,8 +4,8 @@ #ifndef MAPREG_HPP #define MAPREG_HPP -#include "../common/cbasetypes.hpp" -#include "../common/db.hpp" +#include +#include struct mapreg_save { int64 uid; ///< Unique ID diff --git a/src/map/mercenary.cpp b/src/map/mercenary.cpp index 9f0939e82c..1e6def5fce 100644 --- a/src/map/mercenary.cpp +++ b/src/map/mercenary.cpp @@ -7,16 +7,16 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/malloc.hpp" -#include "../common/mmo.hpp" -#include "../common/nullpo.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utilities.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "clif.hpp" #include "intif.hpp" diff --git a/src/map/mercenary.hpp b/src/map/mercenary.hpp index 0dff4d840b..9f1810d738 100644 --- a/src/map/mercenary.hpp +++ b/src/map/mercenary.hpp @@ -4,7 +4,7 @@ #ifndef MERCENARY_HPP #define MERCENARY_HPP -#include "../common/cbasetypes.hpp" +#include #include "status.hpp" // struct status_data, struct status_change #include "unit.hpp" // struct unit_data diff --git a/src/map/mob.cpp b/src/map/mob.cpp index 27d9ae9c03..5c04ab38e5 100644 --- a/src/map/mob.cpp +++ b/src/map/mob.cpp @@ -10,18 +10,18 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/db.hpp" -#include "../common/ers.hpp" -#include "../common/malloc.hpp" -#include "../common/nullpo.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utilities.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "achievement.hpp" #include "battle.hpp" diff --git a/src/map/mob.hpp b/src/map/mob.hpp index ad622a2888..f119c0eeca 100644 --- a/src/map/mob.hpp +++ b/src/map/mob.hpp @@ -6,9 +6,9 @@ #include -#include "../common/database.hpp" -#include "../common/mmo.hpp" // struct item -#include "../common/timer.hpp" +#include +#include // struct item +#include #include "status.hpp" // struct status data, struct status_change #include "unit.hpp" // unit_stop_walking(), unit_stop_attack() diff --git a/src/map/navi.cpp b/src/map/navi.cpp index 5594d7b182..3c304b4471 100644 --- a/src/map/navi.cpp +++ b/src/map/navi.cpp @@ -1,4 +1,7 @@ -#include "../config/core.hpp" +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder + +#include #ifdef MAP_GENERATOR @@ -11,10 +14,10 @@ #include #include -#include "../common/db.hpp" -#include "../common/malloc.hpp" -#include "../common/showmsg.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include #include "map.hpp" #include "mob.hpp" #include "navi.hpp" diff --git a/src/map/navi.hpp b/src/map/navi.hpp index 0af5d1bcbc..5890ae1176 100644 --- a/src/map/navi.hpp +++ b/src/map/navi.hpp @@ -1,7 +1,10 @@ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder + #ifndef NAVI_H #define NAVI_H -#include "../config/core.hpp" +#include #ifdef MAP_GENERATOR struct navi_pos { diff --git a/src/map/npc.cpp b/src/map/npc.cpp index 2c1f398601..6c1c921fc1 100644 --- a/src/map/npc.cpp +++ b/src/map/npc.cpp @@ -8,16 +8,16 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/db.hpp" -#include "../common/ers.hpp" -#include "../common/malloc.hpp" -#include "../common/nullpo.hpp" -#include "../common/showmsg.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utilities.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "battle.hpp" #include "chat.hpp" diff --git a/src/map/npc.hpp b/src/map/npc.hpp index d70088bc1a..851cbb0755 100644 --- a/src/map/npc.hpp +++ b/src/map/npc.hpp @@ -7,9 +7,9 @@ #include #include -#include "../common/database.hpp" -#include "../common/timer.hpp" -#include "../config/core.hpp" +#include +#include +#include #include "clif.hpp" // #include "map.hpp" // struct block_list diff --git a/src/map/npc_chat.cpp b/src/map/npc_chat.cpp index db4b32ef8e..f08d7eeb46 100644 --- a/src/map/npc_chat.cpp +++ b/src/map/npc_chat.cpp @@ -7,10 +7,10 @@ #include "../../3rdparty/pcre/include/pcre.h" -#include "../common/malloc.hpp" -#include "../common/showmsg.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" +#include +#include +#include +#include #include "mob.hpp" // struct mob_data #include "pc.hpp" // map_session_data diff --git a/src/map/packets_struct.hpp b/src/map/packets_struct.hpp index 9f90b97321..5ee8a2a5e2 100644 --- a/src/map/packets_struct.hpp +++ b/src/map/packets_struct.hpp @@ -5,8 +5,8 @@ #ifndef MAP_PACKETS_STRUCT_HPP #define MAP_PACKETS_STRUCT_HPP -#include "../common/cbasetypes.hpp" -#include "../common/mmo.hpp" +#include +#include /** * diff --git a/src/map/party.cpp b/src/map/party.cpp index d9149899bd..371731173c 100644 --- a/src/map/party.cpp +++ b/src/map/party.cpp @@ -5,15 +5,15 @@ #include -#include "../common/cbasetypes.hpp" -#include "../common/malloc.hpp" -#include "../common/nullpo.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" // last_tick -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include // last_tick +#include +#include +#include #include "achievement.hpp" #include "atcommand.hpp" //msg_txt() diff --git a/src/map/party.hpp b/src/map/party.hpp index 930672b334..e3fce03fdb 100644 --- a/src/map/party.hpp +++ b/src/map/party.hpp @@ -6,7 +6,7 @@ #include -#include "../common/mmo.hpp" // struct party +#include // struct party struct block_list; class map_session_data; diff --git a/src/map/path.cpp b/src/map/path.cpp index bc88e10cf4..b0ab2b4e70 100644 --- a/src/map/path.cpp +++ b/src/map/path.cpp @@ -8,12 +8,12 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/db.hpp" -#include "../common/malloc.hpp" -#include "../common/nullpo.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" +#include +#include +#include +#include +#include +#include #include "battle.hpp" #include "map.hpp" diff --git a/src/map/path.hpp b/src/map/path.hpp index 638abee333..58234ec305 100644 --- a/src/map/path.hpp +++ b/src/map/path.hpp @@ -4,7 +4,7 @@ #ifndef PATH_HPP #define PATH_HPP -#include "../common/cbasetypes.hpp" +#include enum cell_chk : uint8; diff --git a/src/map/pc.cpp b/src/map/pc.cpp index c5223a71a3..9d5b969088 100755 --- a/src/map/pc.cpp +++ b/src/map/pc.cpp @@ -14,21 +14,21 @@ #include #endif -#include "../common/cbasetypes.hpp" -#include "../common/core.hpp" // get_svn_revision() -#include "../common/database.hpp" -#include "../common/ers.hpp" // ers_destroy -#include "../common/grfio.hpp" -#include "../common/malloc.hpp" -#include "../common/mmo.hpp" //NAME_LENGTH -#include "../common/nullpo.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" // session[] -#include "../common/strlib.hpp" // safestrncpy() -#include "../common/timer.hpp" -#include "../common/utilities.hpp" -#include "../common/utils.hpp" +#include +#include // get_svn_revision() +#include +#include // ers_destroy +#include +#include +#include //NAME_LENGTH +#include +#include +#include +#include // session[] +#include // safestrncpy() +#include +#include +#include #include "achievement.hpp" #include "atcommand.hpp" // get_atcommand_level() diff --git a/src/map/pc.hpp b/src/map/pc.hpp index b9a27bbe95..7f818fe3ab 100644 --- a/src/map/pc.hpp +++ b/src/map/pc.hpp @@ -8,11 +8,11 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/database.hpp" -#include "../common/mmo.hpp" // JOB_*, MAX_FAME_LIST, struct fame_list, struct mmo_charstatus -#include "../common/strlib.hpp"// StringBuf -#include "../common/timer.hpp" +#include +#include +#include // JOB_*, MAX_FAME_LIST, struct fame_list, struct mmo_charstatus +#include // StringBuf +#include #include "battleground.hpp" #include "buyingstore.hpp" // struct s_buyingstore diff --git a/src/map/pc_groups.cpp b/src/map/pc_groups.cpp index 7deba235bb..51d75ec609 100644 --- a/src/map/pc_groups.cpp +++ b/src/map/pc_groups.cpp @@ -3,10 +3,10 @@ #include "pc_groups.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" // set_eof -#include "../common/strlib.hpp" // strcmpi -#include "../common/utilities.hpp" +#include +#include // set_eof +#include // strcmpi +#include #include "atcommand.hpp" // AtCommandType #include "pc.hpp" // map_session_data diff --git a/src/map/pc_groups.hpp b/src/map/pc_groups.hpp index a61b149b6d..b0fab53cfd 100644 --- a/src/map/pc_groups.hpp +++ b/src/map/pc_groups.hpp @@ -8,8 +8,8 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/database.hpp" +#include +#include // Forward declaration from atcommands.hpp enum AtCommandType : uint8; diff --git a/src/map/pet.cpp b/src/map/pet.cpp index f0da9f335a..996ee5a12b 100644 --- a/src/map/pet.cpp +++ b/src/map/pet.cpp @@ -8,16 +8,16 @@ #include -#include "../common/db.hpp" -#include "../common/ers.hpp" -#include "../common/malloc.hpp" -#include "../common/nullpo.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utilities.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "achievement.hpp" #include "battle.hpp" diff --git a/src/map/pet.hpp b/src/map/pet.hpp index 27c29fe327..afef1db12d 100644 --- a/src/map/pet.hpp +++ b/src/map/pet.hpp @@ -4,10 +4,10 @@ #ifndef PET_HPP #define PET_HPP -#include "../common/cbasetypes.hpp" -#include "../common/database.hpp" -#include "../common/mmo.hpp" -#include "../common/timer.hpp" +#include +#include +#include +#include #include "battle.hpp" #include "mob.hpp" diff --git a/src/map/quest.cpp b/src/map/quest.cpp index 71afc1ac44..1707859e44 100644 --- a/src/map/quest.cpp +++ b/src/map/quest.cpp @@ -5,15 +5,15 @@ #include -#include "../common/cbasetypes.hpp" -#include "../common/malloc.hpp" -#include "../common/nullpo.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/strlib.hpp" -#include "../common/utilities.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "battle.hpp" #include "chrif.hpp" diff --git a/src/map/quest.hpp b/src/map/quest.hpp index 9195e78bae..1645eef822 100644 --- a/src/map/quest.hpp +++ b/src/map/quest.hpp @@ -6,9 +6,9 @@ #include -#include "../common/cbasetypes.hpp" -#include "../common/database.hpp" -#include "../common/strlib.hpp" +#include +#include +#include #include "map.hpp" diff --git a/src/map/script.cpp b/src/map/script.cpp index 7a4f4cebba..f2ea1b57b6 100644 --- a/src/map/script.cpp +++ b/src/map/script.cpp @@ -18,18 +18,18 @@ #include "../../3rdparty/pcre/include/pcre.h" // preg_match #endif -#include "../common/cbasetypes.hpp" -#include "../common/ers.hpp" // ers_destroy -#include "../common/malloc.hpp" -#include "../common/md5calc.hpp" -#include "../common/nullpo.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utilities.hpp" -#include "../common/utils.hpp" +#include +#include // ers_destroy +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "achievement.hpp" #include "atcommand.hpp" diff --git a/src/map/script.hpp b/src/map/script.hpp index f000f6906c..818f8d8aee 100644 --- a/src/map/script.hpp +++ b/src/map/script.hpp @@ -7,11 +7,11 @@ #include #include -#include "../common/database.hpp" -#include "../common/cbasetypes.hpp" -#include "../common/db.hpp" -#include "../common/mmo.hpp" -#include "../common/timer.hpp" +#include +#include +#include +#include +#include #define NUM_WHISPER_VAR 10 diff --git a/src/map/searchstore.cpp b/src/map/searchstore.cpp index d6ebb37cab..96db23fbde 100644 --- a/src/map/searchstore.cpp +++ b/src/map/searchstore.cpp @@ -3,10 +3,10 @@ #include "searchstore.hpp" // struct s_search_store_info -#include "../common/cbasetypes.hpp" -#include "../common/malloc.hpp" // aMalloc, aRealloc, aFree -#include "../common/showmsg.hpp" // ShowError, ShowWarning -#include "../common/strlib.hpp" // safestrncpy +#include +#include // aMalloc, aRealloc, aFree +#include // ShowError, ShowWarning +#include // safestrncpy #include "battle.hpp" // battle_config.* #include "clif.hpp" // clif_open_search_store_info, clif_search_store_info_* diff --git a/src/map/searchstore.hpp b/src/map/searchstore.hpp index b1d127a19a..0a30962545 100644 --- a/src/map/searchstore.hpp +++ b/src/map/searchstore.hpp @@ -7,8 +7,8 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/mmo.hpp" +#include +#include #include "clif.hpp" #include "map.hpp" diff --git a/src/map/skill.cpp b/src/map/skill.cpp index e7646ddbc5..fec5e31424 100755 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -10,16 +10,16 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/ers.hpp" -#include "../common/malloc.hpp" -#include "../common/nullpo.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utilities.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "achievement.hpp" #include "battle.hpp" diff --git a/src/map/skill.hpp b/src/map/skill.hpp index e695843ffb..3c23aff63b 100644 --- a/src/map/skill.hpp +++ b/src/map/skill.hpp @@ -7,11 +7,11 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/database.hpp" -#include "../common/db.hpp" -#include "../common/mmo.hpp" // MAX_SKILL, struct square -#include "../common/timer.hpp" +#include +#include +#include +#include // MAX_SKILL, struct square +#include #include "map.hpp" // struct block_list diff --git a/src/map/status.cpp b/src/map/status.cpp index 43960b3da6..96fee0de65 100644 --- a/src/map/status.cpp +++ b/src/map/status.cpp @@ -8,16 +8,16 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/ers.hpp" -#include "../common/malloc.hpp" -#include "../common/nullpo.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utilities.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "battle.hpp" #include "battleground.hpp" diff --git a/src/map/status.hpp b/src/map/status.hpp index 8d303d051a..cc730f932b 100644 --- a/src/map/status.hpp +++ b/src/map/status.hpp @@ -10,9 +10,9 @@ #include #include -#include "../common/database.hpp" -#include "../common/mmo.hpp" -#include "../common/timer.hpp" +#include +#include +#include #include "map.hpp" #include "script.hpp" diff --git a/src/map/storage.cpp b/src/map/storage.cpp index e52e73a123..448b9ad0ae 100644 --- a/src/map/storage.cpp +++ b/src/map/storage.cpp @@ -8,10 +8,10 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/nullpo.hpp" -#include "../common/showmsg.hpp" -#include "../common/utilities.hpp" +#include +#include +#include +#include #include "battle.hpp" #include "chrif.hpp" diff --git a/src/map/storage.hpp b/src/map/storage.hpp index 6a728827f0..bac4a0e986 100644 --- a/src/map/storage.hpp +++ b/src/map/storage.hpp @@ -8,8 +8,8 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/mmo.hpp" +#include +#include struct s_storage; struct item; diff --git a/src/map/trade.cpp b/src/map/trade.cpp index 4f8dc9071f..f44f6276d2 100644 --- a/src/map/trade.cpp +++ b/src/map/trade.cpp @@ -6,8 +6,8 @@ #include #include -#include "../common/nullpo.hpp" -#include "../common/socket.hpp" +#include +#include #include "atcommand.hpp" #include "battle.hpp" diff --git a/src/map/unit.cpp b/src/map/unit.cpp index cd7e57a8ab..053407ca3a 100644 --- a/src/map/unit.cpp +++ b/src/map/unit.cpp @@ -6,15 +6,15 @@ #include #include -#include "../common/db.hpp" -#include "../common/ers.hpp" // ers_destroy -#include "../common/malloc.hpp" -#include "../common/nullpo.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" -#include "../common/timer.hpp" -#include "../common/utils.hpp" +#include +#include // ers_destroy +#include +#include +#include +#include +#include +#include +#include #include "achievement.hpp" #include "battle.hpp" diff --git a/src/map/unit.hpp b/src/map/unit.hpp index 5b2c889d2e..dabba0fd5f 100644 --- a/src/map/unit.hpp +++ b/src/map/unit.hpp @@ -4,8 +4,8 @@ #ifndef UNIT_HPP #define UNIT_HPP -#include "../common/cbasetypes.hpp" -#include "../common/timer.hpp" +#include +#include #include "path.hpp" // struct walkpath_data #include "skill.hpp" // struct skill_timerskill, struct skill_unit_group, struct skill_unit_group_tickset diff --git a/src/map/vending.cpp b/src/map/vending.cpp index 6ed1f75f12..d9b6d975bc 100755 --- a/src/map/vending.cpp +++ b/src/map/vending.cpp @@ -5,11 +5,11 @@ #include // atoi -#include "../common/malloc.hpp" // aMalloc, aFree -#include "../common/nullpo.hpp" -#include "../common/showmsg.hpp" // ShowInfo -#include "../common/strlib.hpp" -#include "../common/timer.hpp" // DIFF_TICK +#include // aMalloc, aFree +#include +#include // ShowInfo +#include +#include // DIFF_TICK #include "achievement.hpp" #include "atcommand.hpp" diff --git a/src/map/vending.hpp b/src/map/vending.hpp index befaf8e397..8f886d9cc1 100644 --- a/src/map/vending.hpp +++ b/src/map/vending.hpp @@ -4,9 +4,9 @@ #ifndef _VENDING_HPP_ #define _VENDING_HPP_ -#include "../common/cbasetypes.hpp" -#include "../common/db.hpp" -#include "../common/mmo.hpp" +#include +#include +#include class map_session_data; struct s_search_store_search; diff --git a/src/tool/CMakeLists.txt b/src/tool/CMakeLists.txt index 45ffa2f933..981a9acada 100644 --- a/src/tool/CMakeLists.txt +++ b/src/tool/CMakeLists.txt @@ -5,6 +5,7 @@ add_library(tools INTERFACE) target_include_directories(tools INTERFACE ${YAML_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} + ${RA_INCLUDE_DIRS} ) target_sources(tools INTERFACE diff --git a/src/tool/Makefile.in b/src/tool/Makefile.in index 959455ed8b..da7ec64ada 100644 --- a/src/tool/Makefile.in +++ b/src/tool/Makefile.in @@ -4,6 +4,8 @@ COMMON_DIR_OBJ = $(COMMON_OBJ:%=../common/obj/%) COMMON_H = $(shell ls ../common/*.hpp) COMMON_INCLUDE = -I../common/ +RA_INCLUDE = -I../ + RAPIDYAML_OBJ = $(shell find ../../3rdparty/rapidyaml/src/ -type f -name "*.cpp" | sed -e "s/\.cpp/\.o/g" ) RAPIDYAML_DIR_OBJ = $(RAPIDYAML_OBJ:%=obj/%) RAPIDYAML_AR = ../../3rdparty/rapidyaml/obj/ryml.a @@ -70,7 +72,7 @@ obj_all: obj_all/%.o: %.cpp $(COMMON_H) $(OTHER_H) $(RAPIDYAML_H) $(YAML_CPP_H) @echo " CXX $<" - @@CXX@ @CXXFLAGS@ $(COMMON_INCLUDE) $(RAPIDYAML_INCLUDE) $(YAML_CPP_INCLUDE) @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @@CXX@ @CXXFLAGS@ $(COMMON_INCLUDE) $(RA_INCLUDE) $(RAPIDYAML_INCLUDE) $(YAML_CPP_INCLUDE) @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing common object files $(COMMON_DIR_OBJ): diff --git a/src/tool/csv2yaml.hpp b/src/tool/csv2yaml.hpp index 465d9bb457..10cf28de48 100644 --- a/src/tool/csv2yaml.hpp +++ b/src/tool/csv2yaml.hpp @@ -4,7 +4,7 @@ #ifndef CSV2YAML_HPP #define CSV2YAML_HPP -#include "../common/core.hpp" +#include #include "yaml.hpp" diff --git a/src/tool/csv2yaml.vcxproj b/src/tool/csv2yaml.vcxproj index 48d135aa31..fd5c508b98 100644 --- a/src/tool/csv2yaml.vcxproj +++ b/src/tool/csv2yaml.vcxproj @@ -113,7 +113,7 @@ Disabled $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug - $(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src + $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src true @@ -130,7 +130,7 @@ Disabled $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug - $(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src + $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src Console @@ -148,7 +148,7 @@ true $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded - $(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src + $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src Console @@ -168,7 +168,7 @@ true $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded - $(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src + $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src Console diff --git a/src/tool/mapcache.cpp b/src/tool/mapcache.cpp index a537af046f..c588557599 100644 --- a/src/tool/mapcache.cpp +++ b/src/tool/mapcache.cpp @@ -10,12 +10,12 @@ #endif #include -#include "../common/core.hpp" -#include "../common/grfio.hpp" -#include "../common/malloc.hpp" -#include "../common/mmo.hpp" -#include "../common/showmsg.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include using namespace rathena::server_core; diff --git a/src/tool/mapcache.vcxproj b/src/tool/mapcache.vcxproj index 75bd6be2fa..4c3111e9f9 100644 --- a/src/tool/mapcache.vcxproj +++ b/src/tool/mapcache.vcxproj @@ -95,6 +95,7 @@ $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug true + $(SolutionDir)src;%(AdditionalIncludeDirectories) Console @@ -110,6 +111,7 @@ Disabled $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug + $(SolutionDir)src;%(AdditionalIncludeDirectories) Console @@ -127,6 +129,7 @@ true $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded + $(SolutionDir)src;%(AdditionalIncludeDirectories) Console @@ -146,6 +149,7 @@ true $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded + $(SolutionDir)src;%(AdditionalIncludeDirectories) Console diff --git a/src/tool/yaml.hpp b/src/tool/yaml.hpp index 936bc29778..b1a8034128 100644 --- a/src/tool/yaml.hpp +++ b/src/tool/yaml.hpp @@ -23,17 +23,17 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/core.hpp" -#include "../common/malloc.hpp" -#include "../common/mmo.hpp" -#include "../common/nullpo.hpp" -#include "../common/showmsg.hpp" -#include "../common/strlib.hpp" -#include "../common/utilities.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef WIN32 -#include "../common/winapi.hpp" +#include #endif // Only for constants - do not use functions of it or linking will fail diff --git a/src/tool/yaml2sql.cpp b/src/tool/yaml2sql.cpp index 03ecaea85d..a3c3437f3d 100644 --- a/src/tool/yaml2sql.cpp +++ b/src/tool/yaml2sql.cpp @@ -20,17 +20,17 @@ #include #include -#include "../common/cbasetypes.hpp" -#include "../common/core.hpp" -#include "../common/malloc.hpp" -#include "../common/mmo.hpp" -#include "../common/nullpo.hpp" -#include "../common/showmsg.hpp" -#include "../common/strlib.hpp" -#include "../common/utilities.hpp" -#include "../common/utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef WIN32 -#include "../common/winapi.hpp" +#include #endif // Only for constants - do not use functions of it or linking will fail diff --git a/src/tool/yaml2sql.vcxproj b/src/tool/yaml2sql.vcxproj index 14a90617dc..a8a8541e24 100644 --- a/src/tool/yaml2sql.vcxproj +++ b/src/tool/yaml2sql.vcxproj @@ -94,7 +94,7 @@ Disabled $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug - $(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src + $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src true @@ -111,7 +111,7 @@ Disabled $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug - $(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src + $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src Console @@ -129,7 +129,7 @@ true $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded - $(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src + $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src Console @@ -149,7 +149,7 @@ true $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded - $(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src + $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src Console diff --git a/src/tool/yamlupgrade.hpp b/src/tool/yamlupgrade.hpp index bd75b35c45..8a44c9bdd2 100644 --- a/src/tool/yamlupgrade.hpp +++ b/src/tool/yamlupgrade.hpp @@ -4,7 +4,7 @@ #ifndef YAMLUPGRADE_HPP #define YAMLUPGRADE_HPP -#include "../common/core.hpp" +#include #include "yaml.hpp" diff --git a/src/tool/yamlupgrade.vcxproj b/src/tool/yamlupgrade.vcxproj index 6e9912ed92..80cdade9b9 100644 --- a/src/tool/yamlupgrade.vcxproj +++ b/src/tool/yamlupgrade.vcxproj @@ -94,7 +94,7 @@ Disabled $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug - $(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src + $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src true @@ -111,7 +111,7 @@ Disabled $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug - $(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src + $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src Console @@ -129,7 +129,7 @@ true $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded - $(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src + $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src Console @@ -149,7 +149,7 @@ true $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded - $(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src + $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src Console diff --git a/src/web/CMakeLists.txt b/src/web/CMakeLists.txt index 7b70962bf5..a4a1aedbaf 100644 --- a/src/web/CMakeLists.txt +++ b/src/web/CMakeLists.txt @@ -17,7 +17,7 @@ file(GLOB WEB_HEADERS ${WEB_SOURCE_DIR}/*.hpp) file(GLOB WEB_SOURCES ${WEB_SOURCE_DIR}/*.cpp) set( DEPENDENCIES common yaml-cpp httplib) set( LIBRARIES ${GLOBAL_LIBRARIES}) -set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} ${HTTPLIB_INCLUDE_DIRS} ${JSON_INCLUDE_DIRS}) +set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} ${HTTPLIB_INCLUDE_DIRS} ${JSON_INCLUDE_DIRS} ${RA_INCLUDE_DIRS} ) set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS}" ) set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} ${WEB_HEADERS} ${WEB_SOURCES} ) source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} ) diff --git a/src/web/Makefile.in b/src/web/Makefile.in index a70c0f9e85..9439afbfee 100644 --- a/src/web/Makefile.in +++ b/src/web/Makefile.in @@ -1,7 +1,9 @@ COMMON_H = $(shell ls ../common/*.hpp) COMMON_AR = ../common/obj/common.a -COMMON_INCLUDE = -I../common +COMMON_INCLUDE = -I../common/ + +RA_INCLUDE = -I../ LIBCONFIG_H = $(shell ls ../../3rdparty/libconfig/*.h) LIBCONFIG_AR = ../../3rdparty/libconfig/obj/libconfig.a @@ -80,7 +82,7 @@ web-server: obj $(WEB_DIR_OBJ) $(COMMON_AR) $(LIBCONFIG_AR) $(RAPIDYAML_AR) $(HT obj/%.o: %.cpp $(WEB_H) $(COMMON_H) $(LIBCONFIG_H) $(HTTPLIB_H) $(RAPIDYAML_H) $(NLOHMANN_H) @echo " CXX $<" - @@CXX@ @CXXFLAGS@ $(COMMON_INCLUDE) $(LIBCONFIG_INCLUDE) $(HTTPLIB_INCLUDE) $(RAPIDYAML_INCLUDE) $(NLOHMANN_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @@CXX@ @CXXFLAGS@ $(COMMON_INCLUDE) $(RA_INCLUDE) $(LIBCONFIG_INCLUDE) $(HTTPLIB_INCLUDE) $(RAPIDYAML_INCLUDE) $(NLOHMANN_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing object files $(COMMON_AR): diff --git a/src/web/auth.cpp b/src/web/auth.cpp index cc93057648..d54f25716d 100644 --- a/src/web/auth.cpp +++ b/src/web/auth.cpp @@ -5,8 +5,8 @@ #include -#include "../common/showmsg.hpp" -#include "../common/sql.hpp" +#include +#include #include "http.hpp" #include "sqllock.hpp" diff --git a/src/web/charconfig_controller.cpp b/src/web/charconfig_controller.cpp index bd96e64cb4..25a029b22f 100644 --- a/src/web/charconfig_controller.cpp +++ b/src/web/charconfig_controller.cpp @@ -6,8 +6,8 @@ #include #include -#include "../common/showmsg.hpp" -#include "../common/sql.hpp" +#include +#include #include "auth.hpp" #include "http.hpp" diff --git a/src/web/emblem_controller.cpp b/src/web/emblem_controller.cpp index 9998fc6c04..fe38615365 100644 --- a/src/web/emblem_controller.cpp +++ b/src/web/emblem_controller.cpp @@ -7,8 +7,8 @@ #include #include -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" +#include +#include #include "auth.hpp" #include "http.hpp" diff --git a/src/web/http.hpp b/src/web/http.hpp index 09a5f641f7..145446edb8 100644 --- a/src/web/http.hpp +++ b/src/web/http.hpp @@ -5,7 +5,7 @@ #define HTTP_HPP #ifdef WIN32 -#include "../common/winapi.hpp" +#include #endif #include diff --git a/src/web/merchantstore_controller.cpp b/src/web/merchantstore_controller.cpp index 524158b6da..d2ec49afcf 100644 --- a/src/web/merchantstore_controller.cpp +++ b/src/web/merchantstore_controller.cpp @@ -6,8 +6,8 @@ #include #include -#include "../common/showmsg.hpp" -#include "../common/sql.hpp" +#include +#include #include "auth.hpp" #include "http.hpp" diff --git a/src/web/partybooking_controller.cpp b/src/web/partybooking_controller.cpp index 8507f17374..6e3decb8fe 100644 --- a/src/web/partybooking_controller.cpp +++ b/src/web/partybooking_controller.cpp @@ -5,9 +5,9 @@ #include -#include "../common/showmsg.hpp" -#include "../common/sql.hpp" -#include "../common/strlib.hpp" +#include +#include +#include #include "http.hpp" #include "auth.hpp" diff --git a/src/web/sqllock.cpp b/src/web/sqllock.cpp index 94c8151104..4a29e7d87c 100644 --- a/src/web/sqllock.cpp +++ b/src/web/sqllock.cpp @@ -5,7 +5,7 @@ #include -#include "../common/showmsg.hpp" +#include std::mutex dbmutex; diff --git a/src/web/sqllock.hpp b/src/web/sqllock.hpp index d9dc759485..34367240d6 100644 --- a/src/web/sqllock.hpp +++ b/src/web/sqllock.hpp @@ -6,7 +6,7 @@ #include -#include "../common/sql.hpp" +#include enum locktype { LOGIN_SQL_LOCK, diff --git a/src/web/userconfig_controller.cpp b/src/web/userconfig_controller.cpp index 9dbb9a11e1..0e6a8ed41b 100644 --- a/src/web/userconfig_controller.cpp +++ b/src/web/userconfig_controller.cpp @@ -6,8 +6,8 @@ #include #include -#include "../common/showmsg.hpp" -#include "../common/sql.hpp" +#include +#include #include "auth.hpp" #include "http.hpp" diff --git a/src/web/web-server.vcxproj b/src/web/web-server.vcxproj index d61341a5a3..59150edd9d 100644 --- a/src/web/web-server.vcxproj +++ b/src/web/web-server.vcxproj @@ -94,7 +94,7 @@ Disabled $(DefineConstants);WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug - $(SolutionDir)3rdparty\httplib\;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;%(AdditionalIncludeDirectories) + $(SolutionDir)src;$(SolutionDir)3rdparty\httplib\;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;%(AdditionalIncludeDirectories) 4018;4200 true true @@ -113,7 +113,7 @@ Disabled $(DefineConstants);WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug - $(SolutionDir)3rdparty\httplib\;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;%(AdditionalIncludeDirectories) + $(SolutionDir)src;$(SolutionDir)3rdparty\httplib\;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;%(AdditionalIncludeDirectories) 4018 @@ -132,7 +132,7 @@ true $(DefineConstants);WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded - $(SolutionDir)3rdparty\httplib\;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;%(AdditionalIncludeDirectories) + $(SolutionDir)src;$(SolutionDir)3rdparty\httplib\;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;%(AdditionalIncludeDirectories) 4018 @@ -153,7 +153,7 @@ true $(DefineConstants);WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded - $(SolutionDir)3rdparty\httplib\;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;%(AdditionalIncludeDirectories) + $(SolutionDir)src;$(SolutionDir)3rdparty\httplib\;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;%(AdditionalIncludeDirectories) 4018 diff --git a/src/web/web.cpp b/src/web/web.cpp index f20b6fbaff..53626c07bd 100644 --- a/src/web/web.cpp +++ b/src/web/web.cpp @@ -9,21 +9,21 @@ #include #include -#include "../common/cli.hpp" -#include "../common/core.hpp" -#include "../common/malloc.hpp" -#include "../common/md5calc.hpp" -#include "../common/mmo.hpp" -#include "../common/msg_conf.hpp" -#include "../common/random.hpp" -#include "../common/showmsg.hpp" -#include "../common/socket.hpp" //ip2str -#include "../common/sql.hpp" -#include "../common/strlib.hpp" -#include "../common/timer.hpp" -#include "../common/utilities.hpp" -#include "../common/utils.hpp" -#include "../config/core.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include //ip2str +#include +#include +#include +#include +#include +#include #include "charconfig_controller.hpp" #include "emblem_controller.hpp" diff --git a/src/web/web.hpp b/src/web/web.hpp index 94e5c49a45..74db31759a 100644 --- a/src/web/web.hpp +++ b/src/web/web.hpp @@ -6,11 +6,11 @@ #include -#include "../common/cbasetypes.hpp" -#include "../common/core.hpp" // CORE_ST_LAST -#include "../common/mmo.hpp" // NAME_LENGTH,SEX_* -#include "../common/timer.hpp" -#include "../config/core.hpp" +#include +#include // CORE_ST_LAST +#include // NAME_LENGTH,SEX_* +#include +#include using rathena::server_core::Core; using rathena::server_core::e_core_type;