Update fmtlib

Added addition usage message for #grid for #grid show. (noudess)

.gitignore

@@ -27,9 +27,12 @@ install_manifest.txt
 log/
 logs/
 vcpkg/
+perl/
 
 .idea/*
 *cbp
 
 submodules/*
-cmake-build-debug/
+cmake-build-debug/
+
+.nfs.*

BUILD.md

@@ -0,0 +1,64 @@
+# Guide To Building From Source Without Installer
+
+This guide is far from exhaustive, you should expect to have some experience with building C++ code before considering compiling the code from scratch.  You should instead consider using the installer scripts if you don't want to hack on the code directly.
+
+### CMake
+
+EQEmu uses CMake as the build system on all platforms.  You will need CMake 3.2 or higher to build from source.
+
+### Dependencies
+
+The following libraries are required to build from source:
+- [boost](https://www.boost.org/ "boost")
+- [zlib](https://www.zlib.net/ "zlib") (If not included the source will build [zlib-ng](https://github.com/zlib-ng/zlib-ng "zlib-ng") instead)
+- [libmysql](https://dev.mysql.com/downloads/connector/c/ "libmysql") or [libmariadb](https://github.com/MariaDB/mariadb-connector-c "libmariadb")
+
+The following libraries are not strictly required but in many cased recommended.
+- [OpenSSL](https://www.openssl.org/ "OpenSSL") or [mbedTLS](https://tls.mbed.org/ "mbedTLS") (Required for the loginserver and headless client)
+- [libsodium](https://github.com/jedisct1/libsodium "libsodium") (Required for strong password hashing on the loginserver)
+- [Lua 5.1](https://www.lua.org/ "Lua 5.1") or [LuaJit](http://luajit.org/ "LuaJit") (Required for Lua Quest Scripting)
+- [Perl](https://www.perl.org/ "Perl") (Required for Perl Quest Scripting)
+
+##### Windows
+For windows it is suggested you make use of [vcpkg](https://github.com/microsoft/vcpkg "vcpkg") if you wish to build your own dependencies.
+
+If you wish to use Perl then you should use whichever version of Perl you have installed on the target system.
+
+You can also download a vcpkg export from our releases section for Visual Studio [x86](https://github.com/EQEmu/Server/releases/download/v1.2/vcpkg-export-x86.zip "x86") or [x64](https://github.com/EQEmu/Server/releases/download/v1.2/vcpkg-export-x64.zip "x64") that includes a toolchain file you can pass to CMake.
+
+##### Linux
+For Linux you simply can install the dependencies from your package manager, below is an example of doing it on Ubuntu using apt-get.
+
+    sudo apt-get install libmysqlclient-dev libperl-dev libboost-dev liblua5.1-0-dev zlib1g-dev uuid-dev libssl-dev
+
+### Running CMake
+
+##### Windows
+The following is a modified command our automated build server uses to run CMake via the release vcpkg export and its toolchain file. 
+
+Assuming it is starting in c:/projects/eqemu and the x64 dependencies were extracted to c:/projects/eqemu/vcpkg.
+
+	mkdir build
+	cd build
+	cmake -G "Visual Studio 15 2017 Win64" -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_ZLIB=ON -DEQEMU_ENABLE_BOTS=ON -DCMAKE_TOOLCHAIN_FILE="c:/projects/eqemu/vcpkg/vcpkg-export-20180828-145455/scripts/buildsystems/vcpkg.cmake" ..
+
+##### Linux
+Similarly to Windows running CMake on Linux is simple it just omits the toolchain file and uses a different generator.
+
+	mkdir build
+	cd build
+	cmake -G "Unix Makefiles" -DEQEMU_BUILD_TESTS=ON -DEQEMU_ENABLE_BOTS=ON -DEQEMU_BUILD_LOGIN=ON ..
+
+### Building
+
+##### Windows
+Inside the build directory a file EQEmu.sln should be produced by a successful run of the CMake command.  You can either open this with Visual Studio or build it directly with MSBuild via the command line.
+
+	msbuild EQEmu.sln /p:Configuration=Release
+
+##### Linux
+From the build directory you can simply call make to build.  
+
+For example.
+
+	make -j4

CMakeLists.txt

@@ -1,120 +1,28 @@
-#EQEmu CMake
-#Variables used:
-#EQEMU_DISABLE_CRT_SECURE_WARNINGS
-#EQEMU_FAST_FLOATINGPOINT
-#EQEMU_ENABLE_CRASH_LOGGING
-#EQEMU_DISABLE_SAFESEH
-#EQEMU_BUILD_MSVC_MP
-#EQEMU_DEBUG_LEVEL
-#EQEMU_LOG_LEVEL_DEBUG
-#EQEMU_ENABLE_BOTS
-#EQEMU_COMMANDS_LOGGING
-#EQEMU_BUILD_SERVER
-#EQEMU_BUILD_LOGIN
-#EQEMU_BUILD_TESTS
-#EQEMU_BUILD_PERL
-#EQEMU_BUILD_LUA
-#EQEMU_SANITIZE_LUA_LIBS
-#EQEMU_BUILD_CLIENT_FILES
-#EQEMU_USE_MAP_MMFS
-#EQEMU_MAP_DIR
-#EQEMU_ARCH
-#EQEMU_ARCH_ALT
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-IF(POLICY CMP0074)
-	cmake_policy(SET CMP0074 NEW)
-ENDIF()
-
-#FindMySQL is located here so lets make it so CMake can find it
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/" ${CMAKE_MODULE_PATH})
 
-#Our project name is EQEmu
+IF(POLICY CMP0074)
+	CMAKE_POLICY(SET CMP0074 NEW)
+ENDIF()
+
 PROJECT(EQEmu)
 
-#Default build type is set to RelWithDebInfo for generators that honor that like makefiles
 IF(NOT CMAKE_BUILD_TYPE)
 	SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
-SET(CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/dependencies" "${CMAKE_PREFIX_PATH}")
-
-#Add our various windows definitions
-IF(MSVC OR MINGW)
-	ADD_DEFINITIONS(-D_WINDOWS)
-	IF(CMAKE_CL_64)
-		ADD_DEFINITIONS(-DWIN64)
-	ELSE(CMAKE_CL_64)
-		ADD_DEFINITIONS(-DWIN32)
-	ENDIF(CMAKE_CL_64)
-ENDIF(MSVC OR MINGW)
+SET(CMAKE_CXX_STANDARD 11)
+SET(CMAKE_CXX_STANDARD_REQUIRED ON)
+SET(CMAKE_CXX_EXTENSIONS OFF)
 
 IF(MSVC)
-	IF(CMAKE_CL_64)
-		SET(EQEMU_ARCH "x64")
-		SET(EQEMU_ARCH_ALT "x64")
-	ELSE(CMAKE_CL_64)
-		SET(EQEMU_ARCH "x86")
-		SET(EQEMU_ARCH_ALT "Win32")
-	ENDIF(CMAKE_CL_64)
-	
-	SET(MYSQL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/mysql_${EQEMU_ARCH}")
-	
-	IF(VCPKG_TOOLCHAIN)
-		IF(NOT MSVC_VERSION GREATER 1800)
-			SET(SODIUM_INCLUDE_HINTS "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/libsodium/include")
-		ENDIF()
-	ELSE(VCPKG_TOOLCHAIN)
-		SET(ZLIB_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/zlib_${EQEMU_ARCH}")
-		SET(LUA_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/luaj_${EQEMU_ARCH}")
-		SET(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/openssl_${EQEMU_ARCH}")
-		
-		SET(SODIUM_INCLUDE_HINTS "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/libsodium/include")
-	ENDIF(VCPKG_TOOLCHAIN)
-	
-	IF(SODIUM_INCLUDE_HINTS)
-		IF(MSVC_VERSION GREATER 1800)
-			SET(SODIUM_LIBRARY_HINTS "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/libsodium/${EQEMU_ARCH_ALT}/Release/v140/dynamic")
-		ELSEIF(MSVC_VERSION EQUAL 1800)
-			SET(SODIUM_LIBRARY_HINTS "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/libsodium/${EQEMU_ARCH_ALT}/Release/v120/dynamic")
-		ELSE()
-			SET(SODIUM_LIBRARY_HINTS "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/libsodium/${EQEMU_ARCH_ALT}/Release/v110/dynamic")
-		ENDIF()
-	ENDIF(SODIUM_INCLUDE_HINTS)
-	
-	#disable CRT warnings on windows cause they're annoying as shit and we use C functions everywhere
-	OPTION(EQEMU_DISABLE_CRT_SECURE_WARNINGS "Disable Secure CRT Warnings" ON)
-	IF(EQEMU_DISABLE_CRT_SECURE_WARNINGS)
-		ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
-	ENDIF(EQEMU_DISABLE_CRT_SECURE_WARNINGS)
-
-	#fast FP if you'd like it
-	OPTION(EQEMU_FAST_FLOATINGPOINT "Use MSVC /fp:fast option" ON)
-	IF(EQEMU_FAST_FLOATINGPOINT)
-		ADD_DEFINITIONS(/fp:fast)
-	ENDIF(EQEMU_FAST_FLOATINGPOINT)
-
-	#crash logging currently only works on windows x86/x64
-	OPTION(EQEMU_ENABLE_CRASH_LOGGING "Enable crash logging" ON)
-	IF(EQEMU_ENABLE_CRASH_LOGGING)
-		ADD_DEFINITIONS(-DCRASH_LOGGING)
-	ENDIF(EQEMU_ENABLE_CRASH_LOGGING)
-
-	OPTION(EQEMU_BUILD_MSVC_MP "Enable build with multiple processes." ON)
-	IF(EQEMU_BUILD_MSVC_MP)
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-	ENDIF(EQEMU_BUILD_MSVC_MP)
-
-	#We want to compile /MT not /MD so we change that
-	FOREACH(flag_var CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO)
-		IF(${flag_var} MATCHES "/MD")
-			STRING(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-		ENDIF(${flag_var} MATCHES "/MD")
-	ENDFOREACH(flag_var)
-
+	ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
 	ADD_DEFINITIONS(-DNOMINMAX)
+	ADD_DEFINITIONS(-DCRASH_LOGGING)
+	
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
 ELSE(MSVC)
-	#Normally set by perl but we don't use the perl flags anymore so we set it.
 	ADD_DEFINITIONS(-DHAS_UNION_SEMUN)
 ENDIF(MSVC)
 
@@ -131,128 +39,284 @@ IF(UNIX)
 	ENDIF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 ENDIF(UNIX)
 
-#debug level, 5 is default. Most people wont ever change this but it's there if you want to
-SET(EQEMU_DEBUG_LEVEL 5 CACHE STRING "EQEmu debug level:
-	0 - Quiet mode Errors to file Status and Normal ignored
-	1 - Status and Normal to console, Errors to logfile
-	2 - Status, Normal, and Error to console and logfile
-	3 - Light debug release errors and status
-	4 - Moderate debug release errors and status
-	5 - Maximum debug release errors and status
-	10 - More errors than you ever wanted to see"
-)
+ADD_DEFINITIONS(-DGLM_FORCE_RADIANS)
+ADD_DEFINITIONS(-DGLM_FORCE_CTOR_INIT)
+ADD_DEFINITIONS(-DGLM_ENABLE_EXPERIMENTAL)
 
-SET(EQEMU_LOG_LEVEL_DEBUG 3 CACHE STRING "EQEmu logging level for [Debug]:
-	0 - Disabled
-	1 - Ouput to File Enabled
-	2 - Output to stdout Enabled
-	3 - Output to File and stdout Enabled
-	8 - Output to stderr Enabled
-	9 - Output to File and stderr Enabled
-	11 - Output to File, stdout and stderr Enabled"
-)
+#MSVC can fetch dependencies automatically.
+IF(MSVC)
+	INCLUDE("${CMAKE_SOURCE_DIR}/cmake/DependencyHelperMSVC.cmake")
+ENDIF()
 
-OPTION(EQEMU_LSPX "" OFF)
-MARK_AS_ADVANCED(EQEMU_LSPX)
+#Find everything we need
+FIND_PACKAGE(Boost REQUIRED)
+FIND_PACKAGE(MySQL)
+FIND_PACKAGE(MariaDB)
+FIND_PACKAGE(ZLIB)
+FIND_PACKAGE(OpenSSL)
+FIND_PACKAGE(Lua51)
+FIND_PACKAGE(PerlLibs)
+FIND_PACKAGE(Sodium)
+FIND_PACKAGE(mbedTLS)
 
-MARK_AS_ADVANCED(EQEMU_LOG_LEVEL_DEBUG)
+MESSAGE(STATUS "**************************************************")
+MESSAGE(STATUS "* Library Detection                              *")
+MESSAGE(STATUS "**************************************************")
 
-#Bots are a compile time option so on/off
+IF(MYSQL_FOUND)
+	MESSAGE(STATUS "* MySQL:                                   FOUND *")
+ELSE()
+	MESSAGE(STATUS "* MySQL:                                 MISSING *")
+ENDIF()
+
+IF(MARIADB_FOUND)
+	MESSAGE(STATUS "* MariaDB:                                 FOUND *")
+ELSE()
+	MESSAGE(STATUS "* MariaDB:                               MISSING *")
+ENDIF()
+
+IF(ZLIB_FOUND)
+	MESSAGE(STATUS "* ZLIB:                                    FOUND *")
+ELSE()
+	MESSAGE(STATUS "* ZLIB:                                  MISSING *")
+ENDIF()
+
+IF(Lua51_FOUND)
+	MESSAGE(STATUS "* Lua:                                     FOUND *")
+ELSE()
+	MESSAGE(STATUS "* Lua:                                   MISSING *")
+ENDIF()
+
+IF(PerlLibs_FOUND)
+	MESSAGE(STATUS "* Perl:                                    FOUND *")
+ELSE()
+	MESSAGE(STATUS "* Perl:                                  MISSING *")
+ENDIF()
+
+IF(SODIUM_FOUND)
+	MESSAGE(STATUS "* libsodium:                               FOUND *")
+ELSE()
+	MESSAGE(STATUS "* libsodium:                             MISSING *")
+ENDIF()
+
+IF(OpenSSL_FOUND)
+	MESSAGE(STATUS "* OpenSSL:                                 FOUND *")
+ELSE()
+	MESSAGE(STATUS "* OpenSSL:                               MISSING *")
+ENDIF()
+
+IF(MBEDTLS_FOUND)
+	MESSAGE(STATUS "* mbedTLS:                                 FOUND *")
+ELSE()
+	MESSAGE(STATUS "* mbedTLS:                               MISSING *")
+ENDIF()
+
+MESSAGE(STATUS "**************************************************")
+
+#options
+OPTION(EQEMU_DEPOP_INVALIDATES_CACHE "#repop invalidates the npc_types cache (will cause a larger database hit on #repop but is more convienent)." ON)
 OPTION(EQEMU_ENABLE_BOTS "Enable Bots" OFF)
-
-#Enable GM Command log system
 OPTION(EQEMU_COMMANDS_LOGGING "Enable GM Command logs" ON)
+OPTION(EQEMU_BUILD_SERVER "Build the game server." ON)
+OPTION(EQEMU_BUILD_LOGIN "Build the login server." ON)
+OPTION(EQEMU_BUILD_HC "Build the headless client." OFF)
+OPTION(EQEMU_BUILD_TESTS "Build utility tests." OFF)
+OPTION(EQEMU_BUILD_CLIENT_FILES "Build Client Import/Export Data Programs." ON)
 
 IF(EQEMU_COMMANDS_LOGGING)
 	ADD_DEFINITIONS(-DCOMMANDS_LOGGING)
 ENDIF(EQEMU_COMMANDS_LOGGING)
 
-IF(EQEMU_LSPX)
-	ADD_DEFINITIONS(-DLSPX=ON)
-ENDIF(EQEMU_LSPX)
-
 IF(EQEMU_ENABLE_BOTS)
 	ADD_DEFINITIONS(-DBOTS)
 ENDIF(EQEMU_ENABLE_BOTS)
 
-#What to build
-OPTION(EQEMU_BUILD_SERVER "Build the game server." ON)
-OPTION(EQEMU_BUILD_LOGIN "Build the login server." OFF)
-OPTION(EQEMU_BUILD_HC "Build the headless client." OFF)
-OPTION(EQEMU_BUILD_TESTS "Build utility tests." OFF)
-OPTION(EQEMU_BUILD_PERL "Build Perl parser." ON)
-OPTION(EQEMU_BUILD_LUA "Build Lua parser." ON)
-OPTION(EQEMU_BUILD_CLIENT_FILES "Build Client Import/Export Data Programs." ON)
-
-#C++11 stuff
-IF(NOT MSVC)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-	IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reserved-user-defined-literal")
+#database
+IF(MySQL_FOUND AND MariaDB_FOUND)
+	SET(DATABASE_LIBRARY_SELECTION MySQL CACHE STRING "Database library to use:
+			MySQL
+			MariaDB"
+	)
+	
+	IF(DATABASE_LIBRARY_SELECTION STREQUAL "MySQL")
+		SET(DATABASE_LIBRARY_TYPE "  MySQL")
+		SET(DATABASE_LIBRARY_LIBS ${MySQL_LIBRARIES})
+		SET(DATABASE_LIBRARY_INCLUDE ${MySQL_INCLUDE_DIR})
+	ELSEIF(DATABASE_LIBRARY_SELECTION STREQUAL "MariaDB")
+		SET(DATABASE_LIBRARY_TYPE "MariaDB")
+		SET(DATABASE_LIBRARY_LIBS ${MariaDB_LIBRARIES})
+		SET(DATABASE_LIBRARY_INCLUDE ${MariaDB_INCLUDE_DIR})
+	ELSE()
+		MESSAGE(FATAL_ERROR "Unknown database library set, should be one of: MySQL, MariaDB")
 	ENDIF()
-ENDIF(NOT MSVC)
+ELSEIF(MariaDB_FOUND)
+	SET(DATABASE_LIBRARY_TYPE "MariaDB")
+	SET(DATABASE_LIBRARY_LIBS ${MariaDB_LIBRARIES})
+	SET(DATABASE_LIBRARY_INCLUDE ${MariaDB_INCLUDE_DIR})
+ELSEIF(MySQL_FOUND)
+	SET(DATABASE_LIBRARY_TYPE "  MySQL")
+	SET(DATABASE_LIBRARY_LIBS ${MySQL_LIBRARIES})
+	SET(DATABASE_LIBRARY_INCLUDE ${MySQL_INCLUDE_DIR})
+ELSE()
+	MESSAGE(FATAL_ERROR "One of MySQL or MariaDB is a required dependency.")
+ENDIF()
 
-#Various definitions
-IF(EQEMU_BUILD_PERL)
-	ADD_DEFINITIONS(-DEMBPERL)
-	ADD_DEFINITIONS(-DEMBPERL_PLUGIN)
-ENDIF(EQEMU_BUILD_PERL)
-IF(EQEMU_BUILD_LUA)
-	ADD_DEFINITIONS(-DLUA_EQEMU)
-ENDIF(EQEMU_BUILD_LUA)
+#security
+#prefer openssl to mbedtls (arbitrary)
+IF(OpenSSL_FOUND AND MBEDTLS_FOUND)
+	SET(TLS_LIBRARY_SELECTION OpenSSL CACHE STRING "TLS library to use:
+			OpenSSL
+			mbedTLS"
+	)
+	
+	IF(TLS_LIBRARY_SELECTION STREQUAL "OpenSSL")
+		SET(TLS_LIBRARY_TYPE " OpenSSL")
+		SET(TLS_LIBRARY_ENABLED ON)
+		SET(TLS_LIBRARY_LIBS ${OPENSSL_LIBRARIES})
+		SET(TLS_LIBRARY_INCLUDE ${OPENSSL_INCLUDE_DIR})
+		ADD_DEFINITIONS(-DEQEMU_USE_OPENSSL)
+	ELSEIF(TLS_LIBRARY_SELECTION STREQUAL "mbedTLS")
+		SET(TLS_LIBRARY_TYPE " mbedTLS")
+		SET(TLS_LIBRARY_ENABLED ON)
+		SET(TLS_LIBRARY_LIBS ${MBEDTLS_LIBRARY} ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRARY})
+		SET(TLS_LIBRARY_INCLUDE ${MBEDTLS_INCLUDE_DIR})
+		ADD_DEFINITIONS(-DEQEMU_USE_MBEDTLS)
+	ELSE()
+		MESSAGE(FATAL_ERROR "Unknown TLS library set, should be one of: OpenSSL, mbedTLS")
+	ENDIF()
+ELSEIF(OpenSSL_FOUND)
+	SET(TLS_LIBRARY_TYPE " OpenSSL")
+	SET(TLS_LIBRARY_ENABLED ON)
+	SET(TLS_LIBRARY_LIBS ${OPENSSL_LIBRARIES})
+	SET(TLS_LIBRARY_INCLUDE ${OPENSSL_INCLUDE_DIR})
+	ADD_DEFINITIONS(-DEQEMU_USE_OPENSSL)
+ELSEIF(MBEDTLS_FOUND)
+	SET(TLS_LIBRARY_TYPE " mbedTLS")
+	SET(TLS_LIBRARY_ENABLED ON)
+	SET(TLS_LIBRARY_LIBS ${MBEDTLS_LIBRARY} ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRARY})
+	SET(TLS_LIBRARY_INCLUDE ${MBEDTLS_INCLUDE_DIR})
+	ADD_DEFINITIONS(-DEQEMU_USE_MBEDTLS)
+ELSE()
+	SET(TLS_LIBRARY_TYPE "Disabled")
+	SET(TLS_LIBRARY_ENABLED OFF)
+ENDIF()
 
-#Disabled until reevaluation performed
-#OPTION(EQEMU_USE_MAP_MMFS "Create and use Zone Map MMF files." OFF)
-#IF(EQEMU_USE_MAP_MMFS)
-#	ADD_DEFINITIONS(-DUSE_MAP_MMFS)
-#ENDIF(EQEMU_USE_MAP_MMFS)
-
-SET(EQEMU_MAP_DIR "./Maps" CACHE STRING "The dir that maps, water maps, and paths are located in.")
-
-ADD_DEFINITIONS(-DEQDEBUG=${EQEMU_DEBUG_LEVEL})
-ADD_DEFINITIONS(-DINVERSEXY)
-ADD_DEFINITIONS(-DFIELD_ITEMS)
-ADD_DEFINITIONS(-DMAP_DIR="${EQEMU_MAP_DIR}")
-ADD_DEFINITIONS(-DLOG_LEVEL_DEBUG=${EQEMU_LOG_LEVEL_DEBUG})
-ADD_DEFINITIONS(-DGLM_FORCE_RADIANS)
-ADD_DEFINITIONS(-DGLM_FORCE_CTOR_INIT)
-ADD_DEFINITIONS(-DGLM_ENABLE_EXPERIMENTAL)
-
-#Find everything we need
-FIND_PACKAGE(ZLIB)
-FIND_PACKAGE(MySQL REQUIRED)
-IF(EQEMU_BUILD_PERL)
-	FIND_PACKAGE(PerlLibs REQUIRED)
-	INCLUDE_DIRECTORIES(SYSTEM "${PERL_INCLUDE_PATH}")
-ENDIF(EQEMU_BUILD_PERL)
-
-SET(SERVER_LIBS common debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE} uv_a fmt RecastNavigation::Detour)
-
-FIND_PACKAGE(Sodium REQUIRED)
 IF(SODIUM_FOUND)
-	OPTION(EQEMU_ENABLE_SECURITY "Use Encryption For TCP Connections" ON)
-	IF(EQEMU_ENABLE_SECURITY)
-		INCLUDE_DIRECTORIES(SYSTEM "${SODIUM_INCLUDE_DIRS}")
-		ADD_DEFINITIONS(-DENABLE_SECURITY)
-		SET(SERVER_LIBS ${SERVER_LIBS} ${SODIUM_LIBRARIES})
+	SET(SODIUM_LIBRARY_TYPE "Libsodium")
+	SET(SODIUM_LIBRARY_ENABLED ON)
+	SET(SODIUM_LIBRARY_LIBS ${SODIUM_LIBRARIES})
+	SET(SODIUM_LIBRARY_INCLUDE ${SODIUM_INCLUDE_DIRS})
+	ADD_DEFINITIONS(-DENABLE_SECURITY)
+ELSE()
+	SET(SODIUM_LIBRARY_TYPE " Disabled")
+	SET(SODIUM_LIBRARY_ENABLED OFF)
+ENDIF()
+
+IF(Lua51_FOUND)
+	SET(LUA_LIBRARY_TYPE " Lua 5.1")
+	SET(LUA_LIBRARY_ENABLED ON)
+	SET(LUA_LIBRARY_LIBS ${LUA_LIBRARY} luabind)
+	SET(LUA_LIBRARY_INCLUDE ${LUA_INCLUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/libs/luabind")
+ELSE()
+	SET(LUA_LIBRARY_TYPE "Disabled")
+	SET(LUA_LIBRARY_ENABLED OFF)
+ENDIF()
+
+IF(PerlLibs_FOUND)
+	SET(PERL_LIBRARY_TYPE "    Perl")
+	SET(PERL_LIBRARY_ENABLED ON)
+	SET(PERL_LIBRARY_LIBS ${PERL_LIBRARY})
+	SET(PERL_LIBRARY_INCLUDE ${PERL_INCLUDE_PATH})
+ELSE()
+	SET(PERL_LIBRARY_TYPE "Disabled")
+	SET(PERL_LIBRARY_ENABLED OFF)
+ENDIF()
+
+#use zlib if exists
+IF(ZLIB_FOUND)
+	OPTION(EQEMU_BUILD_ZLIB "Build internal version of zlib." ON)
+	IF(EQEMU_BUILD_ZLIB)
+		SET(ZLIB_LIBRARY_TYPE "zlib-ng")
+		SET(ZLIB_LIBRARY_LIBS "zlibstatic")
+		SET(ZLIB_LIBRARY_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng")
+	ELSE()
+		SET(ZLIB_LIBRARY_TYPE "   zlib")
+		SET(ZLIB_LIBRARY_LIBS ${ZLIB_LIBRARY})
+		SET(ZLIB_LIBRARY_INCLUDE ${ZLIB_INCLUDE_DIRS})
+	ENDIF()
+ELSE()
+	SET(ZLIB_LIBRARY_TYPE "zlib-ng")
+	SET(ZLIB_LIBRARY_LIBS "zlibstatic")
+	SET(ZLIB_LIBRARY_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng")
+ENDIF()
+
+MESSAGE(STATUS "")
+MESSAGE(STATUS "**************************************************")
+MESSAGE(STATUS "* Library Usage                                  *")
+MESSAGE(STATUS "**************************************************")
+MESSAGE(STATUS "* Database:                              ${DATABASE_LIBRARY_TYPE} *")
+MESSAGE(STATUS "* TLS:                                  ${TLS_LIBRARY_TYPE} *")
+MESSAGE(STATUS "* Sodium:                              ${SODIUM_LIBRARY_TYPE} *")
+MESSAGE(STATUS "* Lua:                                  ${LUA_LIBRARY_TYPE} *")
+MESSAGE(STATUS "* Perl:                                 ${PERL_LIBRARY_TYPE} *")
+MESSAGE(STATUS "* zlib:                                  ${ZLIB_LIBRARY_TYPE} *")
+MESSAGE(STATUS "**************************************************")
+
+#setup server libs and headers
+SET(SERVER_LIBS common ${DATABASE_LIBRARY_LIBS} ${ZLIB_LIBRARY_LIBS} ${Boost_LIBRARIES} uv_a fmt RecastNavigation::Detour)
+
+INCLUDE_DIRECTORIES(SYSTEM "${DATABASE_LIBRARY_INCLUDE}")
+INCLUDE_DIRECTORIES(SYSTEM "${ZLIB_LIBRARY_INCLUDE}")
+INCLUDE_DIRECTORIES(SYSTEM "${Boost_INCLUDE_DIRS}")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/glm")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/cereal/include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/fmt/include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/libuv/include" )
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DebugUtils/Include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/Detour/Include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DetourCrowd/Include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DetourTileCache/Include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/Recast/Include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/websocketpp")
+
+OPTION(EQEMU_BUILD_LOGGING "Build Logging (To speed up compilation)" ON)
+IF(EQEMU_BUILD_LOGGING)
+	ADD_DEFINITIONS(-DBUILD_LOGGING)
+ENDIF()
+
+IF(TLS_LIBRARY_ENABLED)
+	SET(SERVER_LIBS ${SERVER_LIBS} ${TLS_LIBRARY_LIBS})
+	INCLUDE_DIRECTORIES(SYSTEM "${TLS_LIBRARY_INCLUDE}")
+ENDIF()
+
+IF(SODIUM_LIBRARY_ENABLED)
+	SET(SERVER_LIBS ${SERVER_LIBS} ${SODIUM_LIBRARY_LIBS})
+	INCLUDE_DIRECTORIES(SYSTEM "${SODIUM_LIBRARY_INCLUDE}")
+ENDIF()
+
+IF(LUA_LIBRARY_ENABLED)
+	OPTION(EQEMU_BUILD_LUA "Build Lua parser." ON)
+	
+	IF(EQEMU_BUILD_LUA)
+		ADD_DEFINITIONS(-DLUA_EQEMU)
+		SET(SERVER_LIBS ${SERVER_LIBS} ${LUA_LIBRARY_LIBS})
+		INCLUDE_DIRECTORIES(SYSTEM "${LUA_LIBRARY_INCLUDE}")
+		
+		OPTION(EQEMU_SANITIZE_LUA_LIBS "Sanitize Lua Libraries (Remove OS and IO standard libraries from being able to run)." ON)
+		IF(EQEMU_SANITIZE_LUA_LIBS)
+			ADD_DEFINITIONS(-DSANITIZE_LUA_LIBS)
+		ENDIF()
 	ENDIF()
 ENDIF()
 
-IF(ZLIB_FOUND)
-	OPTION(EQEMU_BUILD_ZLIB "Build internal version of zlib." OFF)
-	
-	IF(EQEMU_BUILD_ZLIB)
-		INCLUDE_DIRECTORIES(BEFORE SYSTEM "${CMAKE_CURRENT_BINARY_DIR}/libs/zlibng" "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng")
-		SET(SERVER_LIBS ${SERVER_LIBS} "zlibstatic")
-	ELSE()
-		INCLUDE_DIRECTORIES(SYSTEM "${ZLIB_INCLUDE_DIRS}")
-		SET(SERVER_LIBS ${SERVER_LIBS} ${ZLIB_LIBRARY})
+IF(PERL_LIBRARY_ENABLED)
+	OPTION(EQEMU_BUILD_PERL "Build Perl parser." ON)
+	IF(EQEMU_BUILD_PERL)
+		SET(SERVER_LIBS ${SERVER_LIBS} ${PERL_LIBRARY_LIBS})
+		INCLUDE_DIRECTORIES(SYSTEM "${PERL_LIBRARY_INCLUDE}")
+		ADD_DEFINITIONS(-DEMBPERL)
+		ADD_DEFINITIONS(-DEMBPERL_PLUGIN)
 	ENDIF()
-ELSE()
-	MESSAGE(STATUS "Could NOT find ZLIB - using ZLIBSTATIC package.")
-	SET(EQEMU_BUILD_ZLIB ON)
-	INCLUDE_DIRECTORIES(BEFORE SYSTEM "${CMAKE_CURRENT_BINARY_DIR}/libs/zlibng" "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng")
-	SET(SERVER_LIBS ${SERVER_LIBS} "zlibstatic")
 ENDIF()
 
 IF(WIN32)
@@ -267,52 +331,32 @@ IF(UNIX)
 	SET(SERVER_LIBS ${SERVER_LIBS} "uuid")
 ENDIF()
 
-IF(EQEMU_BUILD_LUA)
-	FIND_PACKAGE(EQLua51 REQUIRED)
-	SET(Boost_USE_STATIC_LIBS OFF)
-	SET(Boost_USE_MULTITHREADED ON)
-	SET(Boost_USE_STATIC_RUNTIME OFF)
-	SET(BOOST_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/boost")
+IF(EQEMU_BUILD_LOGIN AND NOT TLS_LIBRARY_ENABLED)
+	MESSAGE(FATAL_ERROR "Login server requires a TLS Library to build.")
+ENDIF()
 
-	FIND_PACKAGE(Boost REQUIRED)
-	INCLUDE_DIRECTORIES(SYSTEM "${LUA_INCLUDE_DIR}" "${Boost_INCLUDE_DIRS}")
-	INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/libs/luabind")
-
-	OPTION(EQEMU_SANITIZE_LUA_LIBS "Sanitize Lua Libraries (Remove OS and IO standard libraries from being able to run)." ON)
-	IF(EQEMU_SANITIZE_LUA_LIBS)
-		ADD_DEFINITIONS(-DSANITIZE_LUA_LIBS)
-	ENDIF(EQEMU_SANITIZE_LUA_LIBS)
-ENDIF(EQEMU_BUILD_LUA)
-
-INCLUDE_DIRECTORIES(SYSTEM "${MySQL_INCLUDE_DIR}")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/glm")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/cereal/include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/fmt/include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/libuv/include" )
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DebugUtils/Include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/Detour/Include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DetourCrowd/Include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DetourTileCache/Include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/Recast/Include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/websocketpp")
+IF(EQEMU_BUILD_HC AND NOT TLS_LIBRARY_ENABLED)
+	MESSAGE(FATAL_ERROR "Headless client requires a TLS Library to build.")
+ENDIF()
 
 IF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS OR EQEMU_BUILD_HC)
 	ADD_SUBDIRECTORY(common)
 	ADD_SUBDIRECTORY(libs)
 	ADD_SUBDIRECTORY(submodules/fmt)
 	ADD_SUBDIRECTORY(submodules/libuv)
-
-	SET(RECASTNAVIGATION_DEMO OFF CACHE BOOL "Build demo")
-	SET(RECASTNAVIGATION_TESTS OFF CACHE BOOL "Build tests")
-	SET(RECASTNAVIGATION_EXAMPLES OFF CACHE BOOL "Build examples")
-	ADD_SUBDIRECTORY(submodules/recastnavigation)
 	
 	IF(EQEMU_BUILD_ZLIB)
 		SET(ZLIB_COMPAT ON CACHE BOOL "Compile with zlib compatible API")
 		SET(ZLIB_ENABLE_TESTS OFF CACHE BOOL "Build test binaries")
 		ADD_SUBDIRECTORY(libs/zlibng)
 	ENDIF()
+	
+	SET(RECASTNAVIGATION_DEMO OFF CACHE BOOL "Build demo")
+	SET(RECASTNAVIGATION_TESTS OFF CACHE BOOL "Build tests")
+	SET(RECASTNAVIGATION_EXAMPLES OFF CACHE BOOL "Build examples")
+	ADD_SUBDIRECTORY(submodules/recastnavigation)
 ENDIF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS OR EQEMU_BUILD_HC)
+
 IF(EQEMU_BUILD_SERVER)
 	ADD_SUBDIRECTORY(shared_memory)
 	ADD_SUBDIRECTORY(world)
@@ -321,6 +365,7 @@ IF(EQEMU_BUILD_SERVER)
 	ADD_SUBDIRECTORY(queryserv)
 	ADD_SUBDIRECTORY(eqlaunch)
 ENDIF(EQEMU_BUILD_SERVER)
+
 IF(EQEMU_BUILD_LOGIN)
 	ADD_SUBDIRECTORY(loginserver)
 ENDIF(EQEMU_BUILD_LOGIN)

client_files/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 add_subdirectory(import)
 add_subdirectory(export)

client_files/export/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(export_sources
 	main.cpp

client_files/export/main.cpp

@@ -22,21 +22,17 @@
 #include "../../common/global_define.h"
 #include "../../common/shareddb.h"
 #include "../../common/eqemu_config.h"
-#include "../../common/platform.h"
 #include "../../common/crash.h"
 #include "../../common/rulesys.h"
 #include "../../common/string_util.h"
 
-EQEmuLogSys LogSys;
-
 void ExportSpells(SharedDatabase *db);
 void ExportSkillCaps(SharedDatabase *db);
 void ExportBaseData(SharedDatabase *db);
 void ExportDBStrings(SharedDatabase *db);
 
 int main(int argc, char **argv) {
-	RegisterExecutablePlatform(ExePlatformClientExport);
-	LogSys.LoadLogSettingsDefaults();
+	EQEmuLogSys::Get()->LoadLogSettingsDefaults("client_export");
 	set_exception_handler();
 
 	LogInfo("Client Files Export Utility");
@@ -56,8 +52,8 @@ int main(int argc, char **argv) {
 	}
 
 	/* Register Log System and Settings */
-	database.LoadLogSettings(LogSys.log_settings);
-	LogSys.StartFileLogs();
+	database.LoadLogSettings(EQEmuLogSys::Get()->log_settings);
+	EQEmuLogSys::Get()->StartFileLogs();
 
 	std::string arg_1;
 
@@ -87,7 +83,7 @@ int main(int argc, char **argv) {
 	ExportBaseData(&database);
 	ExportDBStrings(&database);
 
-	LogSys.CloseFileLogs();
+	EQEmuLogSys::Get()->CloseFileLogs();
 
 	return 0;
 }

client_files/import/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(import_sources
 	main.cpp

client_files/import/main.cpp

@@ -20,21 +20,17 @@
 #include "../../common/global_define.h"
 #include "../../common/shareddb.h"
 #include "../../common/eqemu_config.h"
-#include "../../common/platform.h"
 #include "../../common/crash.h"
 #include "../../common/rulesys.h"
 #include "../../common/string_util.h"
 
-EQEmuLogSys LogSys;
-
 void ImportSpells(SharedDatabase *db);
 void ImportSkillCaps(SharedDatabase *db);
 void ImportBaseData(SharedDatabase *db);
 void ImportDBStrings(SharedDatabase *db);
 
 int main(int argc, char **argv) {
-	RegisterExecutablePlatform(ExePlatformClientImport);
-	LogSys.LoadLogSettingsDefaults();
+	EQEmuLogSys::Get()->LoadLogSettingsDefaults("client_import");
 	set_exception_handler();
 
 	LogInfo("Client Files Import Utility");
@@ -54,15 +50,15 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
-	database.LoadLogSettings(LogSys.log_settings);
-	LogSys.StartFileLogs();
+	database.LoadLogSettings(EQEmuLogSys::Get()->log_settings);
+	EQEmuLogSys::Get()->StartFileLogs();
 
 	ImportSpells(&database);
 	ImportSkillCaps(&database);
 	ImportBaseData(&database);
 	ImportDBStrings(&database);
 
-	LogSys.CloseFileLogs();
+	EQEmuLogSys::Get()->CloseFileLogs();
 	
 	return 0;
 }

cmake/DependencyHelperMSVC.cmake

@@ -0,0 +1,94 @@
+OPTION(EQEMU_FETCH_MSVC_DEPENDENCIES_VCPKG "Automatically fetch vcpkg dependencies for MSCV" ON)
+OPTION(EQEMU_FETCH_MSVC_DEPENDENCIES_PERL "Automatically fetch perl dependencies for MSCV" ON)
+
+MARK_AS_ADVANCED(EQEMU_FETCH_MSVC_DEPENDENCIES_VCPKG)
+MARK_AS_ADVANCED(EQEMU_FETCH_MSVC_DEPENDENCIES_PERL)
+
+SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X86 "https://github.com/EQEmu/Server/releases/download/v1.2/vcpkg-export-x86.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X64 "https://github.com/EQEmu/Server/releases/download/v1.2/vcpkg-export-x64.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_PERL_X86 "http://strawberryperl.com/download/5.24.4.1/strawberry-perl-5.24.4.1-32bit-portable.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_PERL_X64 "http://strawberryperl.com/download/5.24.4.1/strawberry-perl-5.24.4.1-64bit-portable.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X86_ZIP "vcpkg-export-x86.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X64_ZIP "vcpkg-export-x64.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X86_DIR "vcpkg-export-x86")
+SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X64_DIR "vcpkg-export-x64")
+SET(EQEMU_MSVC_DEPENDENCIES_PERL_X86_ZIP "strawberry-perl-5.24.4.1-32bit-portable.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_PERL_X64_ZIP "strawberry-perl-5.24.4.1-64bit-portable.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_PERL_X86_DIR "x86")
+SET(EQEMU_MSVC_DEPENDENCIES_PERL_X64_DIR "x64")
+
+IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+	SET(EQEMU_VCPKG_URL ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X64})
+	SET(EQEMU_PERL_URL ${EQEMU_MSVC_DEPENDENCIES_PERL_X64})
+	SET(EQEMU_VCPKG_ZIP ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X64_ZIP})
+	SET(EQEMU_VCPKG_DIR ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X64_DIR})
+	SET(EQEMU_PERL_ZIP ${EQEMU_MSVC_DEPENDENCIES_PERL_X64_ZIP})
+	SET(EQEMU_PERL_DIR ${EQEMU_MSVC_DEPENDENCIES_PERL_X64_DIR})
+ELSE()
+	SET(EQEMU_VCPKG_URL ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X86})
+	SET(EQEMU_PERL_URL ${EQEMU_MSVC_DEPENDENCIES_PERL_X86})
+	SET(EQEMU_VCPKG_ZIP ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X86_ZIP})
+	SET(EQEMU_VCPKG_DIR ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X86_DIR})
+	SET(EQEMU_PERL_ZIP ${EQEMU_MSVC_DEPENDENCIES_PERL_X86_ZIP})
+	SET(EQEMU_PERL_DIR ${EQEMU_MSVC_DEPENDENCIES_PERL_X86_DIR})
+ENDIF()
+
+IF(EQEMU_FETCH_MSVC_DEPENDENCIES_VCPKG)
+	MESSAGE(STATUS "Resolving vcpkg dependencies...")
+	
+	IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/vcpkg/${EQEMU_VCPKG_ZIP})
+		EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/vcpkg)
+		
+		MESSAGE(STATUS "Downloading existing vcpkg dependencies from releases...")
+		FILE(DOWNLOAD ${EQEMU_VCPKG_URL} ${PROJECT_SOURCE_DIR}/vcpkg/${EQEMU_VCPKG_ZIP} 
+			SHOW_PROGRESS
+			STATUS DOWNLOAD_STATUS)
+			
+		LIST(GET DOWNLOAD_STATUS 0 STATUS_CODE)
+		IF(NOT STATUS_CODE EQUAL 0)
+			MESSAGE(FATAL_ERROR "Was unable to download dependencies from ${EQEMU_VCPKG_URL}")
+		ENDIF()
+		
+		MESSAGE(STATUS "Extracting files...")
+		EXECUTE_PROCESS(
+			COMMAND ${CMAKE_COMMAND} -E tar xzf ${PROJECT_SOURCE_DIR}/vcpkg/${EQEMU_VCPKG_ZIP}
+			WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vcpkg
+		)
+	ENDIF()
+	
+	INCLUDE(${PROJECT_SOURCE_DIR}/vcpkg/${EQEMU_VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake)
+ENDIF()
+
+IF(EQEMU_FETCH_MSVC_DEPENDENCIES_PERL)
+	#Try to find perl first, (so you can use your active install first)
+	FIND_PACKAGE(PerlLibs)
+	
+	IF(NOT PerlLibs_FOUND)
+		MESSAGE(STATUS "Resolving perl dependencies...")
+		
+		IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_ZIP})
+			EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/perl)
+			EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR})
+			
+			MESSAGE(STATUS "Downloading portable perl...")
+			FILE(DOWNLOAD ${EQEMU_PERL_URL} ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_ZIP} 
+				SHOW_PROGRESS
+				STATUS DOWNLOAD_STATUS)
+				
+			LIST(GET DOWNLOAD_STATUS 0 STATUS_CODE)
+			IF(NOT STATUS_CODE EQUAL 0)
+				MESSAGE(FATAL_ERROR "Was unable to download dependencies from ${EQEMU_PERL_URL}")
+			ENDIF()
+			
+			MESSAGE(STATUS "Extracting files...")
+			EXECUTE_PROCESS(
+				COMMAND ${CMAKE_COMMAND} -E tar xzf ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_ZIP}
+				WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}
+			)
+		ENDIF()
+		
+		SET(PERL_EXECUTABLE ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}/perl/bin/perl.exe CACHE FILEPATH "Path to perl program" FORCE)
+		SET(PERL_INCLUDE_PATH ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}/perl/lib/CORE CACHE PATH "Path to perl include files" FORCE)
+		SET(PERL_LIBRARY ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}/perl/lib/CORE/libperl524.a CACHE FILEPATH "Path to perl library" FORCE)
+	ENDIF()
+ENDIF()

cmake/FindEQLua51.cmake

@@ -1,124 +0,0 @@
-#CMake - Cross Platform Makefile Generator
-#Copyright 2000-2011 Kitware, Inc., Insight Software Consortium
-#All rights reserved.
-#
-#Redistribution and use in source and binary forms, with or without
-#modification, are permitted provided that the following conditions
-#are met:
-#
-#* Redistributions of source code must retain the above copyright
-#  notice, this list of conditions and the following disclaimer.
-#
-#* Redistributions in binary form must reproduce the above copyright
-#  notice, this list of conditions and the following disclaimer in the
-#  documentation and/or other materials provided with the distribution.
-#
-#* Neither the names of Kitware, Inc., the Insight Software Consortium,
-#  nor the names of their contributors may be used to endorse or promote
-#  products derived from this software without specific prior written
-#  permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-#HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-#DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-#THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-#(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# This module defines
-#  LUA51_FOUND, if false, do not try to link to Lua
-#  LUA_LIBRARIES
-#  LUA_INCLUDE_DIR, where to find lua.h
-#  LUA_VERSION_STRING, the version of Lua found (since CMake 2.8.8)
-
-IF(LUA_ROOT)
-	FIND_PATH(LUA_INCLUDE_DIR
-		NAMES lua.h
-		HINTS
-			ENV LUA_DIR
-		PATHS
-		${LUA_ROOT}
-		~/Library/Frameworks
-		/Library/Frameworks
-		/sw
-		/opt/local
-		/opt/csw
-		/opt
-		PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include src
-	)
-	
-	FIND_LIBRARY(LUA_LIBRARY
-		NAMES lua51 lua5.1 lua-5.1 lua
-		HINTS
-			ENV LUA_DIR
-		PATHS
-		${LUA_ROOT}
-		~/Library/Frameworks
-		/Library/Frameworks
-		/sw
-		/opt/local
-		/opt/csw
-		/opt
-		PATH_SUFFIXES lib bin
-	)
-ELSE(LUA_ROOT)
-	FIND_PATH(LUA_INCLUDE_DIR
-		NAMES lua.h
-		HINTS
-			ENV LUA_DIR
-		PATHS
-		~/Library/Frameworks
-		/Library/Frameworks
-		/sw
-		/opt/local
-		/opt/csw
-		/opt
-		PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include
-	)
-	
-	FIND_LIBRARY(LUA_LIBRARY
-		NAMES lua51 lua5.1 lua-5.1 lua
-		HINTS
-			ENV LUA_DIR
-		PATHS
-		~/Library/Frameworks
-		/Library/Frameworks
-		/sw
-		/opt/local
-		/opt/csw
-		/opt
-		PATH_SUFFIXES lib bin
-	)
-ENDIF(LUA_ROOT)
-
-IF(LUA_LIBRARY)
-	# include the math library for Unix
-	IF(UNIX AND NOT APPLE)
-		FIND_LIBRARY(LUA_MATH_LIBRARY m)
-	SET(LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
-	# For Windows and Mac, don't need to explicitly include the math library
-	ELSE()
-		SET( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
-	ENDIF()
-ENDIF()
-
-IF(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
-	FILE(STRINGS "${LUA_INCLUDE_DIR}/lua.h" lua_version_str REGEX "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua .+\"")
-
-	STRING(REGEX REPLACE "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([^\"]+)\".*" "\\1" LUA_VERSION_STRING "${lua_version_str}")
-	UNSET(lua_version_str)
-ENDIF()
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua51
-                                  REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
-                                  VERSION_VAR LUA_VERSION_STRING)
-
-MARK_AS_ADVANCED(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY)
-
-

cmake/FindLua51.cmake

@@ -0,0 +1,91 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+# Modified from the FindLua51 that comes with CMake
+
+#[=======================================================================[.rst:
+FindLua51
+---------
+
+
+
+Locate Lua51 library This module defines
+
+::
+
+  LUA51_FOUND, if false, do not try to link to Lua
+  LUA_LIBRARIES
+  LUA_INCLUDE_DIR, where to find lua.h
+  LUA_VERSION_STRING, the version of Lua found (since CMake 2.8.8)
+
+
+
+Note that the expected include convention is
+
+::
+
+  #include "lua.h"
+
+and not
+
+::
+
+  #include <lua/lua.h>
+
+This is because, the lua location is not standardized and may exist in
+locations other than lua/
+#]=======================================================================]
+
+find_path(LUA_INCLUDE_DIR lua.h
+  HINTS
+    ENV LUA_DIR
+  PATH_SUFFIXES include/lua51 include/lua5.1 include/lua-5.1 include/lua include/luajit include
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
+)
+
+find_library(LUA_LIBRARY
+  NAMES lua51 lua5.1 lua-5.1 lua luajit
+  HINTS
+    ENV LUA_DIR
+  PATH_SUFFIXES lib
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+)
+
+if(LUA_LIBRARY)
+  # include the math library for Unix
+  if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
+    find_library(LUA_MATH_LIBRARY m)
+    set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
+  # For Windows and Mac, don't need to explicitly include the math library
+  else()
+    set( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
+  endif()
+endif()
+
+if(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
+  file(STRINGS "${LUA_INCLUDE_DIR}/lua.h" lua_version_str REGEX "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua .+\"")
+
+  string(REGEX REPLACE "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([^\"]+)\".*" "\\1" LUA_VERSION_STRING "${lua_version_str}")
+  unset(lua_version_str)
+endif()
+
+include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
+# handle the QUIETLY and REQUIRED arguments and set LUA51_FOUND to TRUE if
+# all listed variables are TRUE
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua51
+                                  REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
+                                  VERSION_VAR LUA_VERSION_STRING)
+
+mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY)
+

cmake/FindMariaDB.cmake

@@ -0,0 +1,87 @@
+# - Find mariadbclient
+#
+# -*- cmake -*-
+#
+# Find the native MariaDB includes and library
+#
+#	MariaDB_INCLUDE_DIR	- where to find mysql.h, etc.
+#	MariaDB_LIBRARIES		- List of libraries when using MariaDB.
+#	MariaDB_FOUND			- True if MariaDB found.
+#	The following can be used as a hint as to where to search:
+#	MARIADB_ROOT
+
+IF (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARIES)
+	# Already in cache, be silent
+	SET(MariaDB_FIND_QUIETLY TRUE)
+ENDIF (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARIES)
+
+# Include dir
+IF(MARIADB_ROOT)
+	FIND_PATH(MariaDB_INCLUDE_DIR
+		NAMES mariadb_version.h
+		PATHS ${MARIADB_ROOT}/include
+		PATH_SUFFIXES mysql mariadb
+		NO_DEFAULT_PATH
+		NO_SYSTEM_ENVIRONMENT_PATH
+	)
+	FIND_PATH(MariaDB_INCLUDE_DIR
+		NAMES mariadb_version.h
+		PATH_SUFFIXES mysql mariadb
+	)
+ELSE(MARIADB_ROOT)
+	FIND_PATH(MariaDB_INCLUDE_DIR
+		NAMES mariadb_version.h
+		PATH_SUFFIXES mysql mariadb
+	)
+ENDIF(MARIADB_ROOT)
+
+# Library
+SET(MariaDB_NAMES libmariadb)
+IF(MARIADB_ROOT)
+	FIND_LIBRARY(MariaDB_LIBRARY
+		NAMES ${MariaDB_NAMES}
+		PATHS ${MARIADB_ROOT}/lib
+		PATH_SUFFIXES mysql mariadb
+		NO_DEFAULT_PATH
+		NO_SYSTEM_ENVIRONMENT_PATH
+	)
+	
+	FIND_LIBRARY(MariaDB_LIBRARY
+		NAMES ${MariaDB_NAMES}
+		PATH_SUFFIXES mysql mariadb
+	)
+ELSE(MARIADB_ROOT)
+	FIND_LIBRARY(MariaDB_LIBRARY
+		NAMES ${MariaDB_NAMES} mariadbclient_r mariadbclient
+		PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64
+		PATH_SUFFIXES mysql mariadb
+	)
+ENDIF(MARIADB_ROOT)
+
+IF (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARY)
+	SET(MariaDB_FOUND TRUE)
+	SET(MariaDB_LIBRARIES ${MariaDB_LIBRARY})
+ELSE (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARY)
+	SET(MariaDB_FOUND FALSE)
+	SET(MariaDB_LIBRARIES)
+ENDIF (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARY)
+
+
+# handle the QUIETLY and REQUIRED arguments and set MariaDB_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MariaDB DEFAULT_MSG MariaDB_LIBRARY MariaDB_INCLUDE_DIR)
+
+IF(MariaDB_FOUND)
+	SET( MariaDB_LIBRARY_RELEASE ${MariaDB_LIBRARY} )
+	SET( MariaDB_LIBRARY_DEBUG ${MariaDB_LIBRARY} )
+	SET( MariaDB_LIBRARIES ${MariaDB_LIBRARY_RELEASE} ${MariaDB_LIBRARY_DEBUG} )
+ELSE(MariaDB_FOUND)
+	SET( MariaDB_LIBRARIES )
+ENDIF(MariaDB_FOUND)
+
+MARK_AS_ADVANCED(
+	MariaDB_LIBRARY_DEBUG
+	MariaDB_LIBRARY_RELEASE
+	MariaDB_INCLUDE_DIR
+	)

cmake/FindmbedTLS.cmake

@@ -0,0 +1,93 @@
+# - Try to find mbedTLS
+# Once done this will define
+#
+# Read-Only variables
+#  MBEDTLS_FOUND - system has mbedTLS
+#  MBEDTLS_INCLUDE_DIR - the mbedTLS include directory
+#  MBEDTLS_LIBRARY_DIR - the mbedTLS library directory
+#  MBEDTLS_LIBRARIES - Link these to use mbedTLS
+#  MBEDTLS_LIBRARY - path to mbedTLS library
+#  MBEDX509_LIBRARY - path to mbedTLS X.509 library
+#  MBEDCRYPTO_LIBRARY - path to mbedTLS Crypto library
+#
+# Hint
+#  MBEDTLS_ROOT_DIR can be pointed to a local mbedTLS installation.
+
+SET(_MBEDTLS_ROOT_HINTS
+    ${MBEDTLS_ROOT_DIR}
+    ENV MBEDTLS_ROOT_DIR
+)
+
+SET(_MBEDTLS_ROOT_HINTS_AND_PATHS
+    HINTS ${_MBEDTLS_ROOT_HINTS}
+    PATHS ${_MBEDTLS_ROOT_PATHS}
+)
+
+FIND_PATH(MBEDTLS_INCLUDE_DIR
+    NAMES mbedtls/version.h
+    ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
+    PATH_SUFFIXES include
+)
+
+IF(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARIES)
+    # Already in cache, be silent
+    SET(MBEDTLS_FIND_QUIETLY TRUE)
+ENDIF()
+
+FIND_LIBRARY(MBEDTLS_LIBRARY
+    NAMES mbedtls libmbedtls
+    ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
+    PATH_SUFFIXES library
+)
+FIND_LIBRARY(MBEDX509_LIBRARY
+    NAMES mbedx509 libmbedx509
+    ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
+    PATH_SUFFIXES library
+)
+FIND_LIBRARY(MBEDCRYPTO_LIBRARY
+    NAMES mbedcrypto libmbedcrypto
+    ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
+    PATH_SUFFIXES library
+)
+
+IF(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARY AND MBEDX509_LIBRARY AND MBEDCRYPTO_LIBRARY)
+     SET(MBEDTLS_FOUND TRUE)
+ENDIF()
+
+IF(MBEDTLS_FOUND)
+    # split mbedTLS into -L and -l linker options, so we can set them for pkg-config
+    GET_FILENAME_COMPONENT(MBEDTLS_LIBRARY_DIR ${MBEDTLS_LIBRARY} PATH)
+    GET_FILENAME_COMPONENT(MBEDTLS_LIBRARY_FILE ${MBEDTLS_LIBRARY} NAME_WE)
+    GET_FILENAME_COMPONENT(MBEDX509_LIBRARY_FILE ${MBEDX509_LIBRARY} NAME_WE)
+    GET_FILENAME_COMPONENT(MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY} NAME_WE)
+    STRING(REGEX REPLACE "^lib" "" MBEDTLS_LIBRARY_FILE ${MBEDTLS_LIBRARY_FILE})
+    STRING(REGEX REPLACE "^lib" "" MBEDX509_LIBRARY_FILE ${MBEDX509_LIBRARY_FILE})
+    STRING(REGEX REPLACE "^lib" "" MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY_FILE})
+    SET(MBEDTLS_LIBRARIES "-L${MBEDTLS_LIBRARY_DIR} -l${MBEDTLS_LIBRARY_FILE} -l${MBEDX509_LIBRARY_FILE} -l${MBEDCRYPTO_LIBRARY_FILE}")
+
+    IF(NOT MBEDTLS_FIND_QUIETLY)
+        MESSAGE(STATUS "Found mbedTLS:")
+        FILE(READ ${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h MBEDTLSCONTENT)
+        STRING(REGEX MATCH "MBEDTLS_VERSION_STRING +\"[0-9|.]+\"" MBEDTLSMATCH ${MBEDTLSCONTENT})
+        IF (MBEDTLSMATCH)
+            STRING(REGEX REPLACE "MBEDTLS_VERSION_STRING +\"([0-9|.]+)\"" "\\1" MBEDTLS_VERSION ${MBEDTLSMATCH})
+            MESSAGE(STATUS "  version ${MBEDTLS_VERSION}")
+        ENDIF(MBEDTLSMATCH)
+        MESSAGE(STATUS "  TLS: ${MBEDTLS_LIBRARY}")
+        MESSAGE(STATUS "  X509: ${MBEDX509_LIBRARY}")
+        MESSAGE(STATUS "  Crypto: ${MBEDCRYPTO_LIBRARY}")
+    ENDIF(NOT MBEDTLS_FIND_QUIETLY)
+ELSE(MBEDTLS_FOUND)
+    IF(MBEDTLS_FIND_REQUIRED)
+        MESSAGE(FATAL_ERROR "Could not find mbedTLS")
+    ENDIF(MBEDTLS_FIND_REQUIRED)
+ENDIF(MBEDTLS_FOUND)
+
+MARK_AS_ADVANCED(
+    MBEDTLS_INCLUDE_DIR
+    MBEDTLS_LIBRARY_DIR
+    MBEDTLS_LIBRARIES
+    MBEDTLS_LIBRARY
+    MBEDX509_LIBRARY
+    MBEDCRYPTO_LIBRARY
+)

common/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(common_sources
 	base_packet.cpp
@@ -73,7 +73,6 @@ SET(common_sources
 	textures.cpp
 	timer.cpp
 	unix.cpp
-	platform.cpp
 	json/jsoncpp.cpp
 	net/console_server.cpp
 	net/console_server_connection.cpp
@@ -122,6 +121,7 @@ SET(common_headers
 	cli/terminal_color.hpp
 	data_verification.h
 	database.h
+	database_schema.h
 	dbcore.h
 	deity.h
 	emu_constants.h
@@ -183,7 +183,6 @@ SET(common_headers
 	packet_dump.h
 	packet_dump_file.h
 	packet_functions.h
-	platform.h
 	proc_launcher.h
 	profanity_manager.h
 	profiler.h

common/classes.cpp

@@ -573,6 +573,20 @@ bool IsNonSpellFighterClass(uint8 class_id)
 	}
 }
 
+bool IsHybridClass(uint8 class_id)
+{
+	switch (class_id) {
+	case PALADIN:
+	case RANGER:
+	case SHADOWKNIGHT:
+	case BARD:
+	case BEASTLORD:
+		return true;
+	default:
+		return false;
+	}
+}
+
 bool IsCasterClass(uint8 class_id)
 {
 	switch (class_id) {

common/classes.h

@@ -135,6 +135,7 @@ uint8 GetClassIDFromPlayerClassBit(uint32 player_class_bit);
 bool IsFighterClass(uint8 class_id);
 bool IsSpellFighterClass(uint8 class_id);
 bool IsNonSpellFighterClass(uint8 class_id);
+bool IsHybridClass(uint8 class_id);
 bool IsCasterClass(uint8 class_id);
 bool IsINTCasterClass(uint8 class_id);
 bool IsWISCasterClass(uint8 class_id);

common/cli/eqemu_command_handler.cpp

@@ -21,7 +21,6 @@
 #include <fmt/format.h>
 #include "eqemu_command_handler.h"
 #include "terminal_color.hpp"
-#include "../platform.h"
 
 namespace EQEmuCommand {
 
@@ -38,10 +37,6 @@ namespace EQEmuCommand {
 	void DisplayDebug(argh::parser &cmd)
 	{
 		if (cmd[{"-d", "--debug"}]) {
-			std::cout << "Positional args:\n";
-			for (auto &pos_arg : cmd)
-				std::cout << '\t' << pos_arg << std::endl;
-
 			std::cout << "Positional args:\n";
 			for (auto &pos_arg : cmd.pos_args())
 				std::cout << '\t' << pos_arg << std::endl;
@@ -73,29 +68,37 @@ namespace EQEmuCommand {
 	{
 		bool arguments_filled = true;
 
+		int index = 2;
 		for (auto &arg : arguments) {
-			if (cmd(arg).str().empty()) {
+			if (cmd(arg).str().empty() && cmd(index).str().empty()) {
 				arguments_filled = false;
 			}
+			index++;
 		}
 
 		if (!arguments_filled || argc == 2) {
 			std::string arguments_string;
 			for (auto &arg : arguments) {
-				arguments_string += "  " + arg + "=*\n";
+				arguments_string += " " + arg;
 			}
 
 			std::string options_string;
-			for (auto &opt : options) {
+			for (auto   &opt : options) {
 				options_string += "  " + opt + "\n";
 			}
 
-			std::cout << fmt::format(
-				"Command\n\n{0} \n\nArgs\n{1}\nOptions\n{2}",
-				argv[1],
-				arguments_string,
-				options_string
-			) << std::endl;
+			std::stringstream command_string;
+
+			command_string <<
+						   termcolor::colorize <<
+						   termcolor::yellow <<
+						   "\nCommand" <<
+						   termcolor::reset << "\n\n" <<
+						   termcolor::green << argv[1] << arguments_string << termcolor::reset << "\n" <<
+						   termcolor::yellow << (!options_string.empty() ? "\nOptions\n" : "") <<
+						   termcolor::reset << termcolor::cyan << options_string << termcolor::reset;
+
+			std::cout << command_string.str() << std::endl;
 
 			exit(1);
 		}
@@ -115,6 +118,7 @@ namespace EQEmuCommand {
 			std::string &description
 		)> &in_function_map,
 		argh::parser &cmd,
+		const std::string& platform,
 		int argc,
 		char **argv
 	)
@@ -123,10 +127,6 @@ namespace EQEmuCommand {
 		bool        ran_command = false;
 		for (auto   &it: in_function_map) {
 			if (it.first == argv[1]) {
-				std::cout << std::endl;
-				std::cout << "> " << termcolor::cyan << "Executing CLI Command" << termcolor::reset << std::endl;
-				std::cout << std::endl;
-
 				(it.second)(argc, argv, cmd, description);
 				ran_command = true;
 			}
@@ -137,7 +137,7 @@ namespace EQEmuCommand {
 			std::cout <<
 					  "> " <<
 					  termcolor::yellow <<
-					  "EQEmulator [" + GetPlatformName() + "] CLI Menu" <<
+					  "EQEmulator [" + platform + "] CLI Menu" <<
 					  termcolor::reset
 					  << std::endl
 					  << std::endl;
@@ -182,12 +182,13 @@ namespace EQEmuCommand {
 			}
 
 			std::cout << std::endl;
-		}
-		else if	(!ran_command) {
-			std::cerr << "Unknown command [" << argv[1] << "] ! Try --help" << std::endl;
+
+			std::exit(1);
 		}
 
-		exit(1);
+		if (ran_command) {
+			std::exit(1);
+		}
 	}
 
 }

common/cli/eqemu_command_handler.h

@@ -66,6 +66,7 @@ namespace EQEmuCommand {
 			std::string &description
 		)> &in_function_map,
 		argh::parser &cmd,
+		const std::string &platform,
 		int argc,
 		char **argv
 	);

common/database.cpp

@@ -97,7 +97,7 @@ uint32 Database::CheckLogin(const char* name, const char* password, const char *
 	DoEscapeString(tmpUN, name, strlen(name));
 	DoEscapeString(tmpPW, password, strlen(password));
 
-	std::string query = StringFormat("SELECT id, status FROM account WHERE name='%s' AND ls_id='%s' AND password is not null "
+	std::string query = StringFormat("SELECT id, status FROM account WHERE `name`='%s' AND ls_id='%s' AND password is not null "
 		"and length(password) > 0 and (password='%s' or password=MD5('%s'))",
 		tmpUN, EscapeString(loginserver).c_str(), tmpPW, tmpPW);
 
@@ -124,7 +124,7 @@ uint32 Database::CheckLogin(const char* name, const char* password, const char *
 //Get Banned IP Address List - Only return false if the incoming connection's IP address is not present in the banned_ips table.
 bool Database::CheckBannedIPs(const char* loginIP)
 {
-	std::string query = StringFormat("SELECT ip_address FROM Banned_IPs WHERE ip_address='%s'", loginIP);
+	std::string query = StringFormat("SELECT ip_address FROM banned_ips WHERE ip_address='%s'", loginIP);
 
 	auto results = QueryDatabase(query);
 
@@ -140,7 +140,7 @@ bool Database::CheckBannedIPs(const char* loginIP)
 }
 
 bool Database::AddBannedIP(char* bannedIP, const char* notes) {
-	std::string query = StringFormat("INSERT into Banned_IPs SET ip_address='%s', notes='%s'", bannedIP, notes);
+	std::string query = StringFormat("INSERT into banned_ips SET ip_address='%s', notes='%s'", bannedIP, notes);
 	auto results = QueryDatabase(query);
 	if (!results.Success()) {
 		return false;
@@ -251,7 +251,7 @@ uint32 Database::CreateAccount(
 }
 
 bool Database::DeleteAccount(const char* name, const char *loginserver) {
-	std::string query = StringFormat("DELETE FROM account WHERE name='%s' AND ls_id='%s'", name, loginserver);
+	std::string query = StringFormat("DELETE FROM account WHERE `name`='%s' AND ls_id='%s'", name, loginserver);
 	LogInfo("Account Attempting to be deleted:'[{}]:[{}]'", loginserver, name);
 
 	auto results = QueryDatabase(query);
@@ -293,6 +293,37 @@ bool Database::SetAccountStatus(const char* name, int16 status) {
 	return true;
 }
 
+/**
+ * @param account_name
+ * @param status
+ * @return
+ */
+bool Database::SetAccountStatus(const std::string& account_name, int16 status)
+{
+	LogInfo("Account [{}] is attempting to be set to status [{}]", account_name, status);
+
+	std::string query = fmt::format(
+		SQL(
+			UPDATE account SET status = {} WHERE name = '{}'
+		),
+		status,
+		account_name
+	);
+
+	auto results = QueryDatabase(query);
+
+	if (!results.Success()) {
+		return false;
+	}
+
+	if (results.RowsAffected() == 0) {
+		LogWarning("Account [{}] does not exist!", account_name);
+		return false;
+	}
+
+	return true;
+}
+
 /* This initially creates the character during character create */
 bool Database::ReserveName(uint32 account_id, char* name) {
 	std::string query = StringFormat("SELECT `account_id`, `name` FROM `character_data` WHERE `name` = '%s'", name);
@@ -652,6 +683,7 @@ bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, Playe
 		pp->RestTimer					  // " RestTimer)                 "
 	);
 	auto results = QueryDatabase(query);
+
 	/* Save Bind Points */
 	query = StringFormat("REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, slot)"
 		" VALUES (%u, %u, %u, %f, %f, %f, %f, %i), "
@@ -1226,7 +1258,7 @@ uint32 Database::GetAccountIDFromLSID(
 {
 	uint32 account_id = 0;
 	auto query = fmt::format(
-		"SELECT id, name, status FROM account WHERE lsaccount_id = {0} AND ls_id = '{1}'",
+		"SELECT id, `name`, status FROM account WHERE lsaccount_id = {0} AND ls_id = '{1}'",
 		in_loginserver_account_id,
 		in_loginserver_id
 	);
@@ -1257,7 +1289,7 @@ uint32 Database::GetAccountIDFromLSID(
 
 void Database::GetAccountFromID(uint32 id, char* oAccountName, int16* oStatus) {
 
-	std::string query = StringFormat("SELECT name, status FROM account WHERE id=%i", id);
+	std::string query = StringFormat("SELECT `name`, status FROM account WHERE id=%i", id);
 	auto results = QueryDatabase(query);
 
 	if (!results.Success()){
@@ -2163,7 +2195,7 @@ void Database::LoadLogSettings(EQEmuLogSys::LogSettings *log_settings)
 		 * If we go through this whole loop and nothing is set to any debug level, there is no point to create a file or keep anything open
 		 */
 		if (log_settings[log_category_id].log_to_file > 0) {
-			LogSys.file_logs_enabled = true;
+			EQEmuLogSys::Get()->file_logs_enabled = true;
 		}
 
 		categories_in_database[log_category_id] = 1;

common/database.h

@@ -120,7 +120,7 @@ public:
 
 	/* General Information Queries */
 
-	bool	AddBannedIP(char* bannedIP, const char* notes); //Add IP address to the Banned_IPs table.
+	bool	AddBannedIP(char* bannedIP, const char* notes); //Add IP address to the banned_ips table.
 	bool	AddGMIP(char* ip_address, char* name);
 	bool	CheckBannedIPs(const char* loginIP); //Check incoming connection against banned IP table.
 	bool	CheckGMIPs(const char* loginIP, uint32 account_id);
@@ -179,6 +179,7 @@ public:
 	bool	DeleteAccount(const char *name, const char* loginserver);
 	bool	GetLiveChar(uint32 account_id, char* cname);
 	bool	SetAccountStatus(const char* name, int16 status);
+	bool	SetAccountStatus(const std::string& account_name, int16 status);
 	bool	SetLocalPassword(uint32 accid, const char* password);
 	bool	UpdateLiveChar(char* charname, uint32 account_id);
 

common/database_schema.h

@@ -0,0 +1,296 @@
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef EQEMU_DATABASE_SCHEMA_H
+#define EQEMU_DATABASE_SCHEMA_H
+
+#include <vector>
+
+namespace DatabaseSchema {
+
+	/**
+	 * Gets player tables
+	 *
+	 * @return
+	 */
+	static std::vector<std::string> GetPlayerTables()
+	{
+		std::vector<std::string> tables = {
+			"aa_timers",
+			"account",
+			"account_ip",
+			"account_flags",
+			"account_rewards",
+			"adventure_details",
+			"adventure_stats",
+			"buyer",
+			"char_recipe_list",
+			"character_activities",
+			"character_alt_currency",
+			"character_alternate_abilities",
+			"character_auras",
+			"character_bandolier",
+			"character_bind",
+			"character_buffs",
+			"character_corpse_items",
+			"character_corpses",
+			"character_currency",
+			"character_data",
+			"character_disciplines",
+			"character_enabledtasks",
+			"character_inspect_messages",
+			"character_item_recast",
+			"character_languages",
+			"character_leadership_abilities",
+			"character_material",
+			"character_memmed_spells",
+			"character_pet_buffs",
+			"character_pet_info",
+			"character_pet_inventory",
+			"character_potionbelt",
+			"character_skills",
+			"character_spells",
+			"character_tasks",
+			"character_tribute",
+			"completed_tasks",
+			"data_buckets",
+			"faction_values",
+			"friends",
+			"guild_bank",
+			"guild_members",
+			"guild_ranks",
+			"guild_relations",
+			"guilds",
+			"instance_list_player",
+			"inventory",
+			"inventory_snapshots",
+			"keyring",
+			"mail",
+			"player_titlesets",
+			"quest_globals",
+			"sharedbank",
+			"timers",
+			"titles",
+			"trader",
+			"trader_audit",
+			"zone_flags"
+		};
+
+		return tables;
+	}
+
+	/**
+	 * Gets content tables
+	 *
+	 * @return
+	 */
+	static std::vector<std::string> GetContentTables()
+	{
+		std::vector<std::string> tables = {
+			"aa_ability",
+			"aa_actions",
+			"aa_effects",
+			"aa_rank_effects",
+			"aa_rank_prereqs",
+			"aa_ranks",
+			"aa_required_level_cost",
+			"adventure_template",
+			"adventure_template_entry",
+			"adventure_template_entry_flavor",
+			"altadv_vars",
+			"alternate_currency",
+			"auras",
+			"base_data",
+			"blocked_spells",
+			"books",
+			"char_create_combinations",
+			"char_create_point_allocations",
+			"class_skill",
+			"damageshieldtypes",
+			"doors",
+			"faction_base_data",
+			"faction_list",
+			"faction_list_mod",
+			"fear_hints",
+			"fishing",
+			"forage",
+			"global_loot",
+			"goallists",
+			"graveyard",
+			"grid",
+			"grid_entries",
+			"ground_spawns",
+			"horses",
+			"instance_list",
+			"items",
+			"ldon_trap_entries",
+			"ldon_trap_templates",
+			"lootdrop",
+			"lootdrop_entries",
+			"loottable",
+			"loottable_entries",
+			"merchantlist",
+			"npc_emotes",
+			"npc_faction",
+			"npc_faction_entries",
+			"npc_scale_global_base",
+			"npc_spells",
+			"npc_spells_effects",
+			"npc_spells_effects_entries",
+			"npc_spells_entries",
+			"npc_types",
+			"npc_types_metadata",
+			"npc_types_tint",
+			"object",
+			"pets",
+			"pets_equipmentset",
+			"pets_equipmentset_entries",
+			"proximities",
+			"races",
+			"skill_caps",
+			"spawn2",
+			"spawn_condition_values",
+			"spawn_conditions",
+			"spawn_events",
+			"spawnentry",
+			"spawngroup",
+			"spells_new",
+			"start_zones",
+			"starting_items",
+			"task_activities",
+			"tasks",
+			"tasksets",
+			"titles",
+			"tradeskill_recipe",
+			"tradeskill_recipe_entries",
+			"traps",
+			"tribute_levels",
+			"tributes",
+			"veteran_reward_templates",
+			"zone",
+			"zone_points",
+			"zone_server",
+			"zoneserver_auth",
+		};
+
+		return tables;
+	}
+
+	/**
+	 * Gets server tables
+	 *
+	 * @return
+	 */
+	static std::vector<std::string> GetServerTables()
+	{
+		std::vector<std::string> tables = {
+			"banned_ips",
+			"bugs",
+			"bug_reports",
+			"command_settings",
+			"db_str",
+			"discovered_items",
+			"eqtime",
+			"eventlog",
+			"gm_ips",
+			"hackers",
+			"ip_exemptions",
+			"launcher",
+			"launcher_zones",
+			"level_exp_mods",
+			"logsys_categories",
+			"name_filter",
+			"perl_event_export_settings",
+			"petitions",
+			"profanity_list",
+			"reports",
+			"rule_sets",
+			"rule_values",
+			"saylink",
+			"variables",
+		};
+
+		return tables;
+	}
+
+	/**
+	 * Gets state tables
+	 * Tables that keep track of server state
+	 *
+	 * @return
+	 */
+	static std::vector<std::string> GetStateTables()
+	{
+		std::vector<std::string> tables = {
+			"adventure_members",
+			"chatchannels",
+			"group_id",
+			"group_leaders",
+			"item_tick",
+			"lfguild",
+			"merchantlist_temp",
+			"object_contents",
+			"raid_details",
+			"raid_leaders",
+			"raid_members",
+			"respawn_times",
+			"spell_buckets",
+			"spell_globals",
+		};
+
+		return tables;
+	}
+
+	/**
+	 * Gets login tables
+	 *
+	 * @return
+	 */
+	static std::vector<std::string> GetLoginTables()
+	{
+		std::vector<std::string> tables = {
+			"login_accounts",
+			"login_api_tokens",
+			"login_server_admins",
+			"login_server_list_types",
+			"login_world_servers",
+		};
+
+		return tables;
+	}
+
+	/**
+	 * Gets login tables
+	 *
+	 * @return
+	 */
+	static std::vector<std::string> GetVersionTables()
+	{
+		std::vector<std::string> tables = {
+			"db_version",
+			"inventory_versions",
+		};
+
+		return tables;
+	}
+
+}
+
+#endif //EQEMU_DATABASE_SCHEMA_H

common/dbcore.cpp

@@ -117,7 +117,7 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo
 
 		/* Implement Logging at the Root */
 		if (mysql_errno(&mysql) > 0 && strlen(query) > 0) {
-			if (LogSys.log_settings[Logs::MySQLError].is_category_enabled == 1)
+			if (EQEmuLogSys::Get()->log_settings[Logs::MySQLError].is_category_enabled == 1)
 				Log(Logs::General, Logs::MySQLError, "%i: %s \n %s", mysql_errno(&mysql), mysql_error(&mysql), query);
 		}
 
@@ -141,12 +141,12 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo
 		(uint32) mysql_insert_id(&mysql)
 	);
 
-	if (LogSys.log_settings[Logs::MySQLQuery].is_category_enabled == 1) {
+	if (EQEmuLogSys::Get()->log_settings[Logs::MySQLQuery].is_category_enabled == 1) {
 		if ((strncasecmp(query, "select", 6) == 0)) {
 			LogF(
 				Logs::General,
 				Logs::MySQLQuery,
-				"{0} ({1} row{2} returned) ({3}ms)",
+				"{0} ({1} row{2} returned) ({3}s)",
 				query,
 				requestResult.RowCount(),
 				requestResult.RowCount() == 1 ? "" : "s",
@@ -157,7 +157,7 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo
 			LogF(
 				Logs::General,
 				Logs::MySQLQuery,
-				"{0} ({1} row{2} affected) ({3}ms)",
+				"{0} ({1} row{2} affected) ({3}s)",
 				query,
 				requestResult.RowsAffected(),
 				requestResult.RowsAffected() == 1 ? "" : "s",

common/eq_packet.cpp

@@ -21,7 +21,6 @@
 #include "eq_packet.h"
 #include "misc.h"
 #include "op_codes.h"
-#include "platform.h"
 #include <iomanip>
 #include <iostream>
 #include <sstream>
@@ -154,52 +153,6 @@ void EQApplicationPacket::DumpRawHeaderNoTime(uint16 seq, FILE *to) const
 #endif
 }
 
-void EQRawApplicationPacket::build_raw_header_dump(char *buffer, uint16 seq) const
-{
-	BasePacket::build_raw_header_dump(buffer, seq);
-	buffer += strlen(buffer);
-
-#ifdef STATIC_OPCODE
-	buffer += sprintf(buffer, "[OpCode 0x%04x (0x%04x) Size=%u]\n", emu_opcode, opcode,size);
-#else
-	buffer += sprintf(buffer, "[OpCode %s (0x%04x) Size=%u]\n", OpcodeManager::EmuToName(emu_opcode), opcode,size);
-#endif
-}
-
-void EQRawApplicationPacket::DumpRawHeader(uint16 seq, FILE *to) const
-{
-	char buff[196];
-	build_raw_header_dump(buff, seq);
-	fprintf(to, "%s", buff);
-}
-
-void EQRawApplicationPacket::build_header_dump(char *buffer) const
-{
-#ifdef STATIC_OPCODE
-	sprintf(buffer, "[OpCode 0x%04x (0x%04x) Size=%u]\n", emu_opcode, opcode,size);
-#else
-	sprintf(buffer, "[OpCode %s (0x%04x) Size=%u]", OpcodeManager::EmuToName(emu_opcode), opcode,size);
-#endif
-}
-
-void EQRawApplicationPacket::DumpRawHeaderNoTime(uint16 seq, FILE *to) const
-{
-	if (src_ip) {
-		std::string sIP,dIP;;
-		sIP=long2ip(src_ip);
-		dIP=long2ip(dst_ip);
-		fprintf(to, "[%s:%d->%s:%d] ",sIP.c_str(),src_port,dIP.c_str(),dst_port);
-	}
-	if (seq != 0xffff)
-		fprintf(to, "[Seq=%u] ",seq);
-
-#ifdef STATIC_OPCODE
-	fprintf(to, "[OpCode 0x%04x (0x%04x) Size=%u]\n", emu_opcode, opcode,size);
-#else
-	fprintf(to, "[OpCode %s (0x%04x) Size=%lu]\n", OpcodeManager::EmuToName(emu_opcode), opcode,(unsigned long)size);
-#endif
-}
-
 uint32 EQProtocolPacket::serialize(unsigned char *dest) const
 {
 	if (opcode>0xff) {
@@ -456,52 +409,6 @@ EQApplicationPacket *EQApplicationPacket::Copy() const {
 	return(new EQApplicationPacket(*this));
 }
 
-EQRawApplicationPacket *EQProtocolPacket::MakeAppPacket() const {
-	auto res = new EQRawApplicationPacket(opcode, pBuffer, size);
-	res->copyInfo(this);
-	return(res);
-}
-
-EQRawApplicationPacket::EQRawApplicationPacket(uint16 opcode, const unsigned char *buf, const uint32 len)
-:	EQApplicationPacket(OP_Unknown, buf, len),
-	opcode(opcode)
-{
-}
-EQRawApplicationPacket::EQRawApplicationPacket(const unsigned char *buf, const uint32 len)
-: EQApplicationPacket(OP_Unknown, buf+sizeof(uint16), len-sizeof(uint16))
-{
-	if(GetExecutablePlatform() != ExePlatformUCS) {
-		opcode = *((const uint16 *) buf);
-		if(opcode == 0x0000)
-		{
-			if(len >= 3)
-			{
-				opcode = *((const uint16 *) (buf + 1));
-				const unsigned char *packet_start = (buf + 3);
-				const int32 packet_length = len - 3;
-				safe_delete_array(pBuffer);
-				if(packet_length >= 0)
-				{
-					size = packet_length;
-					pBuffer = new unsigned char[size];
-					memcpy(pBuffer, packet_start, size);
-				}
-				else
-				{
-					size = 0;
-				}
-			}
-			else
-			{
-				safe_delete_array(pBuffer);
-				size = 0;
-			}
-		}
-	} else {
-		opcode = *((const uint8 *) buf);
-	}
-}
-
 void DumpPacket(const EQApplicationPacket* app, bool iShowInfo) {
 	if (iShowInfo) {
 		std::cout << "Dumping Applayer: 0x" << std::hex << std::setfill('0') << std::setw(4) << app->GetOpcode() << std::dec;
@@ -515,4 +422,4 @@ std::string DumpPacketToString(const EQApplicationPacket* app){
 	std::ostringstream out;
 	out << DumpPacketHexToString(app->pBuffer, app->size);
 	return out.str();
-}
+}

common/eq_packet.h

@@ -19,7 +19,6 @@
 #define _EQPACKET_H
 
 #include "base_packet.h"
-#include "platform.h"
 #include <iostream>
 
 #ifdef STATIC_OPCODE
@@ -57,8 +56,6 @@ protected:
 
 };
 
-class EQRawApplicationPacket;
-
 class EQProtocolPacket : public BasePacket {
 	friend class EQStream;
 	friend class EQStreamPair;
@@ -68,7 +65,6 @@ public:
 	bool combine(const EQProtocolPacket *rhs);
 	uint32 serialize (unsigned char *dest) const;
 	EQProtocolPacket *Copy() { return new EQProtocolPacket(opcode,pBuffer,size); }
-	EQRawApplicationPacket *MakeAppPacket() const;
 
 	bool acked;
 	uint32 sent_time;
@@ -98,15 +94,15 @@ class EQApplicationPacket : public EQPacket {
 	friend class EQStream;
 public:
 	EQApplicationPacket() : EQPacket(OP_Unknown, nullptr, 0), opcode_bypass(0)
-		{ app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; }
+		{ app_opcode_size = 2; }
 	EQApplicationPacket(const EmuOpcode op) : EQPacket(op, nullptr, 0), opcode_bypass(0)
-		{ app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; }
+		{ app_opcode_size = 2; }
 	EQApplicationPacket(const EmuOpcode op, const uint32 len) : EQPacket(op, nullptr, len), opcode_bypass(0)
-		{ app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; }
+		{ app_opcode_size = 2; }
 	EQApplicationPacket(const EmuOpcode op, const unsigned char *buf, const uint32 len) : EQPacket(op, buf, len), opcode_bypass(0)
-		{ app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; }
+		{ app_opcode_size = 2; }
 	EQApplicationPacket(const EmuOpcode op, SerializeBuffer &buf) : EQPacket(op, buf), opcode_bypass(0)
-		{ app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; }
+		{ app_opcode_size = 2; }
 	bool combine(const EQApplicationPacket *rhs);
 	uint32 serialize (uint16 opcode, unsigned char *dest) const;
 	uint32 Size() const { return size+app_opcode_size; }
@@ -134,25 +130,6 @@ private:
 
 };
 
-class EQRawApplicationPacket : public EQApplicationPacket {
-	friend class EQStream;
-public:
-	EQRawApplicationPacket(uint16 opcode, const unsigned char *buf, const uint32 len);
-	uint16 GetRawOpcode() const { return(opcode); }
-
-	virtual void build_raw_header_dump(char *buffer, uint16 seq=0xffff) const;
-	virtual void build_header_dump(char *buffer) const;
-	virtual void DumpRawHeader(uint16 seq=0xffff, FILE *to = stdout) const;
-	virtual void DumpRawHeaderNoTime(uint16 seq=0xffff, FILE *to = stdout) const;
-
-protected:
-
-	//the actual raw EQ opcode
-	uint16 opcode;
-
-	EQRawApplicationPacket(const unsigned char *buf, const uint32 len);
-};
-
 extern void DumpPacket(const EQApplicationPacket* app, bool iShowInfo = false);
 extern std::string DumpPacketToString(const EQApplicationPacket* app);
 

common/eq_packet_structs.h

@@ -1358,21 +1358,24 @@ struct BecomeCorpse_Struct {
 */
 struct PlayerPositionUpdateServer_Struct
 {
-/*0000*/ uint16		spawn_id;
-/*0002*/ int32		delta_heading:10,	// change in heading
-					x_pos:19,			// x coord
-					padding0002:3;		// ***Placeholder
-/*0006*/ int32		y_pos:19,			// y coord
-					animation:10,		// animation
-					padding0006:3;		// ***Placeholder
-/*0010*/ int32		z_pos:19,			// z coord
-					delta_y:13;			// change in y
-/*0014*/ int32		delta_x:13,			// change in x
-					heading:12,			// heading
-					padding0014:7;		// ***Placeholder
-/*0018*/ int32		delta_z:13,			// change in z
-					padding0018:19;		// ***Placeholder
-/*0022*/
+/*0000*/	uint16		spawn_id;
+/*0002*/	uint16		vehicle_id;
+/*0004*/	signed		padding0004 : 12;
+			signed		y_pos : 19;			// y coord
+			unsigned	padding : 1;
+/*0008*/	signed		delta_z : 13;		// change in z
+			signed		delta_x : 13;		// change in x
+			signed		padding0008 : 6;
+/*0012*/	signed		x_pos : 19;			// x coord
+			unsigned	heading : 12;		// heading
+			signed		padding0016 : 1;
+/*0016*/	signed		delta_heading : 10;	// change in heading
+			signed		z_pos : 19;			// z coord
+			signed		padding0020 : 3;
+/*0020*/	signed		animation : 10;		// animation
+			signed		delta_y : 13;		// change in y
+			signed		padding0024 : 9;
+/*0024*/
 };
 
 /*
@@ -1383,21 +1386,23 @@ struct PlayerPositionUpdateServer_Struct
 */
 struct PlayerPositionUpdateClient_Struct
 {
-/*0000*/ uint16	spawn_id;
-/*0002*/ uint16	sequence;			//increments one each packet
-/*0004*/ float	y_pos;				// y coord
-/*0008*/ float	delta_z;			// Change in z
-/*0012*/ float	delta_x;			// Change in x
-/*0016*/ float	delta_y;			// Change in y
-/*0020*/ int32	animation:10,		// animation
-				delta_heading:10,	// change in heading
-				padding0020:12;		// ***Placeholder (mostly 1)
-/*0024*/ float	x_pos;				// x coord
-/*0028*/ float	z_pos;				// z coord
-/*0032*/ uint16	heading:12,			// Directional heading
-				padding0004:4;		// ***Placeholder
-/*0034*/ uint8	unknown0006[2];		// ***Placeholder
-/*0036*/
+/*0000*/	uint16		sequence;			// increments one each packet - Verified
+/*0002*/	uint16		spawn_id;			// Player's spawn id
+/*0004*/	uint16		vehicle_id;			// Player's vehicle spawn id
+/*0006*/	uint8		unknown0004[4];		// ***Placeholder
+/*0010*/	float		delta_x;			// Change in x
+/*0014*/	unsigned	heading : 12;		// Directional heading
+			unsigned	padding0040 : 20;	// ***Placeholder
+/*0018*/	float		x_pos;				// x coord (2nd loc value)
+/*0022*/	float		delta_z;			// Change in z
+/*0026*/	float		z_pos;				// z coord (3rd loc value)
+/*0030*/	float		y_pos;				// y coord (1st loc value)
+/*0034*/	unsigned	animation : 10;		// ***Placeholder
+			unsigned	padding0024 : 22;	// animation
+/*0038*/	float		delta_y;			// Change in y
+/*0042*/	signed		delta_heading : 10;	// change in heading
+			unsigned	padding0041 : 22;	// ***Placeholder
+/*0046*/
 };
 
 struct SpawnPositionUpdate_Struct

common/eqemu_logsys.cpp

@@ -20,7 +20,6 @@
 
 #include "eqemu_logsys.h"
 #include "rulesys.h"
-#include "platform.h"
 #include "string_util.h"
 #include "database.h"
 #include "misc.h"
@@ -96,13 +95,8 @@ EQEmuLogSys::EQEmuLogSys()
  */
 EQEmuLogSys::~EQEmuLogSys() = default;
 
-void EQEmuLogSys::LoadLogSettingsDefaults()
+void EQEmuLogSys::LoadLogSettingsDefaults(const std::string& platform)
 {
-	/**
-	 * Get Executable platform currently running this code (Zone/World/etc)
-	 */
-	log_platform = GetExecutablePlatformInt();
-
 	for (int log_category_id = Logs::AA; log_category_id != Logs::MaxCategoryID; log_category_id++) {
 		log_settings[log_category_id].log_to_console      = 0;
 		log_settings[log_category_id].log_to_file         = 0;
@@ -149,30 +143,7 @@ void EQEmuLogSys::LoadLogSettingsDefaults()
 		}
 	}
 
-	/**
-	 * Declare process file names for log writing=
-	 */
-	if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformWorld) {
-		platform_file_name = "world";
-	}
-	else if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformQueryServ) {
-		platform_file_name = "query_server";
-	}
-	else if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformZone) {
-		platform_file_name = "zone";
-	}
-	else if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformUCS) {
-		platform_file_name = "ucs";
-	}
-	else if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformLogin) {
-		platform_file_name = "login";
-	}
-	else if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformLaunch) {
-		platform_file_name = "launcher";
-	}
-	else if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformHC) {
-		platform_file_name = "hc";
-	}
+	platform_file_name = platform;
 }
 
 /**
@@ -206,7 +177,7 @@ std::string EQEmuLogSys::FormatOutMessageString(
 	std::string return_string;
 
 	if (IsRfc5424LogCategory(log_category)) {
-		return_string = "[" + GetPlatformName() + "] ";
+		return_string = "[" + platform_file_name + "] ";
 	}
 
 	return return_string + "[" + Logs::LogCategoryName[log_category] + "] " + in_message;
@@ -233,7 +204,7 @@ void EQEmuLogSys::ProcessGMSay(
 	/**
 	 * Check to see if the process that actually ran this is zone
 	 */
-	if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformZone) {
+	if (on_log_gmsay_hook) {
 		on_log_gmsay_hook(log_category, message);
 	}
 }
@@ -535,7 +506,7 @@ void EQEmuLogSys::StartFileLogs(const std::string &log_name)
 	/**
 	 * Zone
 	 */
-	if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformZone) {
+	if (platform_file_name == "zone") {
 		if (!log_name.empty()) {
 			platform_file_name = log_name;
 		}
@@ -579,3 +550,25 @@ void EQEmuLogSys::StartFileLogs(const std::string &log_name)
 		);
 	}
 }
+
+/**
+ * Silence console logging
+ */
+void EQEmuLogSys::SilenceConsoleLogging()
+{
+	for (int log_index = Logs::AA; log_index != Logs::MaxCategoryID; log_index++) {
+		log_settings[log_index].log_to_console      = 0;
+		log_settings[log_index].is_category_enabled = 0;
+	}
+}
+
+/**
+ * Enables console logging
+ */
+void EQEmuLogSys::EnableConsoleLogging()
+{
+	for (int log_index = Logs::AA; log_index != Logs::MaxCategoryID; log_index++) {
+		log_settings[log_index].log_to_console      = Logs::General;
+		log_settings[log_index].is_category_enabled = 1;
+	}
+}

common/eqemu_logsys.h

@@ -107,6 +107,12 @@ namespace Logs {
 		Emergency,
 		Alert,
 		Notice,
+		AIScanClose,
+		AIYellForHelp,
+		AICastBeneficialClose,
+		AoeCast,
+		EntityManagement,
+		Flee,
 		MaxCategoryID /* Don't Remove this */
 	};
 
@@ -172,7 +178,13 @@ namespace Logs {
 		"Critical",
 		"Emergency",
 		"Alert",
-		"Notice"
+		"Notice",
+		"AI Scan Close",
+		"AI Yell For Help",
+		"AI Cast Beneficial Close",
+		"AOE Cast",
+		"Entity Management",
+		"Flee",
 	};
 }
 
@@ -180,15 +192,19 @@ namespace Logs {
 
 class EQEmuLogSys {
 public:
-	EQEmuLogSys();
 	~EQEmuLogSys();
 
+	static EQEmuLogSys* Get() {
+		static EQEmuLogSys inst;
+		return &inst;
+	}
+
 	/**
 	 * Close File Logs wherever necessary, either at zone shutdown or entire process shutdown for everything else.
 	 * This should be handled on deconstructor but to be safe we use it anyways.
 	 */
 	void CloseFileLogs();
-	void LoadLogSettingsDefaults();
+	void LoadLogSettingsDefaults(const std::string &platform);
 
 	/**
 	 * @param directory_name
@@ -251,11 +267,6 @@ public:
 
 	bool file_logs_enabled = false;
 
-	/**
-	 * Sets Executable platform (Zone/World/UCS) etc.
-	 */
-	int log_platform = 0;
-
 	/**
 	 * File name used in writing logs
 	 */
@@ -279,7 +290,20 @@ public:
 	 */
 	void SetConsoleHandler(std::function<void(uint16 debug_level, uint16 log_type, const std::string&)> f) { on_log_console_hook = f; }
 
+	/**
+	 * Silence console logging
+	 */
+	void SilenceConsoleLogging();
+
+	/**
+	 * Turn on all console logging
+	 */
+	void EnableConsoleLogging();
+
 private:
+	EQEmuLogSys();
+	EQEmuLogSys(const EQEmuLogSys&);
+	EQEmuLogSys& operator=(const EQEmuLogSys&);
 
 	/**
 	 * Callback pointer to zone process for hooking logs to zone using GMSay
@@ -333,12 +357,10 @@ private:
 	bool IsRfc5424LogCategory(uint16 log_category);
 };
 
-extern EQEmuLogSys LogSys;
-
 /**
 template<typename... Args>
 void OutF(
-	EQEmuLogSys &ls,
+	EQEmuLogSys *ls,
 	Logs::DebugLevel debug_level,
 	uint16 log_category,
 	const char *file,
@@ -355,7 +377,7 @@ void OutF(
 
 #define OutF(ls, debug_level, log_category, file, func, line, formatStr, ...) \
 do { \
-    ls.Out(debug_level, log_category, file, func, line, fmt::format(formatStr, ##__VA_ARGS__).c_str()); \
+    ls->Out(debug_level, log_category, file, func, line, fmt::format(formatStr, ##__VA_ARGS__).c_str()); \
 } while(0)
 
 #endif

common/event/event_loop.h

@@ -21,6 +21,10 @@ namespace EQ
 			uv_run(&m_loop, UV_RUN_NOWAIT);
 		}
 
+		void Run() {
+			uv_run(&m_loop, UV_RUN_DEFAULT);
+		}
+
 		uv_loop_t* Handle() { return &m_loop; }
 
 	private:

common/json/jsoncpp.cpp

@@ -5277,7 +5277,7 @@ void StreamWriterBuilder::setDefaults(Json::Value* settings)
 {
   //! [StreamWriterBuilderDefaults]
   (*settings)["commentStyle"] = "All";
-  (*settings)["indentation"] = "\t";
+  (*settings)["indentation"] = "  ";
   (*settings)["enableYAMLCompatibility"] = false;
   (*settings)["dropNullPlaceholders"] = false;
   (*settings)["useSpecialFloats"] = false;

common/net/tcp_connection.cpp

@@ -203,6 +203,10 @@ int EQ::Net::TCPConnection::LocalPort() const
 
 std::string EQ::Net::TCPConnection::RemoteIP() const
 {
+	if (!m_socket) {
+		return "";
+	}
+
 	sockaddr_storage addr;
 	int addr_len = sizeof(addr);
 	uv_tcp_getpeername(m_socket, (sockaddr*)&addr, &addr_len);
@@ -220,6 +224,10 @@ std::string EQ::Net::TCPConnection::RemoteIP() const
 
 int EQ::Net::TCPConnection::RemotePort() const
 {
+	if (!m_socket) {
+		return 0;
+	}
+
 	sockaddr_storage addr;
 	int addr_len = sizeof(addr);
 	uv_tcp_getpeername(m_socket, (sockaddr*)&addr, &addr_len);
@@ -236,3 +244,11 @@ int EQ::Net::TCPConnection::RemotePort() const
 
 	return 0;
 }
+
+/**
+ * @return
+ */
+bool EQ::Net::TCPConnection::IsConnected() const
+{
+	return m_socket != nullptr;
+}

common/net/tcp_connection.h

@@ -24,10 +24,12 @@ namespace EQ
 			void Read(const char *data, size_t count);
 			void Write(const char *data, size_t count);
 
+			bool IsConnected() const;
 			std::string LocalIP() const;
 			int LocalPort() const;
 			std::string RemoteIP() const;
 			int RemotePort() const;
+
 		private:
 			TCPConnection();
 

common/patches/rof.cpp

@@ -624,6 +624,7 @@ namespace RoF
 		SETUP_DIRECT_ENCODE(PlayerPositionUpdateServer_Struct, structs::PlayerPositionUpdateServer_Struct);
 
 		OUT(spawn_id);
+		OUT(vehicle_id);
 		OUT(x_pos);
 		OUT(delta_x);
 		OUT(delta_y);
@@ -4314,6 +4315,7 @@ namespace RoF
 		SETUP_DIRECT_DECODE(PlayerPositionUpdateClient_Struct, structs::PlayerPositionUpdateClient_Struct);
 
 		IN(spawn_id);
+		IN(vehicle_id);
 		IN(sequence);
 		IN(x_pos);
 		IN(y_pos);

common/patches/rof2.cpp

@@ -686,25 +686,6 @@ namespace RoF2
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_ClientUpdate)
-	{
-		ENCODE_LENGTH_EXACT(PlayerPositionUpdateServer_Struct);
-		SETUP_DIRECT_ENCODE(PlayerPositionUpdateServer_Struct, structs::PlayerPositionUpdateServer_Struct);
-
-		OUT(spawn_id);
-		OUT(x_pos);
-		OUT(delta_x);
-		OUT(delta_y);
-		OUT(z_pos);
-		OUT(delta_heading);
-		OUT(y_pos);
-		OUT(delta_z);
-		OUT(animation);
-		OUT(heading);
-
-		FINISH_ENCODE();
-	}
-
 	ENCODE(OP_Consider)
 	{
 		ENCODE_LENGTH_EXACT(Consider_Struct);
@@ -4545,27 +4526,6 @@ namespace RoF2
 		FINISH_DIRECT_DECODE();
 	}
 
-	DECODE(OP_ClientUpdate)
-	{
-		// for some odd reason, there is an extra byte on the end of this on occasion..
-		DECODE_LENGTH_ATLEAST(structs::PlayerPositionUpdateClient_Struct);
-		SETUP_DIRECT_DECODE(PlayerPositionUpdateClient_Struct, structs::PlayerPositionUpdateClient_Struct);
-
-		IN(spawn_id);
-		IN(sequence);
-		IN(x_pos);
-		IN(y_pos);
-		IN(z_pos);
-		IN(heading);
-		IN(delta_x);
-		IN(delta_y);
-		IN(delta_z);
-		IN(delta_heading);
-		IN(animation);
-
-		FINISH_DIRECT_DECODE();
-	}
-
 	DECODE(OP_Consider)
 	{
 		DECODE_LENGTH_EXACT(structs::Consider_Struct);

common/patches/rof2_ops.h

@@ -52,7 +52,6 @@ E(OP_CastSpell)
 E(OP_ChannelMessage)
 E(OP_CharInventory)
 E(OP_ClickObjectAction)
-E(OP_ClientUpdate)
 E(OP_Consider)
 E(OP_Damage)
 E(OP_DeleteCharge)
@@ -155,7 +154,6 @@ D(OP_BuffRemoveRequest)
 D(OP_CastSpell)
 D(OP_ChannelMessage)
 D(OP_CharacterCreate)
-D(OP_ClientUpdate)
 D(OP_Consider)
 D(OP_ConsiderCorpse)
 D(OP_Consume)

common/patches/rof2_structs.h

@@ -1620,24 +1620,24 @@ struct RespawnWindow_Struct {
 */
 struct PlayerPositionUpdateServer_Struct
 {
-	/*0000*/	uint16	spawn_id;
-	/*0002*/	uint16	spawnId2;
-	/*0004*/	signed	padding0004 : 12;
-				signed	y_pos : 19;			// y coord
-				unsigned padding : 1;
-	/*0008*/	signed	delta_z : 13;			// change in z
-				signed	delta_x : 13;			// change in x
-				signed	padding0008 : 6;
-	/*0012*/	signed	x_pos : 19;			// x coord
-				unsigned heading : 12;		// heading
-				signed	padding0016 : 1;
-	/*0016*/	signed	delta_heading : 10;	// change in heading
-				signed	z_pos : 19;			// z coord
-				signed	padding0020 : 3;
-	/*0020*/	signed	animation : 10;		// animation
-				signed	delta_y : 13;			// change in y
-				signed	padding0024 : 9;
-	/*0024*/
+/*0000*/	uint16		spawn_id;
+/*0002*/	uint16		vehicle_id;
+/*0004*/	signed		padding0004 : 12;
+			signed		y_pos : 19;			// y coord
+			unsigned	padding : 1;
+/*0008*/	signed		delta_z : 13;		// change in z
+			signed		delta_x : 13;		// change in x
+			signed		padding0008 : 6;
+/*0012*/	signed		x_pos : 19;			// x coord
+			unsigned	heading : 12;		// heading
+			signed		padding0016 : 1;
+/*0016*/	signed		delta_heading : 10;	// change in heading
+			signed		z_pos : 19;			// z coord
+			signed		padding0020 : 3;
+/*0020*/	signed		animation : 10;		// animation
+			signed		delta_y : 13;		// change in y
+			signed		padding0024 : 9;
+/*0024*/
 };
 
 /*
@@ -1648,22 +1648,23 @@ struct PlayerPositionUpdateServer_Struct
 */
 struct PlayerPositionUpdateClient_Struct
 {
-	/*0000*/	uint16		sequence;			// increments one each packet - Verified
-	/*0002*/	uint16		spawn_id;			// Player's spawn id
-	/*0004*/	uint8		unknown0004[6];		// ***Placeholder
-	/*0010*/	float		delta_x;			// Change in x
-	/*0014*/	unsigned	heading : 12;			// Directional heading
-				unsigned	padding0040 : 20;		// ***Placeholder
-	/*0018*/	float		x_pos;				// x coord (2nd loc value)
-	/*0022*/	float		delta_z;			// Change in z
-	/*0026*/	float		z_pos;				// z coord (3rd loc value)
-	/*0030*/	float		y_pos;				// y coord (1st loc value)
-	/*0034*/	unsigned	animation : 10;		// ***Placeholder
-				unsigned	padding0024 : 22;		// animation
-	/*0038*/	float		delta_y;			// Change in y
-	/*0042*/	signed		delta_heading : 10;	// change in heading
-				unsigned	padding0041 : 22;		// ***Placeholder
-	/*0046*/
+/*0000*/	uint16		sequence;			// increments one each packet - Verified
+/*0002*/	uint16		spawn_id;			// Player's spawn id
+/*0004*/	uint16		vehicle_id;			// Player's vehicle spawn id
+/*0006*/	uint8		unknown0004[4];		// ***Placeholder
+/*0010*/	float		delta_x;			// Change in x
+/*0014*/	unsigned	heading : 12;		// Directional heading
+			unsigned	padding0040 : 20;	// ***Placeholder
+/*0018*/	float		x_pos;				// x coord (2nd loc value)
+/*0022*/	float		delta_z;			// Change in z
+/*0026*/	float		z_pos;				// z coord (3rd loc value)
+/*0030*/	float		y_pos;				// y coord (1st loc value)
+/*0034*/	unsigned	animation : 10;		// ***Placeholder
+			unsigned	padding0024 : 22;	// animation
+/*0038*/	float		delta_y;			// Change in y
+/*0042*/	signed		delta_heading : 10;	// change in heading
+			unsigned	padding0041 : 22;	// ***Placeholder
+/*0046*/
 };
 
 /*

common/patches/rof_structs.h

@@ -1608,22 +1608,22 @@ struct RespawnWindow_Struct {
 */
 struct PlayerPositionUpdateServer_Struct
 {
-/*0000*/ uint16	spawn_id;
-/*0002*/ uint16	spawnId2;
-/*0004*/ signed	padding0004:12;
-         signed	y_pos:19;           // y coord
-	 unsigned padding:1;
-/*0008*/ signed	delta_x:13;      // change in x
-         signed	delta_heading:10;// change in heading
-         signed	padding0008:9;
-/*0012*/ signed	delta_y:13;      // change in y
-         signed	z_pos:19;           // z coord
-/*0016*/ signed	x_pos:19;           // x coord
-         signed	animation:10;   // animation
-         signed	padding0016:3;
-/*0020*/ unsigned heading:12;     // heading
-         signed	delta_z:13;      // change in z
-         signed	padding0020:7;
+/*0000*/	uint16		spawn_id;
+/*0002*/	uint16		vehicle_id;
+/*0004*/	signed		padding0004 : 12;
+			signed		y_pos : 19;			// y coord
+			unsigned	padding : 1;
+/*0008*/	signed		delta_x : 13;		// change in x
+			signed		delta_heading : 10;	// change in heading
+			signed		padding0008 : 9;
+/*0012*/	signed		delta_y : 13;		// change in y
+			signed		z_pos : 19;			// z coord
+/*0016*/	signed		x_pos : 19;			// x coord
+			signed		animation : 10;		// animation
+			signed		padding0016 : 3;
+/*0020*/	unsigned	heading : 12;		// heading
+			signed		delta_z : 13;		// change in z
+			signed		padding0020 : 7;
 /*0024*/
 };
 
@@ -1636,21 +1636,22 @@ struct PlayerPositionUpdateServer_Struct
 */
 struct PlayerPositionUpdateClient_Struct
 {
-/*0000*/ uint16		sequence;			// increments one each packet - Verified
-/*0002*/ uint16		spawn_id;			// Player's spawn id
-/*0004*/ uint8		unknown0004[6];		// ***Placeholder
-/*0010*/ float		delta_y;			// Change in y
-/*0014*/ float		x_pos;				// x coord (2nd loc value)
-/*0018*/ float		y_pos;				// y coord (1st loc value)
-/*0022*/ signed		delta_heading:10;	// change in heading
-	 unsigned	animation:10;		// ***Placeholder
-         unsigned	padding0024:12;		// animation
-/*0026*/ float		delta_z;			// Change in z
-/*0030*/ float		delta_x;			// Change in x
-/*0034*/ float		z_pos;				// z coord (3rd loc value)
-/*0038*/ unsigned	heading:12;			// Directional heading
-         unsigned	padding0040:10;		// ***Placeholder
-         unsigned	padding0041:10;		// ***Placeholder
+/*0000*/	uint16		sequence;			// increments one each packet - Verified
+/*0002*/	uint16		spawn_id;			// Player's spawn id
+/*0004*/	uint16		vehicle_id;			// Player's vehicle spawn id
+/*0006*/	uint8		unknown0004[4];		// ***Placeholder
+/*0010*/	float		delta_y;			// Change in y
+/*0014*/	float		x_pos;				// x coord (2nd loc value)
+/*0018*/	float		y_pos;				// y coord (1st loc value)
+/*0022*/	signed		delta_heading : 10;	// change in heading
+			unsigned	animation : 10;		// ***Placeholder
+			unsigned	padding0024 : 12;	// animation
+/*0026*/	float		delta_z;			// Change in z
+/*0030*/	float		delta_x;			// Change in x
+/*0034*/	float		z_pos;				// z coord (3rd loc value)
+/*0038*/	unsigned	heading : 12;		// Directional heading
+			unsigned	padding0040 : 10;	// ***Placeholder
+			unsigned	padding0041 : 10;	// ***Placeholder
 /*0042*/
 };
 

common/patches/sod.cpp

@@ -2926,6 +2926,7 @@ namespace SoD
 		IN(delta_z);
 		IN(delta_heading);
 		IN(animation);
+		emu->vehicle_id = 0;
 
 		FINISH_DIRECT_DECODE();
 	}

common/patches/sod_structs.h

@@ -1372,21 +1372,21 @@ struct RespawnWindow_Struct {
 */
 struct PlayerPositionUpdateServer_Struct
 {
-/*0000*/ uint16		spawn_id;
-/*0002*/ signed		padding0000:12; // ***Placeholder
-         signed		delta_x:13;      // change in x
-         signed		padding0005:7;  // ***Placeholder
-/*0006*/ signed		delta_heading:10;// change in heading
-         signed		delta_y:13;      // change in y
-         signed		padding0006:9;  // ***Placeholder
-/*0010*/ signed		y_pos:19;           // y coord
-         signed		animation:10;   // animation
-         signed		padding0010:3;  // ***Placeholder
-/*0014*/ unsigned	heading:12;     // heading
-         signed		x_pos:19;           // x coord
-         signed		padding0014:1;  // ***Placeholder
-/*0018*/ signed		z_pos:19;           // z coord
-         signed		delta_z:13;      // change in z
+/*0000*/	uint16		spawn_id;
+/*0002*/	signed		padding0000 : 12;	// ***Placeholder
+			signed		delta_x : 13;		// change in x
+			signed		padding0005 : 7;	// ***Placeholder
+/*0006*/	signed		delta_heading : 10;	// change in heading
+			signed		delta_y : 13;		// change in y
+			signed		padding0006 : 9;	// ***Placeholder
+/*0010*/	signed		y_pos : 19;			// y coord
+			signed		animation : 10;		// animation
+			signed		padding0010 : 3;	// ***Placeholder
+/*0014*/	unsigned	heading : 12;		// heading
+			signed		x_pos : 19;			// x coord
+			signed		padding0014 : 1;	// ***Placeholder
+/*0018*/	signed		z_pos : 19;			// z coord
+			signed		delta_z : 13;		// change in z
 /*0022*/
 };
 
@@ -1399,21 +1399,21 @@ struct PlayerPositionUpdateServer_Struct
 */
 struct PlayerPositionUpdateClient_Struct
 {
-/*0000*/ uint16		spawn_id;			// Player's spawn id
-/*0002*/ uint16		sequence;			// increments one each packet - Verified
-/*0004*/ uint8		unknown0004[4];		// ***Placeholder
-/*0008*/ float		x_pos;				// x coord (2nd loc value)
-/*0012*/ float		y_pos;				// y coord (1st loc value)
-/*0016*/ signed		delta_heading:10;	// change in heading
-         unsigned	padding0036:10;		// animation
-         unsigned	padding0016:12;		// ***Placeholder
-/*0020*/ float		delta_x;			// Change in x
-/*0024*/ float		delta_y;			// Change in y
-/*0028*/ float		z_pos;				// z coord (3rd loc value)
-/*0032*/ float		delta_z;			// Change in z
-/*0036*/ unsigned	animation:10;		// ***Placeholder
-         unsigned	heading:12;			// Directional heading
-         unsigned	padding0037:10;		// ***Placeholder
+/*0000*/	uint16		spawn_id;			// Player's spawn id
+/*0002*/	uint16		sequence;			// increments one each packet - Verified
+/*0004*/	uint8		unknown0004[4];		// ***Placeholder
+/*0008*/	float		x_pos;				// x coord (2nd loc value)
+/*0012*/	float		y_pos;				// y coord (1st loc value)
+/*0016*/	signed		delta_heading : 10;	// change in heading
+			unsigned	padding0036 : 10;	// animation
+			unsigned	padding0016 : 12;	// ***Placeholder
+/*0020*/	float		delta_x;			// Change in x
+/*0024*/	float		delta_y;			// Change in y
+/*0028*/	float		z_pos;				// z coord (3rd loc value)
+/*0032*/	float		delta_z;			// Change in z
+/*0036*/	unsigned	animation : 10;		// ***Placeholder
+			unsigned	heading : 12;		// Directional heading
+			unsigned	padding0037 : 10;	// ***Placeholder
 /*0040*/
 };
 

common/patches/sof.cpp

@@ -2387,6 +2387,7 @@ namespace SoF
 		IN(delta_z);
 		IN(delta_heading);
 		IN(animation);
+		emu->vehicle_id = 0;
 
 		FINISH_DIRECT_DECODE();
 	}

common/patches/sof_structs.h

@@ -1373,21 +1373,21 @@ struct RespawnWindow_Struct {
 
 struct PlayerPositionUpdateServer_Struct
 {
-/*0000*/ uint16   spawn_id;			// Entity ID of the Spawn/Player
-/*0002*/ signed   padding0000:12;	// ***Placeholder
-		 signed   x_pos:19;			// x coord
-		 signed   padding0290:1;	// ***Placeholder
-/*0006*/ signed   delta_x:13;		// change in x
-		 signed   delta_y:13;		// change in y
-		 signed   padding0294:6;	// ***Placeholder
-/*0010*/ signed   z_pos:19;			// z coord
-		 signed   delta_heading:10;	// change in heading
-		 signed   padding0298:3;	// ***Placeholder
-/*0014*/ signed   y_pos:19;			// y coord
-		 signed   delta_z:13;		// change in z
-/*0022*/ signed   animation:10;		// animation
-		 unsigned heading:12;		// heading
-		 signed   padding0302:10;	// ***Placeholder
+/*0000*/	uint16		spawn_id;			// Entity ID of the Spawn/Player
+/*0002*/	signed		padding0000 : 12;	// ***Placeholder
+			signed		x_pos : 19;			// x coord
+			signed		padding0290 : 1;	// ***Placeholder
+/*0006*/	signed		delta_x : 13;		// change in x
+			signed		delta_y : 13;		// change in y
+			signed		padding0294 : 6;	// ***Placeholder
+/*0010*/	signed		z_pos : 19;			// z coord
+			signed		delta_heading : 10;	// change in heading
+			signed		padding0298 : 3;	// ***Placeholder
+/*0014*/	signed		y_pos : 19;			// y coord
+			signed		delta_z : 13;		// change in z
+/*0022*/	signed		animation : 10;		// animation
+			unsigned	heading : 12;		// heading
+			signed		padding0302 : 10;	// ***Placeholder
 /*0026*/
 };
 
@@ -1399,20 +1399,20 @@ struct PlayerPositionUpdateServer_Struct
 */
 struct PlayerPositionUpdateClient_Struct
 {
-/*0000*/ uint16 spawn_id;			// Player's Entity ID - Verified
-/*0002*/ uint16	sequence;			//increments one each packet - Verified
-/*0004*/ uint8 unknown0004[4];		// ***Placeholder
-/*0008*/ float delta_z;				// Change in z
-/*0012*/ float x_pos;				// x coord - Verified
-/*0016*/ signed delta_heading:10;	// Change in heading
-		 signed animation:10;		// Animation
-         unsigned padding0028:12;	// Seems to always be 0
-/*0020*/ float y_pos;				// y coord - Verified
-/*0024*/ float delta_x;				// Change in x
-/*0028*/ unsigned heading:12;		// Directional heading - Verified
-         unsigned padding0032:20;	// ***Placeholder - Some Static Number
-/*0032*/ float delta_y;				// Change in y
-/*0036*/ float z_pos;				// z coord - Verified
+/*0000*/	uint16		spawn_id;			// Player's Entity ID - Verified
+/*0002*/	uint16		sequence;			//increments one each packet - Verified
+/*0004*/	uint8		unknown0004[4];		// ***Placeholder
+/*0008*/	float		delta_z;			// Change in z
+/*0012*/	float		x_pos;				// x coord - Verified
+/*0016*/	signed		delta_heading : 10;	// Change in heading
+			signed		animation : 10;		// Animation
+			unsigned	padding0028 : 12;	// Seems to always be 0
+/*0020*/	float		y_pos;				// y coord - Verified
+/*0024*/	float		delta_x;			// Change in x
+/*0028*/	unsigned	heading : 12;		// Directional heading - Verified
+			unsigned	padding0032 : 20;	// ***Placeholder - Some Static Number
+/*0032*/	float		delta_y;			// Change in y
+/*0036*/	float		z_pos;				// z coord - Verified
 /*0040*/
 };
 

common/patches/titanium.cpp

@@ -350,6 +350,25 @@ namespace Titanium
 		dest->FastQueuePacket(&in, ack_req);
 	}
 
+	ENCODE(OP_ClientUpdate)
+	{
+		ENCODE_LENGTH_EXACT(PlayerPositionUpdateServer_Struct);
+		SETUP_DIRECT_ENCODE(PlayerPositionUpdateServer_Struct, structs::PlayerPositionUpdateServer_Struct);
+
+		OUT(spawn_id);
+		OUT(x_pos);
+		OUT(delta_x);
+		OUT(delta_y);
+		OUT(z_pos);
+		OUT(delta_heading);
+		OUT(y_pos);
+		OUT(delta_z);
+		OUT(animation);
+		OUT(heading);
+
+		FINISH_ENCODE();
+	}
+
 	ENCODE(OP_Damage)
 	{
 		ENCODE_LENGTH_EXACT(CombatDamage_Struct);
@@ -1878,6 +1897,28 @@ namespace Titanium
 		FINISH_DIRECT_DECODE();
 	}
 
+	DECODE(OP_ClientUpdate)
+	{
+		// for some odd reason, there is an extra byte on the end of this on occasion.. (copied from SoF..not sure if applies to Ti - TODO: check)
+		DECODE_LENGTH_ATLEAST(structs::PlayerPositionUpdateClient_Struct);
+		SETUP_DIRECT_DECODE(PlayerPositionUpdateClient_Struct, structs::PlayerPositionUpdateClient_Struct);
+
+		IN(spawn_id);
+		IN(sequence);
+		IN(x_pos);
+		IN(y_pos);
+		IN(z_pos);
+		IN(heading);
+		IN(delta_x);
+		IN(delta_y);
+		IN(delta_z);
+		IN(delta_heading);
+		IN(animation);
+		emu->vehicle_id = 0;
+
+		FINISH_DIRECT_DECODE();
+	}
+
 	DECODE(OP_Consume)
 	{
 		DECODE_LENGTH_EXACT(structs::Consume_Struct);

common/patches/titanium_ops.h

@@ -27,6 +27,7 @@ E(OP_BecomeTrader)
 E(OP_Buff)
 E(OP_ChannelMessage)
 E(OP_CharInventory)
+E(OP_ClientUpdate)
 E(OP_Damage)
 E(OP_DeleteCharge)
 E(OP_DeleteItem)
@@ -82,6 +83,7 @@ D(OP_Bug)
 D(OP_CastSpell)
 D(OP_ChannelMessage)
 D(OP_CharacterCreate)
+D(OP_ClientUpdate)
 D(OP_Consume)
 D(OP_DeleteItem)
 D(OP_Emote)

common/patches/titanium_structs.h

@@ -1197,20 +1197,20 @@ struct BecomeCorpse_Struct {
 */
 struct PlayerPositionUpdateServer_Struct
 {
-/*0000*/ uint16		spawn_id;
-/*0002*/ int32		delta_heading:10,  // change in heading
-         			x_pos:19,             // x coord
-         			padding0002:3;    // ***Placeholder
-/*0006*/ int32		y_pos:19,             // y coord
-         			animation:10,     // animation
-         			padding0006:3;    // ***Placeholder
-/*0010*/ int32		z_pos:19,             // z coord
-         			delta_y:13;        // change in y
-/*0014*/ int32		delta_x:13,        // change in x
-        			heading:12,       // heading
-         			padding0014:7;    // ***Placeholder
-/*0018*/ int32		delta_z:13,        // change in z
-         			padding0018:19;   // ***Placeholder
+/*0000*/	uint16	spawn_id;
+/*0002*/	int32	delta_heading : 10,	// change in heading
+					x_pos : 19,			// x coord
+					padding0002 : 3;	// ***Placeholder
+/*0006*/	int32	y_pos : 19,			// y coord
+					animation : 10,		// animation
+					padding0006 : 3;	// ***Placeholder
+/*0010*/	int32	z_pos : 19,			// z coord
+					delta_y : 13;		// change in y
+/*0014*/	int32	delta_x : 13,		// change in x
+					heading : 12,		// heading
+					padding0014 : 7;	// ***Placeholder
+/*0018*/	int32	delta_z : 13,		// change in z
+					padding0018 : 19;	// ***Placeholder
 /*0022*/
 };
 
@@ -1222,20 +1222,20 @@ struct PlayerPositionUpdateServer_Struct
 */
 struct PlayerPositionUpdateClient_Struct
 {
-/*0000*/ uint16	spawn_id;
-/*0022*/ uint16	sequence;	//increments one each packet
-/*0004*/ float y_pos;                 // y coord
-/*0008*/ float delta_z;            // Change in z
-/*0016*/ float delta_x;            // Change in x
-/*0012*/ float delta_y;            // Change in y
-/*0020*/ int32 animation:10,     // animation
-         		delta_heading:10,  // change in heading
-         		padding0020:12;   // ***Placeholder (mostly 1)
-/*0024*/ float x_pos;                 // x coord
-/*0028*/ float z_pos;                 // z coord
-/*0034*/ uint16 heading:12,     // Directional heading
-         		padding0004:4;  // ***Placeholder
-/*0032*/ uint8 unknown0006[2];  // ***Placeholder
+/*0000*/	uint16	spawn_id;
+/*0022*/	uint16	sequence;			// increments one each packet
+/*0004*/	float	y_pos;				// y coord
+/*0008*/	float	delta_z;			// Change in z
+/*0016*/	float	delta_x;			// Change in x
+/*0012*/	float	delta_y;			// Change in y
+/*0020*/	int32	animation : 10,		// animation
+					delta_heading : 10,	// change in heading
+					padding0020 : 12;	// ***Placeholder (mostly 1)
+/*0024*/	float	x_pos;				// x coord
+/*0028*/	float	z_pos;				// z coord
+/*0034*/	uint16	heading : 12,		// Directional heading
+					padding0004 : 4;	// ***Placeholder
+/*0032*/	uint8	unknown0006[2];		// ***Placeholder
 /*0036*/
 };
 

common/patches/uf.cpp

@@ -3252,6 +3252,7 @@ namespace UF
 		IN(delta_z);
 		IN(delta_heading);
 		IN(animation);
+		emu->vehicle_id = 0;
 
 		FINISH_DIRECT_DECODE();
 	}

common/patches/uf_structs.h

@@ -1413,21 +1413,21 @@ struct RespawnWindow_Struct {
 */
 struct PlayerPositionUpdateServer_Struct
 {
-/*0000*/ uint16		spawn_id;
-/*0002*/ signed		padding0000:12; // ***Placeholder
-         signed		delta_x:13;      // change in x
-         signed		padding0005:7;  // ***Placeholder
-/*0006*/ signed		delta_heading:10;// change in heading
-         signed		delta_y:13;      // change in y
-         signed		padding0006:9;  // ***Placeholder
-/*0010*/ signed		y_pos:19;           // y coord
-         signed		animation:10;   // animation
-         signed		padding0010:3;  // ***Placeholder
-/*0014*/ unsigned	heading:12;     // heading
-         signed		x_pos:19;           // x coord
-         signed		padding0014:1;  // ***Placeholder
-/*0018*/ signed		z_pos:19;           // z coord
-         signed		delta_z:13;      // change in z
+/*0000*/	uint16		spawn_id;
+/*0002*/	signed		padding0000 : 12;	// ***Placeholder
+			signed		delta_x : 13;		// change in x
+			signed		padding0005 : 7;	// ***Placeholder
+/*0006*/	signed		delta_heading : 10;	// change in heading
+			signed		delta_y : 13;		// change in y
+			signed		padding0006 : 9;	// ***Placeholder
+/*0010*/	signed		y_pos : 19;			// y coord
+			signed		animation : 10;		// animation
+			signed		padding0010 : 3;	// ***Placeholder
+/*0014*/	unsigned	heading : 12;		// heading
+			signed		x_pos : 19;			// x coord
+			signed		padding0014 : 1;	// ***Placeholder
+/*0018*/	signed		z_pos : 19;			// z coord
+			signed		delta_z : 13;		// change in z
 /*0022*/
 };
 
@@ -1440,21 +1440,21 @@ struct PlayerPositionUpdateServer_Struct
 */
 struct PlayerPositionUpdateClient_Struct
 {
-/*0000*/ uint16		spawn_id;			// Player's spawn id
-/*0002*/ uint16		sequence;			// increments one each packet - Verified
-/*0004*/ uint8		unknown0004[4];		// ***Placeholder
-/*0008*/ float		x_pos;				// x coord (2nd loc value)
-/*0012*/ float		y_pos;				// y coord (1st loc value)
-/*0016*/ signed		delta_heading:10;	// change in heading
-         unsigned	padding0036:10;		// animation
-         unsigned	padding0016:12;		// ***Placeholder
-/*0020*/ float		delta_x;			// Change in x
-/*0024*/ float		delta_y;			// Change in y
-/*0028*/ float		z_pos;				// z coord (3rd loc value)
-/*0032*/ float		delta_z;			// Change in z
-/*0036*/ unsigned	animation:10;		// ***Placeholder
-         unsigned	heading:12;			// Directional heading
-         unsigned	padding0037:10;		// ***Placeholder
+/*0000*/	uint16		spawn_id;			// Player's spawn id
+/*0002*/	uint16		sequence;			// increments one each packet - Verified
+/*0004*/	uint8		unknown0004[4];		// ***Placeholder
+/*0008*/	float		x_pos;				// x coord (2nd loc value)
+/*0012*/	float		y_pos;				// y coord (1st loc value)
+/*0016*/	signed		delta_heading : 10;	// change in heading
+			unsigned	padding0036 : 10;	// animation
+			unsigned	padding0016 : 12;	// ***Placeholder
+/*0020*/	float		delta_x;			// Change in x
+/*0024*/	float		delta_y;			// Change in y
+/*0028*/	float		z_pos;				// z coord (3rd loc value)
+/*0032*/	float		delta_z;			// Change in z
+/*0036*/	unsigned	animation : 10;		// ***Placeholder
+			unsigned	heading : 12;		// Directional heading
+			unsigned	padding0037 : 10;	// ***Placeholder
 /*0040*/
 };
 

common/platform.cpp

@@ -1,73 +0,0 @@
-/**
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include "platform.h"
-
-EQEmuExePlatform exe_platform = ExePlatformNone;
-
-void RegisterExecutablePlatform(EQEmuExePlatform p) {
-	exe_platform = p;
-}
-
-const EQEmuExePlatform& GetExecutablePlatform() {
-	return exe_platform;
-}
-
-/**
- * @return
- */
-int GetExecutablePlatformInt(){
-	return exe_platform;
-}
-
-/**
- * Returns platform name by string
- *
- * @return
- */
-std::string GetPlatformName()
-{
-	switch (GetExecutablePlatformInt()) {
-		case EQEmuExePlatform::ExePlatformWorld:
-			return "WorldServer";
-		case EQEmuExePlatform::ExePlatformQueryServ:
-			return "QueryServer";
-		case EQEmuExePlatform::ExePlatformZone:
-			return "ZoneServer";
-		case EQEmuExePlatform::ExePlatformUCS:
-			return "UCS";
-		case EQEmuExePlatform::ExePlatformLogin:
-			return "LoginServer";
-		case EQEmuExePlatform::ExePlatformSocket_Server:
-			return "SocketServer";
-		case EQEmuExePlatform::ExePlatformSharedMemory:
-			return "SharedMemory";
-		case EQEmuExePlatform::ExePlatformClientImport:
-			return "ClientImport";
-		case EQEmuExePlatform::ExePlatformClientExport:
-			return "ClientExport";
-		case EQEmuExePlatform::ExePlatformLaunch:
-			return "Launch";
-		case EQEmuExePlatform::ExePlatformHC:
-			return "HC";
-		default:
-			return "";
-	}
-}

common/ruletypes.h

@@ -157,6 +157,7 @@ RULE_BOOL(Character, OPClientUpdateVisualDebug, false, "Shows a pulse and forwar
 RULE_BOOL(Character, AllowCrossClassTrainers, false, "")
 RULE_BOOL(Character, PetsUseReagents, true, "Pets use reagent on spells")
 RULE_BOOL(Character, DismountWater, true, "Dismount horses when entering water")
+RULE_BOOL(Character, UseNoJunkFishing, false, "Disregards junk items when fishing")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Mercs)
@@ -211,7 +212,7 @@ RULE_CATEGORY_END()
 RULE_CATEGORY(World)
 RULE_INT(World, ZoneAutobootTimeoutMS, 60000, "")
 RULE_INT(World, ClientKeepaliveTimeoutMS, 65000, "")
-RULE_BOOL(World, UseBannedIPsTable, false, "Toggle whether or not to check incoming client connections against the Banned_IPs table. Set this value to false to disable this feature")
+RULE_BOOL(World, UseBannedIPsTable, false, "Toggle whether or not to check incoming client connections against the banned_ips table. Set this value to false to disable this feature")
 RULE_BOOL(World, EnableTutorialButton, true, "")
 RULE_BOOL(World, EnableReturnHomeButton, true, "")
 RULE_INT(World, MaxLevelForTutorial, 10, "")
@@ -492,6 +493,7 @@ RULE_BOOL(Combat, ClassicMasterWu, false, "classic master wu uses a random speci
 RULE_INT(Combat, LevelToStopDamageCaps, 0, "1 will effectively disable them, 20 should give basically same results as old incorrect system")
 RULE_BOOL(Combat, ClassicNPCBackstab, false, "true disables npc facestab - npcs get normal attack if not behind")
 RULE_BOOL(Combat, UseNPCDamageClassLevelMods, true, "Uses GetClassLevelDamageMod calc in npc_scale_manager")
+RULE_BOOL(Combat, UseExtendedPoisonProcs, false, "Allow old school poisons to last until characrer zones, at a lower proc rate")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(NPC)
@@ -565,13 +567,13 @@ RULE_INT(Range, MobPositionUpdates, 600, "")
 RULE_INT(Range, ClientPositionUpdates, 300, "")
 RULE_INT(Range, ClientForceSpawnUpdateRange, 1000, "")
 RULE_INT(Range, CriticalDamage, 80, "")
-RULE_INT(Range, ClientNPCScan, 300, "")
+RULE_INT(Range, MobCloseScanDistance, 600, "")
 RULE_CATEGORY_END()
 
 
 #ifdef BOTS
 RULE_CATEGORY(Bots)
-RULE_INT(Bots, AAExpansion, 8, "Bots get AAs through this expansion")
+RULE_INT(Bots, BotExpansionSettings, 16383, "Sets the expansion settings for bot use. Defaults to all expansions enabled up to TSS")
 RULE_BOOL(Bots, AllowCamelCaseNames, false, "Allows the use of 'MyBot' type names")
 RULE_INT(Bots, CommandSpellRank, 1, "Filters bot command spells by rank (1, 2 and 3 are valid filters - any other number allows all ranks)")
 RULE_INT(Bots, CreationLimit, 150, "Number of bots that each account can create")
@@ -595,8 +597,12 @@ RULE_INT(Bots, CasterStopMeleeLevel, 13, "Level at which caster bots stop melee
 RULE_INT(Bots, AllowedClasses, 0xFFFFFFFF, "Bitmask of allowed bot classes")
 RULE_INT(Bots, AllowedRaces, 0xFFFFFFFF, "Bitmask of allowed bot races")
 RULE_INT(Bots, AllowedGenders, 0x3, "Bitmask of allowed bot genders")
-RULE_BOOL(Bots, AllowOwnerAutoDefend, false, "When active, bots will defend their owner on enemy aggro")
+RULE_BOOL(Bots, AllowOwnerOptionAltCombat, true, "When option is enabled, bots will use an auto-/shared-aggro combat model")
+RULE_BOOL(Bots, AllowOwnerOptionAutoDefend, true, "When option is enabled, bots will defend their owner on enemy aggro")
 RULE_REAL(Bots, LeashDistance, 562500.0f, "Distance a bot is allowed to travel from leash owner before being pulled back (squared value)")
+RULE_BOOL(Bots, AllowApplyPoisonCommand, true, "Allows the use of the bot command 'applypoison'")
+RULE_BOOL(Bots, AllowApplyPotionCommand, true, "Allows the use of the bot command 'applypotion'")
+RULE_BOOL(Bots, RestrictApplyPotionToRogue, true, "Restricts the bot command 'applypotion' to rogue-usable potions (i.e., poisons)")
 RULE_CATEGORY_END()
 #endif
 
@@ -626,6 +632,7 @@ RULE_INT(Merchant, PricePenaltyPct, 4, "Determines maximum price penalty from ha
 RULE_REAL(Merchant, ChaBonusMod, 3.45, "Determines CHA cap, from 104 CHA. 3.45 is 132 CHA at apprehensive. 0.34 is 400 CHA at apprehensive")
 RULE_REAL(Merchant, ChaPenaltyMod, 1.52, "Determines CHA bottom, up to 102 CHA. 1.52 is 37 CHA at apprehensive. 0.98 is 0 CHA at apprehensive")
 RULE_BOOL(Merchant, EnableAltCurrencySell, true, "Enables the ability to resell items to alternate currency merchants")
+RULE_BOOL(Merchant, AllowCorpse, false, "Can merchants generate a corpse")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Bazaar)

common/shareddb.cpp

@@ -132,18 +132,36 @@ std::string SharedDatabase::GetMailKey(int CharID, bool key_only)
 {
 	std::string query = StringFormat("SELECT `mailkey` FROM `character_data` WHERE `id`='%i' LIMIT 1", CharID);
 	auto results = QueryDatabase(query);
+
 	if (!results.Success()) {
+
 		Log(Logs::Detail, Logs::MySQLError, "Error retrieving mailkey from database: %s", results.ErrorMessage().c_str());
 		return std::string();
 	}
 
-	auto row = results.begin();
-	std::string mail_key = row[0];
+	if (!results.RowCount()) {
 
-	if (mail_key.length() > 8 && key_only)
-		return mail_key.substr(8);
-	else
-		return mail_key;
+		Log(Logs::General, Logs::ClientLogin, "Error: Mailkey for character id [%i] does not exist or could not be found", CharID);
+		return std::string();
+	}
+
+	auto row = results.begin();
+	if (row != results.end()) {
+
+		std::string mail_key = row[0];
+
+		if (mail_key.length() > 8 && key_only) {
+			return mail_key.substr(8);
+		}
+		else {
+			return mail_key;
+		}
+	}
+	else {
+
+		Log(Logs::General, Logs::MySQLError, "Internal MySQL error in SharedDatabase::GetMailKey(int, bool)");
+		return std::string();
+	}
 }
 
 bool SharedDatabase::SaveCursor(uint32 char_id, std::list<EQEmu::ItemInstance*>::const_iterator &start, std::list<EQEmu::ItemInstance*>::const_iterator &end)

common/spdat.cpp

@@ -87,8 +87,9 @@
 
 bool IsTargetableAESpell(uint16 spell_id)
 {
-	if (IsValidSpell(spell_id) && spells[spell_id].targettype == ST_AETarget)
+	if (IsValidSpell(spell_id) && spells[spell_id].targettype == ST_AETarget) {
 		return true;
+	}
 
 	return false;
 }

common/string_util.h

@@ -27,6 +27,12 @@
 #include <fmt/format.h>
 #endif
 
+#ifdef _WINDOWS
+#include <ctype.h>
+#include <functional>
+#include <algorithm>
+#endif
+
 #include "types.h"
 
 //std::string based
@@ -38,6 +44,38 @@ const std::string StringFormat(const char* format, ...);
 const std::string vStringFormat(const char* format, va_list args);
 std::string implode(std::string glue, std::vector<std::string> src);
 
+/**
+ * @param str
+ * @param chars
+ * @return
+ */
+inline std::string &ltrim(std::string &str, const std::string &chars = "\t\n\v\f\r ")
+{
+	str.erase(0, str.find_first_not_of(chars));
+	return str;
+}
+
+/**
+ * @param str
+ * @param chars
+ * @return
+ */
+inline std::string &rtrim(std::string &str, const std::string &chars = "\t\n\v\f\r ")
+{
+	str.erase(str.find_last_not_of(chars) + 1);
+	return str;
+}
+
+/**
+ * @param str
+ * @param chars
+ * @return
+ */
+inline std::string &trim(std::string &str, const std::string &chars = "\t\n\v\f\r ")
+{
+	return ltrim(rtrim(str, chars), chars);
+}
+
 template <typename T>
 std::string implode(const std::string &glue, const std::pair<char, char> &encapsulation, const std::vector<T> &src)
 {

common/useperl.h

@@ -13,6 +13,10 @@
 #ifndef WIN32
 extern "C" {	//the perl headers dont do this for us...
 #endif
+#if _MSC_VER
+#define __inline__ __inline
+#define __builtin_expect 
+#endif
 #include <perl.h>
 #include <XSUB.h>
 #ifndef WIN32

common/version.h

@@ -1,20 +1,22 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 
 #ifndef _EQEMU_VERSION_H
 #define _EQEMU_VERSION_H
@@ -22,22 +24,24 @@
 #define LOGIN_VERSION "0.8.0"
 #define EQEMU_PROTOCOL_VERSION "0.3.10"
 
-#define CURRENT_VERSION "1.1.3"
-
-/*
-	Everytime a Database SQL is added to Github,
-		increment CURRENT_BINARY_DATABASE_VERSION number and make sure you update the manifest
-	Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt
-*/
+#define CURRENT_VERSION "2.0"
 
 
-#define CURRENT_BINARY_DATABASE_VERSION 9143
+/**
+ * Every time a Database SQL is added to Github increment CURRENT_BINARY_DATABASE_VERSION
+ * number and make sure you update the manifest
+ *
+ * Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt
+ */
+
+#define CURRENT_BINARY_DATABASE_VERSION 9145
 
 #ifdef BOTS
 	#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9026
 #else
 	#define CURRENT_BINARY_BOTS_DATABASE_VERSION 0 // must be 0
 #endif
+
 #define COMPILE_DATE	__DATE__
 #define COMPILE_TIME	__TIME__
 #ifndef WIN32

eqlaunch/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(eqlaunch_sources
 	eqlaunch.cpp

eqlaunch/eqlaunch.cpp

@@ -21,7 +21,6 @@
 #include "../common/proc_launcher.h"
 #include "../common/eqemu_config.h"
 #include "../common/servertalk.h"
-#include "../common/platform.h"
 #include "../common/crash.h"
 #include "../common/unix.h"
 #include "worldserver.h"
@@ -32,15 +31,12 @@
 #include <signal.h>
 #include <time.h>
 
-EQEmuLogSys LogSys;
-
 bool RunLoops = false;
 
 void CatchSignal(int sig_num);
 
 int main(int argc, char *argv[]) {
-	RegisterExecutablePlatform(ExePlatformLaunch);
-	LogSys.LoadLogSettingsDefaults();
+	EQEmuLogSys::Get()->LoadLogSettingsDefaults("eqlaunch");
 	set_exception_handler();
 
 	std::string launcher_name;
@@ -157,7 +153,7 @@ int main(int argc, char *argv[]) {
 		delete zone->second;
 	}
 
-	LogSys.CloseFileLogs();
+	EQEmuLogSys::Get()->CloseFileLogs();
 
 	return 0;
 }

hc/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(hc_sources
 	eq.cpp
@@ -13,14 +13,10 @@ SET(hc_headers
 	world.h
 )
 
-FIND_PACKAGE(OpenSSL REQUIRED)
-
-INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
-
 ADD_EXECUTABLE(hc ${hc_sources} ${hc_headers})
 
 INSTALL(TARGETS hc RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
-TARGET_LINK_LIBRARIES(hc ${SERVER_LIBS} ${OPENSSL_LIBRARIES})
+TARGET_LINK_LIBRARIES(hc ${SERVER_LIBS})
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)

hc/eq.cpp

@@ -28,7 +28,7 @@ EverQuest::EverQuest(const std::string &host, int port, const std::string &user,
 
 	EQ::Net::DNSLookup(m_host, port, false, [&](const std::string &addr) {
 		if (addr.empty()) {
-			Log.OutF(Logs::General, Logs::Headless_Client, "Could not resolve address: {0}", m_host);
+			LogError("Could not resolve address: {0}", m_host);
 			return;
 		}
 		else {
@@ -51,18 +51,18 @@ EverQuest::~EverQuest()
 void EverQuest::LoginOnNewConnection(std::shared_ptr<EQ::Net::DaybreakConnection> connection)
 {
 	m_login_connection = connection;
-	Log.OutF(Logs::General, Logs::Headless_Client, "Connecting...");
+	LogInfo("Connecting...");
 }
 
 void EverQuest::LoginOnStatusChangeReconnectEnabled(std::shared_ptr<EQ::Net::DaybreakConnection> conn, EQ::Net::DbProtocolStatus from, EQ::Net::DbProtocolStatus to)
 {
 	if (to == EQ::Net::StatusConnected) {
-		Log.OutF(Logs::General, Logs::Headless_Client, "Login connected.");
+		LogInfo("Login connected.");
 		LoginSendSessionReady();
 	}
 
 	if (to == EQ::Net::StatusDisconnected) {
-		Log.OutF(Logs::General, Logs::Headless_Client, "Login connection lost before we got to world, reconnecting.");
+		LogInfo("Login connection lost before we got to world, reconnecting.");
 		m_key.clear();
 		m_dbid = 0;
 		m_login_connection.reset();
@@ -165,14 +165,14 @@ void EverQuest::LoginProcessLoginResponse(const EQ::Net::Packet & p)
 	auto response_error = sp.GetUInt16(1);
 
 	if (response_error > 101) {
-		Log.OutF(Logs::General, Logs::Headless_Client, "Error logging in response code: {0}", response_error);
+		LogError("Error logging in response code: {0}", response_error);
 		LoginDisableReconnect();
 	}
 	else {
 		m_key = sp.GetCString(12);
 		m_dbid = sp.GetUInt32(8);
 
-		Log.OutF(Logs::General, Logs::Headless_Client, "Logged in successfully with dbid {0} and key {1}", m_dbid, m_key);
+		LogInfo("Logged in successfully with dbid {0} and key {1}", m_dbid, m_key);
 		LoginSendServerRequest();
 	}
 }
@@ -214,13 +214,13 @@ void EverQuest::LoginProcessServerPacketList(const EQ::Net::Packet & p)
 
 	for (auto server : m_world_servers) {
 		if (server.second.long_name.compare(m_server) == 0) {
-			Log.OutF(Logs::General, Logs::Headless_Client, "Found world server {0}, attempting to login.", m_server);
+			LogInfo("Found world server {0}, attempting to login.", m_server);
 			LoginSendPlayRequest(server.first);
 			return;
 		}
 	}
 
-	Log.OutF(Logs::General, Logs::Headless_Client, "Got response from login server but could not find world server {0} disconnecting.", m_server);
+	LogError("Got response from login server but could not find world server {0} disconnecting.", m_server);
 	LoginDisableReconnect();
 }
 
@@ -238,7 +238,7 @@ void EverQuest::LoginProcessServerPlayResponse(const EQ::Net::Packet &p)
 	}
 	else {
 		auto message = p.GetUInt16(13);
-		Log.OutF(Logs::General, Logs::Headless_Client, "Failed to login to server with message {0}");
+		LogError("Failed to login to server with message {0}");
 		LoginDisableReconnect();
 	}
 }
@@ -261,18 +261,18 @@ void EverQuest::ConnectToWorld()
 void EverQuest::WorldOnNewConnection(std::shared_ptr<EQ::Net::DaybreakConnection> connection)
 {
 	m_world_connection = connection;
-	Log.OutF(Logs::General, Logs::Headless_Client, "Connecting to world...");
+	LogInfo("Connecting to world...");
 }
 
 void EverQuest::WorldOnStatusChangeReconnectEnabled(std::shared_ptr<EQ::Net::DaybreakConnection> conn, EQ::Net::DbProtocolStatus from, EQ::Net::DbProtocolStatus to)
 {
 	if (to == EQ::Net::StatusConnected) {
-		Log.OutF(Logs::General, Logs::Headless_Client, "World connected.");
+		LogInfo("World connected.");
 		WorldSendClientAuth();
 	}
 
 	if (to == EQ::Net::StatusDisconnected) {
-		Log.OutF(Logs::General, Logs::Headless_Client, "World connection lost, reconnecting.");
+		LogInfo("World connection lost, reconnecting.");
 		m_world_connection.reset();
 		m_world_connection_manager->Connect(m_host, 9000);
 	}
@@ -293,7 +293,7 @@ void EverQuest::WorldOnPacketRecv(std::shared_ptr<EQ::Net::DaybreakConnection> c
 		WorldProcessCharacterSelect(p);
 		break;
 	default:
-		Log.OutF(Logs::General, Logs::Headless_Client, "Unhandled opcode: {0:#x}", opcode);
+		LogDebug("Unhandled opcode: {0:#x}", opcode);
 		break;
 	}
 }
@@ -339,12 +339,11 @@ void EverQuest::WorldProcessCharacterSelect(const EQ::Net::Packet &p)
 
 		idx += 274;
 		if (m_character.compare(name) == 0) {
-			Log.OutF(Logs::General, Logs::Headless_Client, "Found {0}, would attempt to login here.", m_character);
+			LogDebug("Found {0}, would attempt to login here.", m_character);
 			WorldSendEnterWorld(m_character);
 			return;
 		}
 	}
 
-	Log.OutF(Logs::General, Logs::Headless_Client, "Could not find {0}, cannot continue to login.", m_character);
+	LogError("Could not find {0}, cannot continue to login.", m_character);
 }
- 

hc/main.cpp

@@ -1,20 +1,16 @@
 #include "../common/event/event_loop.h"
 #include "../common/eqemu_logsys.h"
 #include "../common/crash.h"
-#include "../common/platform.h"
 #include "../common/json_config.h"
 #include <thread>
 
 #include "eq.h"
 
-EQEmuLogSys Log;
-
 int main() {
-	RegisterExecutablePlatform(ExePlatformHC);
-	Log.LoadLogSettingsDefaults();
+	EQEmuLogSys::Get()->LoadLogSettingsDefaults("headless_client");
 	set_exception_handler();
 
-	Log.OutF(Logs::General, Logs::Headless_Client, "Starting EQEmu Headless Client.");
+	LogInfo("Starting EQEmu Headless Client.");
 
 	auto config = EQ::JsonConfigFile::Load("hc.json");
 	auto config_handle = config.RawHandle();
@@ -32,13 +28,13 @@ int main() {
 			auto server = c["server"].asString();
 			auto character = c["character"].asString();
 			
-			Log.OutF(Logs::General, Logs::Headless_Client, "Connecting to {0}:{1} as Account '{2}' to Server '{3}' under Character '{4}'", host, port, user, server, character);
+			LogInfo("Connecting to {0}:{1} as Account '{2}' to Server '{3}' under Character '{4}'", host, port, user, server, character);
 
 			eq_list.push_back(std::unique_ptr<EverQuest>(new EverQuest(host, port, user, pass, server, character)));
 		}
 	}
 	catch (std::exception &ex) {
-		Log.OutF(Logs::General, Logs::Headless_Client, "Error parsing config file: {0}", ex.what());
+		LogError("Error parsing config file: {0}", ex.what());
 		return 0;
 	}
 

hc/world.cpp

@@ -21,18 +21,18 @@ WorldConnection::~WorldConnection() {
 void WorldConnection::OnNewConnection(std::shared_ptr<EQ::Net::DaybreakConnection> connection)
 {
 	m_connection = connection;
-	Log.OutF(Logs::General, Logs::Headless_Client, "Connecting to world...");
+	LogInfo("Connecting to world...");
 }
 
 void WorldConnection::OnStatusChangeActive(std::shared_ptr<EQ::Net::DaybreakConnection> conn, EQ::Net::DbProtocolStatus from, EQ::Net::DbProtocolStatus to)
 {
 	if (to == EQ::Net::StatusConnected) {
-		Log.OutF(Logs::General, Logs::Headless_Client, "World connected.");
+		LogInfo("World connected.");
 		SendClientAuth();
 	}
 
 	if (to == EQ::Net::StatusDisconnected) {
-		Log.OutF(Logs::General, Logs::Headless_Client, "World connection lost, reconnecting.");
+		LogInfo("World connection lost, reconnecting.");
 		m_connection.reset();
 		m_connection_manager->Connect(m_host, 9000);
 	}
@@ -48,7 +48,7 @@ void WorldConnection::OnStatusChangeInactive(std::shared_ptr<EQ::Net::DaybreakCo
 void WorldConnection::OnPacketRecv(std::shared_ptr<EQ::Net::DaybreakConnection> conn, const EQ::Net::Packet &p)
 {
 	auto opcode = p.GetUInt16(0);
-	Log.OutF(Logs::General, Logs::Headless_Client, "Packet in:\n{0}", p.ToString());
+	LogDebug("Packet in:\n{0}", p.ToString());
 }
 
 void WorldConnection::Kill()

libs/luabind/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(lb_sources
     src/class.cpp

loginserver/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(eqlogin_sources
 	account_management.cpp
@@ -28,14 +28,10 @@ SET(eqlogin_headers
 	world_server.h
 )
 
-FIND_PACKAGE(OpenSSL REQUIRED)
-
-INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
-
 ADD_EXECUTABLE(loginserver ${eqlogin_sources} ${eqlogin_headers})
 
 INSTALL(TARGETS loginserver RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
-TARGET_LINK_LIBRARIES(loginserver ${SERVER_LIBS} ${OPENSSL_LIBRARIES})
+TARGET_LINK_LIBRARIES(loginserver ${SERVER_LIBS})
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)

loginserver/client.cpp

@@ -103,7 +103,7 @@ bool Client::Process()
 				break;
 			}
 			default: {
-				if (LogSys.log_settings[Logs::PacketClientServerUnhandled].is_category_enabled == 1) {
+				if (EQEmuLogSys::Get()->log_settings[Logs::PacketClientServerUnhandled].is_category_enabled == 1) {
 					char dump[64];
 					app->build_header_dump(dump);
 					LogError("Recieved unhandled application packet from the client: [{}]", dump);

loginserver/database.cpp

@@ -647,7 +647,7 @@ void Database::LoadLogSettings(EQEmuLogSys::LogSettings *log_settings)
 		 * If we go through this whole loop and nothing is set to any debug level, there is no point to create a file or keep anything open
 		 */
 		if (log_settings[log_category_id].log_to_file > 0) {
-			LogSys.file_logs_enabled = true;
+			EQEmuLogSys::Get()->file_logs_enabled = true;
 		}
 
 		categories_in_database[log_category_id] = 1;

loginserver/encryption.cpp

@@ -1,26 +1,17 @@
-/**
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
+#include "encryption.h"
 
+#ifdef EQEMU_USE_OPENSSL
 #include <openssl/des.h>
 #include <openssl/sha.h>
 #include <openssl/md5.h>
+#endif
+#ifdef EQEMU_USE_MBEDTLS
+#include <mbedtls/des.h>
+#include <mbedtls/md5.h>
+#include <mbedtls/sha1.h>
+#include <mbedtls/sha512.h>
+#endif
+
 #include <cstring>
 #include <string>
 
@@ -30,7 +21,45 @@
 
 #endif
 
-#include "encryption.h"
+/**
+ * @param mode
+ * @return
+ */
+std::string GetEncryptionByModeId(uint32 mode)
+{
+	switch (mode) {
+		case EncryptionModeMD5:
+			return "MD5";
+		case EncryptionModeMD5PassUser:
+			return "MD5PassUser";
+		case EncryptionModeMD5UserPass:
+			return "MD5UserPass";
+		case EncryptionModeMD5Triple:
+			return "MD5Triple";
+		case EncryptionModeSHA:
+			return "SHA";
+		case EncryptionModeSHAPassUser:
+			return "SHAPassUser";
+		case EncryptionModeSHAUserPass:
+			return "SHAUserPass";
+		case EncryptionModeSHATriple:
+			return "SHATriple";
+		case EncryptionModeSHA512:
+			return "SHA512";
+		case EncryptionModeSHA512PassUser:
+			return "SHA512PassUser";
+		case EncryptionModeSHA512UserPass:
+			return "SHA512UserPass";
+		case EncryptionModeSHA512Triple:
+			return "SHA512Triple";
+		case EncryptionModeArgon2:
+			return "Argon2";
+		case EncryptionModeSCrypt:
+			return "SCrypt";
+		default:
+			return "";
+	}
+}
 
 /**
  * @param buffer_in
@@ -41,17 +70,69 @@
  */
 const char *eqcrypt_block(const char *buffer_in, size_t buffer_in_sz, char *buffer_out, bool enc)
 {
-	DES_key_schedule k;
-	DES_cblock       v;
+#ifdef EQEMU_USE_MBEDTLS
+	if (enc) {
+		if (buffer_in_sz % 8 != 0) {
+			auto temp_buffer_sz = ((buffer_in_sz / 8) + 1) * 8;
+			unsigned char *temp_buffer = new unsigned char[temp_buffer_sz];
+			unsigned char *temp_buffer_in = &temp_buffer[0];
+			unsigned char *temp_buffer_out = &temp_buffer[temp_buffer_sz];
 
+			memset(temp_buffer, 0, temp_buffer_sz * 2);
+			memcpy(temp_buffer_in, buffer_in, buffer_in_sz);
+
+			unsigned char key[MBEDTLS_DES_KEY_SIZE];
+			unsigned char iv[8];
+			memset(&key, 0, MBEDTLS_DES_KEY_SIZE);
+			memset(&iv, 0, 8);
+
+			mbedtls_des_context context;
+			mbedtls_des_setkey_enc(&context, key);
+			mbedtls_des_crypt_cbc(&context, MBEDTLS_DES_ENCRYPT, temp_buffer_sz, iv, (const unsigned char*)temp_buffer_in, (unsigned char*)temp_buffer_out);
+
+			memcpy(buffer_out, temp_buffer_out, temp_buffer_sz);
+			delete[] temp_buffer;
+		}
+		else {
+			unsigned char key[MBEDTLS_DES_KEY_SIZE];
+			unsigned char iv[8];
+			memset(&key, 0, MBEDTLS_DES_KEY_SIZE);
+			memset(&iv, 0, 8);
+
+			mbedtls_des_context context;
+			mbedtls_des_setkey_enc(&context, key);
+			mbedtls_des_crypt_cbc(&context, MBEDTLS_DES_ENCRYPT, buffer_in_sz, iv, (const unsigned char*)buffer_in, (unsigned char*)buffer_out);
+		}
+	}
+	else {
+		if (buffer_in_sz && buffer_in_sz % 8 != 0) {
+			return nullptr;
+		}
+
+		unsigned char key[MBEDTLS_DES_KEY_SIZE];
+		unsigned char iv[8];
+		memset(&key, 0, MBEDTLS_DES_KEY_SIZE);
+		memset(&iv, 0, 8);
+	
+		mbedtls_des_context context;
+		mbedtls_des_setkey_dec(&context, key);
+		mbedtls_des_crypt_cbc(&context, MBEDTLS_DES_DECRYPT, buffer_in_sz, iv, (const unsigned char*)buffer_in, (unsigned char*)buffer_out);
+	}
+#endif
+
+#ifdef EQEMU_USE_OPENSSL
+	DES_key_schedule k;
+	DES_cblock v;
+	
 	memset(&k, 0, sizeof(DES_key_schedule));
 	memset(&v, 0, sizeof(DES_cblock));
-
+	
 	if (!enc && buffer_in_sz && buffer_in_sz % 8 != 0) {
 		return nullptr;
 	}
-
-	DES_ncbc_encrypt((const unsigned char *) buffer_in, (unsigned char *) buffer_out, (long) buffer_in_sz, &k, &v, enc);
+	
+	DES_ncbc_encrypt((const unsigned char*)buffer_in, (unsigned char*)buffer_out, (long)buffer_in_sz, &k, &v, enc);
+#endif
 	return buffer_out;
 }
 
@@ -61,17 +142,34 @@ const char *eqcrypt_block(const char *buffer_in, size_t buffer_in_sz, char *buff
  */
 std::string eqcrypt_md5(const std::string &msg)
 {
-	std::string   ret;
-	unsigned char md5_digest[16];
-	char          tmp[4];
+	std::string ret;
+	ret.reserve(32);
 
-	MD5((const unsigned char *) msg.c_str(), msg.length(), md5_digest);
+#ifdef EQEMU_USE_MBEDTLS
+	unsigned char digest[16];
+	char temp[4];
+
+	if (0 == mbedtls_md5_ret((const unsigned char*)msg.c_str(), msg.length(), digest)) {
+		for (int i = 0; i < 16; ++i) {
+			sprintf(&temp[0], "%02x", digest[i]);
+			ret.push_back(temp[0]);
+			ret.push_back(temp[1]);
+		}
+	}
+#endif
+
+#ifdef EQEMU_USE_OPENSSL
+	unsigned char md5_digest[16];
+	char tmp[4];
+
+	MD5((const unsigned char*)msg.c_str(), msg.length(), md5_digest);
 
 	for (int i = 0; i < 16; ++i) {
 		sprintf(&tmp[0], "%02x", md5_digest[i]);
 		ret.push_back(tmp[0]);
 		ret.push_back(tmp[1]);
 	}
+#endif
 
 	return ret;
 }
@@ -82,17 +180,34 @@ std::string eqcrypt_md5(const std::string &msg)
  */
 std::string eqcrypt_sha1(const std::string &msg)
 {
-	std::string   ret;
-	unsigned char sha_digest[20];
-	char          tmp[4];
+	std::string ret;
+	ret.reserve(40);
 
-	SHA1((const unsigned char *) msg.c_str(), msg.length(), sha_digest);
+#ifdef EQEMU_USE_MBEDTLS
+	unsigned char digest[20];
+	char temp[4];
+
+	if (0 == mbedtls_sha1_ret((const unsigned char*)msg.c_str(), msg.length(), digest)) {
+		for (int i = 0; i < 20; ++i) {
+			sprintf(&temp[0], "%02x", digest[i]);
+			ret.push_back(temp[0]);
+			ret.push_back(temp[1]);
+		}
+	}
+#endif
+
+#ifdef EQEMU_USE_OPENSSL
+	unsigned char sha_digest[20];
+	char tmp[4];
+
+	SHA1((const unsigned char*)msg.c_str(), msg.length(), sha_digest);
 
 	for (int i = 0; i < 20; ++i) {
 		sprintf(&tmp[0], "%02x", sha_digest[i]);
 		ret.push_back(tmp[0]);
 		ret.push_back(tmp[1]);
 	}
+#endif
 
 	return ret;
 }
@@ -103,17 +218,34 @@ std::string eqcrypt_sha1(const std::string &msg)
  */
 std::string eqcrypt_sha512(const std::string &msg)
 {
-	std::string   ret;
-	unsigned char sha_digest[64];
-	char          tmp[4];
+	std::string ret;
+	ret.reserve(128);
 
-	SHA512((const unsigned char *) msg.c_str(), msg.length(), sha_digest);
+#ifdef EQEMU_USE_MBEDTLS
+	unsigned char digest[64];
+	char temp[4];
+
+	if (0 == mbedtls_sha512_ret((const unsigned char*)msg.c_str(), msg.length(), digest, 0)) {
+		for (int i = 0; i < 64; ++i) {
+			sprintf(&temp[0], "%02x", digest[i]);
+			ret.push_back(temp[0]);
+			ret.push_back(temp[1]);
+		}
+	}
+#endif
+
+#ifdef EQEMU_USE_OPENSSL
+	unsigned char sha_digest[64];
+	char tmp[4];
+
+	SHA512((const unsigned char*)msg.c_str(), msg.length(), sha_digest);
 
 	for (int i = 0; i < 64; ++i) {
 		sprintf(&tmp[0], "%02x", sha_digest[i]);
 		ret.push_back(tmp[0]);
 		ret.push_back(tmp[1]);
 	}
+#endif
 
 	return ret;
 }
@@ -126,7 +258,8 @@ std::string eqcrypt_sha512(const std::string &msg)
  */
 std::string eqcrypt_argon2(const std::string &msg)
 {
-	char buffer[crypto_pwhash_STRBYTES];
+	char        buffer[crypto_pwhash_STRBYTES] = {0};
+	std::string ret;
 
 	if (crypto_pwhash_str(
 		&buffer[0],
@@ -138,7 +271,8 @@ std::string eqcrypt_argon2(const std::string &msg)
 		return "";
 	}
 
-	return buffer;
+	ret = buffer;
+	return ret;
 }
 
 /**
@@ -147,16 +281,21 @@ std::string eqcrypt_argon2(const std::string &msg)
  */
 std::string eqcrypt_scrypt(const std::string &msg)
 {
-	char buffer[crypto_pwhash_scryptsalsa208sha256_STRBYTES];
+	char        buffer[crypto_pwhash_scryptsalsa208sha256_STRBYTES] = {0};
+	std::string ret;
 
 	if (crypto_pwhash_scryptsalsa208sha256_str(
-		&buffer[0], &msg[0], msg.length(),
-		crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE, crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE
+		&buffer[0],
+		&msg[0],
+		msg.length(),
+		crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE,
+		crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE
 	) != 0) {
 		return "";
 	}
 
-	return buffer;
+	ret = buffer;
+	return ret;
 }
 
 #endif
@@ -231,38 +370,3 @@ bool eqcrypt_verify_hash(const std::string &username, const std::string &passwor
 
 	return false;
 }
-
-std::string GetEncryptionByModeId(uint32 mode) {
-	switch (mode) {
-		case EncryptionModeMD5:
-			return "MD5";
-		case EncryptionModeMD5PassUser:
-			return "MD5PassUser";
-		case EncryptionModeMD5UserPass:
-			return "MD5UserPass";
-		case EncryptionModeMD5Triple:
-			return "MD5Triple";
-		case EncryptionModeSHA:
-			return "SHA";
-		case EncryptionModeSHAPassUser:
-			return "SHAPassUser";
-		case EncryptionModeSHAUserPass:
-			return "SHAUserPass";
-		case EncryptionModeSHATriple:
-			return "SHATriple";
-		case EncryptionModeSHA512:
-			return "SHA512";
-		case EncryptionModeSHA512PassUser:
-			return "SHA512PassUser";
-		case EncryptionModeSHA512UserPass:
-			return "SHA512UserPass";
-		case EncryptionModeSHA512Triple:
-			return "SHA512Triple";
-		case EncryptionModeArgon2:
-			return "Argon2";
-		case EncryptionModeSCrypt:
-			return "SCrypt";
-		default:
-			return "";
-	}
-}

loginserver/login_server.h

@@ -38,6 +38,7 @@
 struct LoginServer
 {
 public:
+
 	LoginServer() : db(nullptr), server_manager(nullptr) {
 
 	}

loginserver/login_util/login.json

@@ -1,39 +1,37 @@
 {
   "database": {
-    "host": "127.0.0.1", // database host
-    "port": "3306", // database port
-    "db": "peq", // database name
-    "user": "root", // database user
-    "password": "eqemu" // database password
+    "host": "127.0.0.1",
+    "port": "3306",
+    "db": "peq",
+    "user": "root",
+    "password": "eqemu"
   },
   "account": {
-    // ideal for local LAN setups, if you want a login attempt to automatically create an account
-    // this will automatically create the account using the username and password if it doesn't exist
     "auto_create_accounts": true
   },
   "worldservers": {
-    "unregistered_allowed": true, // allows worldservers to connect to your loginserver without server admin authentication
-    "reject_duplicate_servers": false // if enabled, rejects duplicate worldservers
+    "unregistered_allowed": true,
+    "reject_duplicate_servers": false
   },
   "web_api": {
-    "enabled": true, // enable/disable embedded webserver api
-    "port": 6000 // the port you want the web api to serve on (recommended not to change)
+    "enabled": true,
+    "port": 6000
   },
   "security": {
-    "mode": 14, // encryption mode (dont touch) (14=scrypt)
-    "allow_password_login": true, // allows users to login via password, most cases, leave this on
-    "allow_token_login": true // allows token based login directly from launching game
+    "mode": 14,
+    "allow_password_login": true,
+    "allow_token_login": true
   },
   "logging": {
-    "trace": false, // For debugging general packet messaging
-    "world_trace": false, // For debugging world to loginserver messaging
-    "dump_packets_in": false, // for debugging inbound packets
-    "dump_packets_out": false // for debugging outbound packets
+    "trace": false,
+    "world_trace": false,
+    "dump_packets_in": false,
+    "dump_packets_out": false
   },
   "client_configuration": {
-    "titanium_port": 5998, // don't change
-    "titanium_opcodes": "login_opcodes.conf", // opcodes for the titanium era clients
-    "sod_port": 5999, // don't change
-    "sod_opcodes": "login_opcodes_sod.conf" // opcodes for sod and higher era clients
+    "titanium_port": 5998,
+    "titanium_opcodes": "login_opcodes.conf",
+    "sod_port": 5999,
+    "sod_opcodes": "login_opcodes_sod.conf"
   }
-}
+}

loginserver/loginserver_command_handler.cpp

@@ -59,7 +59,7 @@ namespace LoginserverCommandHandler {
 		function_map["world-admin:create"]                    = &LoginserverCommandHandler::CreateLoginserverWorldAdminAccount;
 		function_map["world-admin:update"]                    = &LoginserverCommandHandler::UpdateLoginserverWorldAdminAccountPassword;
 
-		EQEmuCommand::HandleMenu(function_map, cmd, argc, argv);
+		EQEmuCommand::HandleMenu(function_map, cmd, "loginserver", argc, argv);
 	}
 
 	/**
@@ -112,6 +112,9 @@ namespace LoginserverCommandHandler {
 			return;
 		}
 
+		server.token_manager = new LoginserverWebserver::TokenManager;
+		server.token_manager->LoadApiTokens();
+
 		for (auto &it : server.token_manager->loaded_api_tokens) {
 			LogInfo(
 				"token [{0}] can_write [{1}] can_read [{2}]",
@@ -133,8 +136,8 @@ namespace LoginserverCommandHandler {
 		description = "Creates Local Loginserver Account";
 
 		std::vector<std::string> arguments = {
-			"--username",
-			"--password"
+			"{username}",
+			"{password}"
 		};
 		std::vector<std::string> options   = {
 			"--email=*"
@@ -147,8 +150,8 @@ namespace LoginserverCommandHandler {
 		EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
 
 		AccountManagement::CreateLoginServerAccount(
-			cmd("--username").str(),
-			cmd("--password").str(),
+			cmd(2).str(),
+			cmd(3).str(),
 			cmd("--email").str()
 		);
 	}
@@ -164,9 +167,9 @@ namespace LoginserverCommandHandler {
 		description = "Creates Loginserver World Administrator Account";
 
 		std::vector<std::string> arguments = {
-			"--username",
-			"--password",
-			"--email"
+			"{username}",
+			"{password}",
+			"{email}"
 		};
 		std::vector<std::string> options   = {};
 
@@ -177,9 +180,9 @@ namespace LoginserverCommandHandler {
 		EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
 
 		AccountManagement::CreateLoginserverWorldAdminAccount(
-			cmd("--username").str(),
-			cmd("--password").str(),
-			cmd("--email").str()
+			cmd(2).str(),
+			cmd(3).str(),
+			cmd(4).str()
 		);
 	}
 
@@ -194,8 +197,8 @@ namespace LoginserverCommandHandler {
 		description = "Check user login credentials";
 
 		std::vector<std::string> arguments = {
-			"--username",
-			"--password"
+			"{username}",
+			"{password}"
 		};
 		std::vector<std::string> options   = {};
 
@@ -206,11 +209,11 @@ namespace LoginserverCommandHandler {
 		EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
 
 		auto res = AccountManagement::CheckLoginserverUserCredentials(
-			cmd("--username").str(),
-			cmd("--password").str()
+			cmd(2).str(),
+			cmd(3).str()
 		);
 
-		LogInfo("Credentials were {0}", res == true ? "accepted" : "not accepted");
+		LogInfo("Credentials were {0}", res != 0 ? "accepted" : "not accepted");
 	}
 
 	/**
@@ -224,8 +227,8 @@ namespace LoginserverCommandHandler {
 		description = "Change user login credentials";
 
 		std::vector<std::string> arguments = {
-			"--username",
-			"--password"
+			"{username}",
+			"{password}"
 		};
 		std::vector<std::string> options   = {};
 
@@ -236,8 +239,8 @@ namespace LoginserverCommandHandler {
 		EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
 
 		AccountManagement::UpdateLoginserverUserCredentials(
-			cmd("--username").str(),
-			cmd("--password").str()
+			cmd(2).str(),
+			cmd(3).str()
 		);
 	}
 
@@ -252,8 +255,8 @@ namespace LoginserverCommandHandler {
 		description = "Check user external login credentials";
 
 		std::vector<std::string> arguments = {
-			"--username",
-			"--password"
+			"{username}",
+			"{password}"
 		};
 		std::vector<std::string> options   = {};
 
@@ -264,8 +267,8 @@ namespace LoginserverCommandHandler {
 		EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
 
 		auto res = AccountManagement::CheckExternalLoginserverUserCredentials(
-			cmd("--username").str(),
-			cmd("--password").str()
+			cmd(2).str(),
+			cmd(3).str()
 		);
 
 		LogInfo("Credentials were {0}", res ? "accepted" : "not accepted");
@@ -282,8 +285,8 @@ namespace LoginserverCommandHandler {
 		description = "Update world admin account password";
 
 		std::vector<std::string> arguments = {
-			"--username",
-			"--password"
+			"{username}",
+			"{password}"
 		};
 		std::vector<std::string> options   = {};
 
@@ -294,8 +297,8 @@ namespace LoginserverCommandHandler {
 		EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
 
 		AccountManagement::UpdateLoginserverWorldAdminAccountPasswordByName(
-			cmd("--username").str(),
-			cmd("--password").str()
+			cmd(2).str(),
+			cmd(3).str()
 		);
 	}
 }

loginserver/main.cpp

@@ -23,7 +23,6 @@
 #include "../common/opcodemgr.h"
 #include "../common/event/event_loop.h"
 #include "../common/timer.h"
-#include "../common/platform.h"
 #include "../common/crash.h"
 #include "../common/eqemu_logsys.h"
 #include "../common/http/httplib.h"
@@ -36,29 +35,34 @@
 #include <sstream>
 
 LoginServer server;
-EQEmuLogSys LogSys;
 bool        run_server = true;
 
 void CatchSignal(int sig_num)
 {
 }
 
-int main(int argc, char **argv)
+void LoadDatabaseConnection()
 {
-	RegisterExecutablePlatform(ExePlatformLogin);
-	set_exception_handler();
+	LogInfo("MySQL Database Init");
 
-	LogInfo("Logging System Init");
+	server.db = new Database(
+		server.config.GetVariableString("database", "user", "root"),
+		server.config.GetVariableString("database", "password", ""),
+		server.config.GetVariableString("database", "host", "localhost"),
+		server.config.GetVariableString("database", "port", "3306"),
+		server.config.GetVariableString("database", "db", "peq")
+	);
 
-	if (argc == 1) {
-		LogSys.LoadLogSettingsDefaults();
-	}
+}
 
+void LoadServerConfig()
+{
 	server.config = EQ::JsonConfigFile::Load("login.json");
 	LogInfo("Config System Init");
 
+
 	/**
-	 * options: logging
+	 * Logging
 	 */
 	server.options.Trace(server.config.GetVariableBool("logging", "trace", false));
 	server.options.WorldTrace(server.config.GetVariableBool("logging", "world_trace", false));
@@ -66,7 +70,7 @@ int main(int argc, char **argv)
 	server.options.DumpOutPackets(server.config.GetVariableBool("logging", "dump_packets_out", false));
 
 	/**
-	 * options: worldservers
+	 * Worldservers
 	 */
 	server.options.RejectDuplicateServers(
 		server.config.GetVariableBool(
@@ -77,7 +81,7 @@ int main(int argc, char **argv)
 	server.options.AllowUnregistered(server.config.GetVariableBool("worldservers", "unregistered_allowed", true));
 
 	/**
-	 * options: account
+	 * Account
 	 */
 	server.options.AutoCreateAccounts(server.config.GetVariableBool("account", "auto_create_accounts", true));
 	server.options.AutoLinkAccounts(server.config.GetVariableBool("account", "auto_link_accounts", false));
@@ -92,6 +96,9 @@ int main(int argc, char **argv)
 	);
 #endif
 
+	/**
+	 * Default Loginserver Name (Don't change)
+	 */
 	server.options.DefaultLoginServerName(
 		server.config.GetVariableString(
 			"general",
@@ -100,6 +107,10 @@ int main(int argc, char **argv)
 		)
 	);
 
+	/**
+	 * Security
+	 */
+
 #ifdef ENABLE_SECURITY
 	server.options.EncryptionMode(server.config.GetVariableInt("security", "mode", 13));
 #else
@@ -115,23 +126,44 @@ int main(int argc, char **argv)
 			true
 		)
 	);
+}
+
+int main(int argc, char **argv)
+{
+	set_exception_handler();
+
+	LogInfo("Logging System Init");
+
+	if (argc == 1) {
+		EQEmuLogSys::Get()->LoadLogSettingsDefaults("loginserver");
+	}
+
+	/**
+	 * Command handler
+	 */
+	if (argc > 1) {
+		EQEmuLogSys::Get()->SilenceConsoleLogging();
+
+		LoadServerConfig();
+		LoadDatabaseConnection();
+
+		EQEmuLogSys::Get()->LoadLogSettingsDefaults("loginserver");
+		EQEmuLogSys::Get()->log_settings[Logs::Debug].log_to_console      = static_cast<uint8>(Logs::General);
+		EQEmuLogSys::Get()->log_settings[Logs::Debug].is_category_enabled = 1;
+
+		LoginserverCommandHandler::CommandHandler(argc, argv);
+	}
+
+	LoadServerConfig();
 
 	/**
 	 * mysql connect
 	 */
-	LogInfo("MySQL Database Init");
-
-	server.db = new Database(
-		server.config.GetVariableString("database", "user", "root"),
-		server.config.GetVariableString("database", "password", ""),
-		server.config.GetVariableString("database", "host", "localhost"),
-		server.config.GetVariableString("database", "port", "3306"),
-		server.config.GetVariableString("database", "db", "peq")
-	);
+	LoadDatabaseConnection();
 
 	if (argc == 1) {
-		server.db->LoadLogSettings(LogSys.log_settings);
-		LogSys.StartFileLogs();
+		server.db->LoadLogSettings(EQEmuLogSys::Get()->log_settings);
+		EQEmuLogSys::Get()->StartFileLogs();
 	}
 
 	/**
@@ -179,7 +211,7 @@ int main(int argc, char **argv)
 #endif
 
 	LogInfo("Server Started");
-	if (LogSys.log_settings[Logs::Loginserver].log_to_console == 1) {
+	if (EQEmuLogSys::Get()->log_settings[Logs::Loginserver].log_to_console == 1) {
 		LogInfo("Loginserver logging set to level [1] for more debugging, enable detail [3]");
 	}
 
@@ -195,14 +227,6 @@ int main(int argc, char **argv)
 		LoginserverWebserver::RegisterRoutes(api);
 	}
 
-	if (argc > 1) {
-		LogSys.LoadLogSettingsDefaults();
-		LogSys.log_settings[Logs::Debug].log_to_console      = static_cast<uint8>(Logs::General);
-		LogSys.log_settings[Logs::Debug].is_category_enabled = 1;
-
-		LoginserverCommandHandler::CommandHandler(argc, argv);
-	}
-
 	LogInfo("[Config] [Logging] IsTraceOn [{0}]", server.options.IsTraceOn());
 	LogInfo("[Config] [Logging] IsWorldTraceOn [{0}]", server.options.IsWorldTraceOn());
 	LogInfo("[Config] [Logging] IsDumpInPacketsOn [{0}]", server.options.IsDumpInPacketsOn());

queryserv/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(qserv_sources
 	database.cpp

queryserv/database.cpp

@@ -495,7 +495,7 @@ void Database::LoadLogSettings(EQEmuLogSys::LogSettings *log_settings)
 		 * If we go through this whole loop and nothing is set to any debug level, there is no point to create a file or keep anything open
 		 */
 		if (log_settings[log_category_id].log_to_file > 0) {
-			LogSys.file_logs_enabled = true;
+			EQEmuLogSys::Get()->file_logs_enabled = true;
 		}
 
 		categories_in_database[log_category_id] = 1;

queryserv/queryserv.cpp

@@ -22,7 +22,6 @@
 #include "../common/opcodemgr.h"
 #include "../common/rulesys.h"
 #include "../common/servertalk.h"
-#include "../common/platform.h"
 #include "../common/crash.h"
 #include "../common/event/event_loop.h"
 #include "../common/timer.h"
@@ -40,15 +39,13 @@ LFGuildManager lfguildmanager;
 std::string WorldShortName;
 const queryservconfig *Config;
 WorldServer *worldserver = 0;
-EQEmuLogSys LogSys;
 
 void CatchSignal(int sig_num) { 
 	RunLoops = false; 
 }
 
 int main() {
-	RegisterExecutablePlatform(ExePlatformQueryServ);
-	LogSys.LoadLogSettingsDefaults();
+	EQEmuLogSys::Get()->LoadLogSettingsDefaults("queryserv");
 	set_exception_handler(); 
 	Timer LFGuildExpireTimer(60000);  
 
@@ -75,8 +72,8 @@ int main() {
 	}
 
 	/* Register Log System and Settings */
-	database.LoadLogSettings(LogSys.log_settings);
-	LogSys.StartFileLogs();
+	database.LoadLogSettings(EQEmuLogSys::Get()->log_settings);
+	EQEmuLogSys::Get()->StartFileLogs();
 
 	if (signal(SIGINT, CatchSignal) == SIG_ERR)	{
 		LogInfo("Could not set signal handler");
@@ -102,7 +99,7 @@ int main() {
 		EQ::EventLoop::Get().Process();
 		Sleep(5);
 	}
-	LogSys.CloseFileLogs();
+	EQEmuLogSys::Get()->CloseFileLogs();
 }
 
 void UpdateWindowTitle(char* iNewTitle) {

shared_memory/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(shared_memory_sources
 	base_data.cpp

shared_memory/main.cpp

@@ -22,7 +22,6 @@
 #include "../common/global_define.h"
 #include "../common/shareddb.h"
 #include "../common/eqemu_config.h"
-#include "../common/platform.h"
 #include "../common/crash.h"
 #include "../common/rulesys.h"
 #include "../common/eqemu_exception.h"
@@ -34,8 +33,6 @@
 #include "spells.h"
 #include "base_data.h"
 
-EQEmuLogSys LogSys;
-
 #ifdef _WINDOWS
 #include <direct.h>
 #else
@@ -70,8 +67,7 @@ inline bool MakeDirectory(const std::string &directory_name)
 }
 
 int main(int argc, char **argv) {
-	RegisterExecutablePlatform(ExePlatformSharedMemory);
-	LogSys.LoadLogSettingsDefaults();
+	EQEmuLogSys::Get()->LoadLogSettingsDefaults("shared_memory");
 	set_exception_handler();
 
 	LogInfo("Shared Memory Loader Program");
@@ -91,8 +87,8 @@ int main(int argc, char **argv) {
 	}
 
 	/* Register Log System and Settings */
-	database.LoadLogSettings(LogSys.log_settings);
-	LogSys.StartFileLogs();
+	database.LoadLogSettings(EQEmuLogSys::Get()->log_settings);
+	EQEmuLogSys::Get()->StartFileLogs();
 
 	std::string shared_mem_directory = Config->SharedMemDir;
 	if (MakeDirectory(shared_mem_directory)) {
@@ -239,6 +235,6 @@ int main(int argc, char **argv) {
 		}
 	}
 	
-	LogSys.CloseFileLogs();
+	EQEmuLogSys::Get()->CloseFileLogs();
 	return 0;
 }

tests/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 ADD_SUBDIRECTORY(cppunit)
 

tests/cppunit/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(cppunit_sources
 	collectoroutput.cpp

ucs/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(ucs_sources
 	chatchannel.cpp

ucs/database.cpp

@@ -720,7 +720,7 @@ void Database::LoadLogSettings(EQEmuLogSys::LogSettings *log_settings)
 		 * If we go through this whole loop and nothing is set to any debug level, there is no point to create a file or keep anything open
 		 */
 		if (log_settings[log_category_id].log_to_file > 0) {
-			LogSys.file_logs_enabled = true;
+			EQEmuLogSys::Get()->file_logs_enabled = true;
 		}
 
 		categories_in_database[log_category_id] = 1;

ucs/ucs.cpp

@@ -23,7 +23,6 @@
 #include "../common/opcodemgr.h"
 #include "../common/rulesys.h"
 #include "../common/servertalk.h"
-#include "../common/platform.h"
 #include "../common/crash.h"
 #include "../common/event/event_loop.h"
 #include "database.h"
@@ -38,7 +37,6 @@
 
 ChatChannelList *ChannelList;
 Clientlist *g_Clientlist;
-EQEmuLogSys LogSys;
 Database database;
 WorldServer *worldserver = nullptr;
 
@@ -63,8 +61,7 @@ std::string GetMailPrefix() {
 }
 
 int main() {
-	RegisterExecutablePlatform(ExePlatformUCS);
-	LogSys.LoadLogSettingsDefaults();
+	EQEmuLogSys::Get()->LoadLogSettingsDefaults("ucs");
 	set_exception_handler();
 
 	// Check every minute for unused channels we can delete
@@ -97,8 +94,8 @@ int main() {
 	}
 
 	/* Register Log System and Settings */
-	database.LoadLogSettings(LogSys.log_settings);
-	LogSys.StartFileLogs();
+	database.LoadLogSettings(EQEmuLogSys::Get()->log_settings);
+	EQEmuLogSys::Get()->StartFileLogs();
 
 	char tmp[64];
 
@@ -162,7 +159,7 @@ int main() {
 
 	g_Clientlist->CloseAllConnections();
 
-	LogSys.CloseFileLogs();
+	EQEmuLogSys::Get()->CloseFileLogs();
 
 }
 

utils/scripts/eqemu_server.pl

@@ -516,13 +516,20 @@ sub check_for_input {
 }
 
 sub check_for_world_bootup_database_update {
-    if ($OS eq "Windows") {
-        @db_version = split(': ', `world db_version`);
-    }
-    if ($OS eq "Linux") {
-        @db_version = split(': ', `./world db_version`);
+
+    my $world_path = "world";
+    if (-e "bin/world") {
+        $world_path = "bin/world";
     }
 
+    #::: Get Binary DB version
+    if ($OS eq "Windows") {
+        @db_version = split(': ', `$world_path db_version`);
+    }
+    if ($OS eq "Linux") {
+        @db_version = split(': ', `./$world_path db_version`);
+    }
+    
     $binary_database_version = trim($db_version[1]);
     $local_database_version  = trim(get_mysql_result("SELECT version FROM db_version LIMIT 1"));
 
@@ -1686,7 +1693,7 @@ sub fetch_server_dlls {
 
 sub fetch_peq_db_full {
     print "[Install] Downloading latest PEQ Database... Please wait...\n";
-    get_remote_file("http://edit.peqtgc.com/weekly/peq_beta.zip", "updates_staged/peq_beta.zip", 1);
+    get_remote_file("http://edit.projecteq.net/weekly/peq_beta.zip", "updates_staged/peq_beta.zip", 1);
     print "[Install] Downloaded latest PEQ Database... Extracting...\n";
     unzip('updates_staged/peq_beta.zip', 'updates_staged/peq_db/');
     my $start_dir = "updates_staged/peq_db";
@@ -1821,6 +1828,8 @@ sub quest_files_fetch {
     if ($fc == 0) {
         print "[Update] No Quest Updates found... \n\n";
     }
+	
+    rmtree("updates_staged/");
 }
 
 sub lua_modules_fetch {

utils/sql/db_update_manifest.txt

@@ -397,6 +397,8 @@
 9141|2019_07_10_npc_flymode.sql|SHOW COLUMNS FROM `npc_types` LIKE 'flymode'|empty|
 9142|2019_09_02_required_spawn_filter.sql|SHOW COLUMNS FROM `spawnentry` LIKE 'condition_value_filter'|empty|
 9143|2019_09_16_account_table_changes.sql|SHOW COLUMNS FROM `account` LIKE 'ls_id'|empty|
+9144|2019_11_09_logsys_description_update.sql|SELECT * FROM db_version WHERE version >= 9143|empty|
+9145|2019_12_24_banned_ips_update.sql|SHOW TABLES LIKE 'Banned_IPs'|not_empty|
 
 # Upgrade conditions:
 # 	This won't be needed after this system is implemented, but it is used database that are not

utils/sql/git/required/2015_02_02_logsys_packet_logs_with_dump.sql

@@ -1,2 +1,2 @@
 REPLACE INTO `logsys_categories` (`log_category_id`, `log_category_description`) VALUES ('41', 'Packet: Server -> Client With Dump'); 
-REPLACE INTO `logsys_categories` (`log_category_id`, `log_category_description`) VALUES ('42', 'Packet: Server -> Client With Dump'); 
+REPLACE INTO `logsys_categories` (`log_category_id`, `log_category_description`) VALUES ('42', 'Packet: Client -> Server With Dump'); 

utils/sql/git/required/2019_11_09_logsys_description_update.sql

@@ -0,0 +1,11 @@
+UPDATE `logsys_categories` SET `log_category_description` = 'Packet :: Client -> Server' WHERE `log_category_id` = '5';
+UPDATE `logsys_categories` SET `log_category_description` = 'QS Server' WHERE `log_category_id` = '19';
+UPDATE `logsys_categories` SET `log_category_description` = 'TCP Connection' WHERE `log_category_id` = '26';
+UPDATE `logsys_categories` SET `log_category_description` = 'UCS Server' WHERE `log_category_id` = '31';
+UPDATE `logsys_categories` SET `log_category_description` = 'WebInterface Server' WHERE `log_category_id` = '32';
+UPDATE `logsys_categories` SET `log_category_description` = 'World Server' WHERE `log_category_id` = '33';
+UPDATE `logsys_categories` SET `log_category_description` = 'MySQL Query' WHERE `log_category_id` = '36';
+UPDATE `logsys_categories` SET `log_category_description` = 'Packet :: Server -> Client' WHERE `log_category_id` = '39';
+UPDATE `logsys_categories` SET `log_category_description` = 'Packet :: Client -> Server Unhandled' WHERE `log_category_id` = '40';
+UPDATE `logsys_categories` SET `log_category_description` = 'Packet :: Server -> Client (Dump)' WHERE `log_category_id` = '41';
+UPDATE `logsys_categories` SET `log_category_description` = 'Packet :: Client -> Server (Dump)' WHERE `log_category_id` = '42';

utils/sql/git/required/2019_12_24_banned_ips_update.sql

@@ -0,0 +1,5 @@
+RENAME TABLE `Banned_IPs` TO `Banned_IPs_`;
+
+CREATE TABLE `banned_ips` (PRIMARY KEY (`ip_address`)) SELECT `ip_address`, `notes` FROM `Banned_IPs_`;
+
+DROP TABLE IF EXISTS `Banned_IPs_`;

utils/sql/user_tables.txt

@@ -6,7 +6,7 @@ account_rewards
 adventure_details
 adventure_members
 adventure_stats
-Banned_IPs
+banned_ips
 bugs
 buyer
 char_recipe_list

wi/.gitignore

@@ -1,47 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules
-jspm_packages
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity

wi/BUILD.md

@@ -1,17 +0,0 @@
-# Building EQEmu Web Interface Reference Implementation
-
-## Required Software
-- [NodeJS](https://nodejs.org)
-
-## Install
-
-First: Make sure you have required software installed.
-
-Install 3rd Party Libraries first with the following command:
-	npm install
-
-	
-## Run
-
-Run with either your favorite NodeJS process manager or with the following command:
-	node .

wi/core/jwt_auth.js

@@ -1,27 +0,0 @@
-const jwt = require('jsonwebtoken');
-
-var Auth = function (req, res, next) {
-	var token = '';
-	try {
-		token = req.headers.authorization.substring(7);
-	} catch(ex) {
-		console.log(ex);
-		res.sendStatus(401);
-		return;
-	}
-
-	jwt.verify(token, req.key, function(err, decoded) {
-		if(err) {
-			console.log(err);
-			res.sendStatus(401);
-			return;
-		}
-		
-		req.token = decoded;
-		next();
-	});
-};
-
-module.exports = {
-	'auth': Auth
-}

wi/generate_pw_hash.js

@@ -1,4 +0,0 @@
-var sodium = require('libsodium-wrappers-sumo');
-
-var hash = sodium.crypto_pwhash_str('password', 3, 32768);
-console.log(hash);

wi/http/common.js

@@ -1,26 +0,0 @@
-var auth = require('../core/jwt_auth.js').auth;
-
-function RegisterFunction(path, fn, app, api) {
-	app.post(path, auth, function (req, res) {
-		var params = req.body.params || [];
-	
-		api.Call(fn, params)
-			.then(function(value) {
-				res.send({ response: value });
-			})
-			.catch(function(reason) {			
-				if(reason.message) {
-					res.send({ status: reason.message });
-				}
-				else if(reason === 'Not connected to world server.') {
-					res.send({ status: 'ENCONNECTED' });
-				} else {
-					res.sendStatus(500);
-				}
-			});
-	});
-}
-
-module.exports = {
-	'Register': RegisterFunction
-}

wi/http/data/account.js

@@ -1,16 +0,0 @@
-var endpoint = require('./endpoint.js');
-var auth = require('../../core/jwt_auth.js').auth;
-var sql = require('./sql.js');
-
-var RegisterAPI = function(app, api) {
-	endpoint.Register(app, api, 'account', 'account', 'id');
-	
-	//Can register custom controller actions here.
-	app.post('/api/data/account/search', auth, function (req, res) {
-		sql.Search(req, res, 'account', 'id', ['id', 'name']);
-	});
-};
-
-module.exports = {
-	'Register': RegisterAPI
-}

wi/http/data/endpoint.js

@@ -1,20 +0,0 @@
-var auth = require('../../core/jwt_auth.js').auth;
-var sql = require('./sql.js');
-
-var RegisterEndpoint = function(app, api, endpoint_verb, table_name, pkey) {
-	app.get('/api/data/' + endpoint_verb + '/:' + pkey, auth, function (req, res) {		
-		sql.Retrieve(req, res, table_name, pkey);
-	});
-	
-	app.put('/api/data/' + endpoint_verb + '/:' + pkey, auth, function (req, res) {
-		sql.CreateUpdate(req, res, table_name, pkey);
-	});
-	
-	app.delete('/api/data/' + endpoint_verb + '/:' + pkey, auth, function (req, res) {
-		sql.Delete(req, res, table_name, pkey);
-	});
-};
-
-module.exports = {
-	'Register': RegisterEndpoint
-}

wi/http/data/index.js

@@ -1,8 +0,0 @@
-var RegisterAPI = function(app, api) {
-	require('./account.js').Register(app, api);
-	require('./item.js').Register(app, api);
-};
-
-module.exports = {
-	'Register': RegisterAPI
-}

wi/http/data/item.js

@@ -1,16 +0,0 @@
-var endpoint = require('./endpoint.js');
-var auth = require('../../core/jwt_auth.js').auth;
-var sql = require('./sql.js');
-
-var RegisterAPI = function(app, api) {
-	endpoint.Register(app, api, 'item', 'items', 'id');
-	
-	//Can register custom controller actions here.
-	app.post('/api/data/item/search', auth, function (req, res) {
-		sql.Search(req, res, 'items', 'id', ['id', 'name', 'icon']);
-	});
-};
-
-module.exports = {
-	'Register': RegisterAPI
-}

wi/http/data/sql.js

@@ -1,319 +0,0 @@
-var moment = require('moment');
-
-function CreateReplace(table, body, fields) {
-	try {
-		var query = 'REPLACE INTO ' + table + ' VALUES(';
-		var first = true;
-		var args = [];
-		
-		for(var idx in fields) {
-			if(first) {
-				first = false;
-			} else {
-				query += ',';
-			}
-			
-			query += '?';
-		
-			var entry = fields[idx];
-			if(entry.type === 12) {
-				try {
-					var d = new moment(body[entry.name]);
-					
-					if(d.isValid()) {
-						args.push(d.format('YYYY-MM-DD HH:mm:ss'));
-					} else {
-						args.push(null);
-					}
-				} catch(ex) {
-					args.push(null);
-				}
-			} else {
-				args.push(body[entry.name]);
-			}
-		}
-		
-		query += ')';
-		
-		return { 'query': query, 'args': args };
-	} catch(ex) {
-		return { 'query': '', 'args': [] };
-	}
-}
-
-function CreateUpdate(req, res, table, pkey) {
-	req.mysql.getConnection(function(err, connection) {
-		try {
-			if(err) {
-				console.log(err);
-				connection.release();
-				res.sendStatus(500);
-				return;
-			}
-			
-			if(req.body[pkey] !== parseInt(req.params[pkey], 10)) {
-				connection.release();
-				res.sendStatus(400);
-				return;
-			}
-			
-			connection.query('SELECT * FROM ' + table + ' WHERE ' + pkey + '=? LIMIT 1', [req.params[pkey]], function (error, results, fields) {
-				try {
-					if(error) {
-						console.log(error);
-						connection.release();
-						res.sendStatus(400);
-						return;
-					}
-					
-					var replace = CreateReplace(table, req.body, fields);
-					if(replace.query === '') {
-						connection.release();
-						res.sendStatus(400);
-						return;
-					}
-					
-					connection.query(replace.query, replace.args, function(error, results, fields) {
-						try {
-							if(error) {
-								console.log(error);
-								connection.release();
-								res.sendStatus(400);
-								return;
-							}
-							
-							connection.release();
-							res.sendStatus(200);
-						} catch(ex) {
-							console.log(ex);
-							connection.release();
-							res.sendStatus(500);
-						}
-					});
-				} catch(ex) {
-					console.log(ex);
-					connection.release();
-					res.sendStatus(500);
-				}
-			});
-		} catch(ex) {
-			console.log(ex);
-			connection.release();
-			res.sendStatus(500);
-		}
-	});
-}
-
-function Retrieve(req, res, table, pkey) {
-	req.mysql.getConnection(function(err, connection) {
-		try {
-			if(err) {
-				console.log(err);
-				connection.release();
-				res.sendStatus(500);
-				return;
-			}
-			
-			connection.query('SELECT * FROM ' + table + ' WHERE ' + pkey + '=? LIMIT 1', [req.params[pkey]], function (error, results, fields) {
-				try {
-					if(results.length == 0) {
-						connection.release();
-						res.sendStatus(404);
-						return;
-					}
-					
-					var result = results[0];
-					var ret = { };
-					
-					for(var idx in result) {
-						var value = result[idx];
-						ret[idx] = value;
-					}
-					
-					connection.release();
-					res.json(ret);
-				} catch(ex) {
-					console.log(ex);
-					connection.release();
-					res.sendStatus(500);
-				}
-			});
-		} catch(ex) {
-			console.log(ex);
-			connection.release();
-			res.sendStatus(500);
-		}
-	});
-}
-
-function Delete(req, res, table, pkey) {
-	req.mysql.getConnection(function(err, connection) {
-		try {
-			if(err) {
-				console.log(err);
-				connection.release();
-				res.sendStatus(500);
-				return;
-			}
-						
-			connection.query('DELETE FROM ' + table + ' WHERE ' + pkey + '=? LIMIT 1', [req.params[pkey]], function (error, results, fields) {
-				try {
-					if(error) {
-						console.log(error);
-						connection.release();
-						res.sendStatus(400);
-						return;
-					}
-					
-					connection.release();
-					res.sendStatus(200);
-				} catch(ex) {
-					console.log(ex);
-					connection.release();
-					res.sendStatus(500);
-				}
-			});
-		} catch(ex) {
-			console.log(ex);
-			connection.release();
-			res.sendStatus(500);
-		}
-	});
-}
-
-function getLimit(req, columns) {
-	var limit = '';
-	
-	var len = parseInt(req.body['length']);
-	if(len > 100) {
-		len = 100;
-	}
-	
-	if(req.body.hasOwnProperty('start') && len != -1) {
-		limit = 'LIMIT ' + req.body['start'] + ', ' + req.body['length'];
-	}
-	
-	return limit;
-}
-
-function getOrder(req, columns) {
-	var order = '';
-	
-	if (req.body.hasOwnProperty('order') && req.body['order'].length) {
-		var orderBy = [];
-		for(var i = 0; i < req.body['order'].length; ++i) {
-			var columnIdx = parseInt(req.body['order'][i].column);
-			var column = req.body['columns'][columnIdx];
-			var columnId = column.data;
-			var dir = req.body['order'][i].dir === 'asc' ? 'ASC' : 'DESC';			
-			orderBy.push(req.mysql.escapeId(columnId) + ' ' + dir);
-		}
-		
-		order = 'ORDER BY ' + orderBy.join(',');
-	}
-	
-	return order;
-}
-
-function filter(req, columns, args) {
-	var where = '';
-	var globalSearch = [];
-	var columnSearch = [];
-	
-	if (req.body.hasOwnProperty('search') && req.body['search'].value.length) {
-		var searchTerm = req.body['search'].value;
-		for(var i = 0; i < req.body['columns'].length; ++i) {
-			var column = req.body['columns'][i];
-			
-			if(column.searchable) {
-				globalSearch.push(req.mysql.escapeId(column.data) + ' LIKE ?');
-				args.push('%' + searchTerm + '%');
-			}
-		}
-	}
-	
-	for(var i = 0; i < req.body['columns'].length; ++i) {
-		var column = req.body['columns'][i];
-		var searchTerm = column.search.value;
-		
-		if(searchTerm !== '' && column.searchable) {
-			columnSearch.push(req.mysql.escapeId(column.data) + ' LIKE ?');
-			args.push('%' + searchTerm + '%');
-		}
-	}
-	
-	if(globalSearch.length) {
-		where = globalSearch.join(' OR ');
-	}
-	
-	if(columnSearch.length) {
-		if(where === '') {
-			where = columnSearch.join(' AND ');
-		} else {
-			where += ' AND ';
-			where += columnSearch.join(' AND ');
-		}
-	}
-	
-	if(where !== '') {
-		where = 'WHERE ' + where;
-	}
-	
-	return where;
-}
-
-function Search(req, res, table, pkey, columns) {
-	var args = [];
-	var limit = getLimit(req, columns);
-	var order = getOrder(req, columns);
-	var where = filter(req, columns, args);
-
-	var query = 'SELECT ' + columns.join(', ') + ' FROM ' + table + ' ' + where + ' ' + order + ' ' + limit;
-	
-	req.mysql.getConnection(function(err, connection) {
-		try {
-			if(err) {
-				console.log(err);
-				connection.release();
-				res.sendStatus(500);
-				return;
-			}
-			
-			connection.query(query, args, function (error, results, fields) {
-				try {
-					var ret = [];
-					
-					for(var i in results) {
-						var result = results[i];
-						
-						var obj = { };
-						for(var idx in result) {
-							var value = result[idx];
-							obj[idx] = value;
-						}
-						
-						ret.push(obj);
-					}
-					
-					connection.release();
-					res.json(ret);
-				} catch(ex) {
-					console.log(ex);
-					connection.release();
-					res.sendStatus(500);
-				}
-			});
-		} catch(ex) {
-			console.log(ex);
-			connection.release();
-			res.sendStatus(500);
-		}
-	});
-};
-
-module.exports = {
-	'CreateUpdate': CreateUpdate,
-	'Retrieve': Retrieve,
-	'Delete': Delete,
-	'Search': Search,
-}

wi/http/eqw.js

@@ -1,16 +0,0 @@
-const common = require('./common.js');
-
-var RegisterEQW = function(app, api) {
-	common.Register('/api/eqw/getconfig', 'EQW::GetConfig', app, api);
-	common.Register('/api/eqw/islocked', 'EQW::IsLocked', app, api);
-	common.Register('/api/eqw/lock', 'EQW::Lock', app, api);
-	common.Register('/api/eqw/unlock', 'EQW::Unlock', app, api);
-	common.Register('/api/eqw/getplayercount', 'EQW::GetPlayerCount', app, api);
-	common.Register('/api/eqw/getzonecount', 'EQW::GetZoneCount', app, api);
-	common.Register('/api/eqw/getlaunchercount', 'EQW::GetLauncherCount', app, api);
-	common.Register('/api/eqw/getloginservercount', 'EQW::GetLoginServerCount', app, api);
-};
-
-module.exports = {
-	'Register': RegisterEQW
-}

wi/http/index.js

@@ -1,9 +0,0 @@
-var RegisterAPI = function(app, api) {
-	require('./eqw.js').Register(app, api);
-	require('./token.js').Register(app);
-	require('./data').Register(app, api);
-};
-
-module.exports = {
-	'Register': RegisterAPI
-}

wi/http/token.js

@@ -1,43 +0,0 @@
-const sodium = require('libsodium-wrappers-sumo');
-const jwt = require('jsonwebtoken');
-
-var RegisterToken = function(app) {
-	app.post('/api/token', function (req, res) {
-		try {
-			req.mysql.getConnection(function(err, connection) {
-				if(err) {
-					console.log(err);
-					res.sendStatus(500);
-					connection.release();
-					return;
-				}
-				
-				connection.query('SELECT password FROM account WHERE name = ? LIMIT 1', [req.body.username], function (error, results, fields) {
-					if(results.length == 0) {
-						res.sendStatus(401);
-						connection.release();
-						return;
-					}
-					
-					
-					if(sodium.crypto_pwhash_str_verify(results[0].password, req.body.password)) {
-						var expires = Math.floor(Date.now() / 1000) + (60 * 60 * 24 * 7);
-						var token = jwt.sign({ username: req.body.username, exp: expires }, req.key);
-						res.send({token: token, expires: expires});
-						connection.release();
-					} else {
-						res.sendStatus(401);
-						connection.release();
-					}
-				});
-			});
-		} catch(ex) {
-			res.sendStatus(500);
-			console.log(ex);
-		}
-	});
-};
-
-module.exports = {
-	'Register': RegisterToken
-}

wi/index.js

@@ -1,56 +0,0 @@
-const fs = require('fs');
-const settings = JSON.parse(fs.readFileSync('settings.json', 'utf8'));
-const key = fs.readFileSync(settings.key, 'utf8');
-
-var server;
-if(settings.https.enabled) {
-	const options = {
-		key: fs.readFileSync(settings.https.key),
-		cert: fs.readFileSync(settings.https.cert)
-	};
-
-	server = require('https').createServer();
-} else {
-	server = require('http').createServer();
-}
-
-const servertalk = require('./network/servertalk_api.js');
-const websocket_iterface = require('./ws/ws_interface.js');
-const express = require('express');
-const app = express();
-const bodyParser = require('body-parser');
-const uuid = require('node-uuid');
-const jwt = require('jsonwebtoken');
-var mysql = require('mysql').createPool(settings.db);
-
-var api = new servertalk.api();
-var wsi = new websocket_iterface.wsi(server, key, api);
-api.Init(settings.servertalk.addr, settings.servertalk.port, false, settings.servertalk.key);
-
-app.use(bodyParser.json());
-app.use(bodyParser.urlencoded({ extended: true }));
-
-app.use(function(req, res, next) {
-	res.header("Access-Control-Allow-Origin", "*");
-	res.header("Access-Control-Allow-Methods", "GET,HEAD,OPTIONS,POST,PUT");
-	res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, Authorization");
-	next();
-});
-
-//make sure all routes can see our injected dependencies
-app.use(function (req, res, next) {
-	req.servertalk = api;
-	req.mysql = mysql;
-	req.key = key;
-	next();
-});
-
-app.get('/', function (req, res) {
-	res.send({ status: "online" });
-});
-
-require('./http').Register(app, api);
-require('./ws').Register(wsi, api);
-
-server.on('request', app);
-server.listen(settings.port, function () { console.log('Listening on ' + server.address().port) });