Merge branch 'master' of https://github.com/EQEmu/Server into op_charinventory_update

.gitignore

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

BUILD.md

@@ -1,64 +0,0 @@
-# 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,28 +1,120 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
-
-SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/" ${CMAKE_MODULE_PATH})
+#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 2.8)
 IF(POLICY CMP0074)
-	CMAKE_POLICY(SET CMP0074 NEW)
+	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
 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_CXX_STANDARD 11)
-SET(CMAKE_CXX_STANDARD_REQUIRED ON)
-SET(CMAKE_CXX_EXTENSIONS OFF)
+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)
 
 IF(MSVC)
-	ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
-	ADD_DEFINITIONS(-DNOMINMAX)
-	ADD_DEFINITIONS(-DCRASH_LOGGING)
+	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(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+	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(-DNOMINMAX)
 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)
 
@@ -39,284 +131,128 @@ IF(UNIX)
 	ENDIF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 ENDIF(UNIX)
 
-ADD_DEFINITIONS(-DGLM_FORCE_RADIANS)
-ADD_DEFINITIONS(-DGLM_FORCE_CTOR_INIT)
-ADD_DEFINITIONS(-DGLM_ENABLE_EXPERIMENTAL)
+#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"
+)
 
-#MSVC can fetch dependencies automatically.
-IF(MSVC)
-	INCLUDE("${CMAKE_SOURCE_DIR}/cmake/DependencyHelperMSVC.cmake")
-ENDIF()
+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"
+)
 
-#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)
+OPTION(EQEMU_LSPX "" OFF)
+MARK_AS_ADVANCED(EQEMU_LSPX)
 
-MESSAGE(STATUS "**************************************************")
-MESSAGE(STATUS "* Library Detection                              *")
-MESSAGE(STATUS "**************************************************")
+MARK_AS_ADVANCED(EQEMU_LOG_LEVEL_DEBUG)
 
-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)
+#Bots are a compile time option so on/off
 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)
 
-#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()
-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()
+#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)
 
-#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")
+#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")
 	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()
+ENDIF(NOT MSVC)
 
+#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)
+
+#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)
-	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)
+	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})
+	ENDIF()
 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)
+	OPTION(EQEMU_BUILD_ZLIB "Build internal version of zlib." OFF)
+	
 	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")
+		INCLUDE_DIRECTORIES(BEFORE SYSTEM "${CMAKE_CURRENT_BINARY_DIR}/libs/zlibng" "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng")
+		SET(SERVER_LIBS ${SERVER_LIBS} "zlibstatic")
 	ELSE()
-		SET(ZLIB_LIBRARY_TYPE "   zlib")
-		SET(ZLIB_LIBRARY_LIBS ${ZLIB_LIBRARY})
-		SET(ZLIB_LIBRARY_INCLUDE ${ZLIB_INCLUDE_DIRS})
+		INCLUDE_DIRECTORIES(SYSTEM "${ZLIB_INCLUDE_DIRS}")
+		SET(SERVER_LIBS ${SERVER_LIBS} ${ZLIB_LIBRARY})
 	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(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()
+	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)
@@ -331,32 +267,52 @@ IF(UNIX)
 	SET(SERVER_LIBS ${SERVER_LIBS} "uuid")
 ENDIF()
 
-IF(EQEMU_BUILD_LOGIN AND NOT TLS_LIBRARY_ENABLED)
-	MESSAGE(FATAL_ERROR "Login server requires a TLS Library to build.")
-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_HC AND NOT TLS_LIBRARY_ENABLED)
-	MESSAGE(FATAL_ERROR "Headless client 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_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)
@@ -365,7 +321,6 @@ 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 3.2)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
 add_subdirectory(import)
 add_subdirectory(export)

client_files/export/CMakeLists.txt

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

client_files/import/CMakeLists.txt

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

cmake/DependencyHelperMSVC.cmake

@@ -1,94 +0,0 @@
-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

@@ -0,0 +1,124 @@
+#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

@@ -1,91 +0,0 @@
-# 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

@@ -1,87 +0,0 @@
-# - 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

@@ -1,93 +0,0 @@
-# - 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 3.2)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
 SET(common_sources
 	base_packet.cpp
@@ -44,7 +44,6 @@ SET(common_sources
 	md5.cpp
 	memory_buffer.cpp
 	memory_mapped_file.cpp
-	metric_manager.cpp
 	misc.cpp
 	misc_functions.cpp
 	mutex.cpp
@@ -123,7 +122,6 @@ SET(common_headers
 	cli/terminal_color.hpp
 	data_verification.h
 	database.h
-	database_schema.h
 	dbcore.h
 	deity.h
 	emu_constants.h
@@ -174,8 +172,6 @@ SET(common_headers
 	md5.h
 	memory_buffer.h
 	memory_mapped_file.h
-	metric_event.h
-	metric_manager.h
 	misc.h
 	misc_functions.h
 	mutex.h

common/classes.cpp

@@ -573,20 +573,6 @@ 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,7 +135,6 @@ 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

@@ -38,6 +38,10 @@ 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;
@@ -69,37 +73,29 @@ namespace EQEmuCommand {
 	{
 		bool arguments_filled = true;
 
-		int index = 2;
 		for (auto &arg : arguments) {
-			if (cmd(arg).str().empty() && cmd(index).str().empty()) {
+			if (cmd(arg).str().empty()) {
 				arguments_filled = false;
 			}
-			index++;
 		}
 
 		if (!arguments_filled || argc == 2) {
 			std::string arguments_string;
 			for (auto &arg : arguments) {
-				arguments_string += " " + arg;
+				arguments_string += "  " + arg + "=*\n";
 			}
 
 			std::string options_string;
-			for (auto   &opt : options) {
+			for (auto &opt : options) {
 				options_string += "  " + opt + "\n";
 			}
 
-			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;
+			std::cout << fmt::format(
+				"Command\n\n{0} \n\nArgs\n{1}\nOptions\n{2}",
+				argv[1],
+				arguments_string,
+				options_string
+			) << std::endl;
 
 			exit(1);
 		}
@@ -127,6 +123,10 @@ 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;
 			}
@@ -182,13 +182,12 @@ namespace EQEmuCommand {
 			}
 
 			std::cout << std::endl;
-
-			std::exit(1);
+		}
+		else if	(!ran_command) {
+			std::cerr << "Unknown command [" << argv[1] << "] ! Try --help" << std::endl;
 		}
 
-		if (ran_command) {
-			std::exit(1);
-		}
+		exit(1);
 	}
 
 }

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,37 +293,6 @@ 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);
@@ -341,88 +310,65 @@ bool Database::ReserveName(uint32 account_id, char* name) {
 	return true;
 }
 
-/**
- * @param character_name
- * @return
- */
-bool Database::DeleteCharacter(char *character_name) {
-	uint32 character_id = 0;
-	if(!character_name || !strlen(character_name)) {
+/*
+	Delete the character with the name "name"
+	returns false on failure, true otherwise
+*/
+bool Database::DeleteCharacter(char *name) {
+	uint32 charid = 0;
+	if(!name ||	!strlen(name)) {
 		LogInfo("DeleteCharacter: request to delete without a name (empty char slot)");
 		return false;
 	}
+	LogInfo("Database::DeleteCharacter name : [{}]", name);
 
-	std::string query   = StringFormat("SELECT `id` from `character_data` WHERE `name` = '%s'", character_name);
-	auto        results = QueryDatabase(query);
-	for (auto   row     = results.begin(); row != results.end(); ++row) {
-		character_id = atoi(row[0]);
-	}
-
-	if (character_id <= 0) {
-		LogError("DeleteCharacter | Invalid Character ID [{}]", character_name);
+	/* Get id from character_data before deleting record so we can clean up the rest of the tables */
+	std::string query = StringFormat("SELECT `id` from `character_data` WHERE `name` = '%s'", name);
+	auto results = QueryDatabase(query);
+	for (auto row = results.begin(); row != results.end(); ++row) { charid = atoi(row[0]); }
+	if (charid <= 0){
+		LogError("Database::DeleteCharacter :: Character ({}) not found, stopping delete...", name);
 		return false;
 	}
 
-	std::string delete_type = "hard-deleted";
-	if (RuleB(Character, SoftDeletes)) {
-		delete_type       = "soft-deleted";
-		std::string query = fmt::format(
-			SQL(
-				UPDATE
-				character_data
-				SET
-				deleted_at = NOW()
-				WHERE
-				id = '{}'
-			),
-			character_id
-		);
-
-		QueryDatabase(query);
-
-		return true;
-	}
-
-	LogInfo("DeleteCharacter | Character [{}] ({}) is being [{}]", character_name, character_id, delete_type);
-
-	query = StringFormat("DELETE FROM `quest_globals` WHERE `charid` = '%d'", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_activities` WHERE `charid` = '%d'", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_enabledtasks` WHERE `charid` = '%d'", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_tasks` WHERE `charid` = '%d'", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `completed_tasks` WHERE `charid` = '%d'", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `friends` WHERE `charid` = '%d'", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `mail` WHERE `charid` = '%d'", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `timers` WHERE `char_id` = '%d'", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `inventory` WHERE `charid` = '%d'", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `char_recipe_list` WHERE `char_id` = '%d'", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `adventure_stats` WHERE `player_id` ='%d'", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `zone_flags` WHERE `charID` = '%d'", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `titles` WHERE `char_id` = '%d'", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `player_titlesets` WHERE `char_id` = '%d'", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `keyring` WHERE `char_id` = '%d'", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `faction_values` WHERE `char_id` = '%d'", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `instance_list_player` WHERE `charid` = '%d'", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_data` WHERE `id` = '%d'", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_skills` WHERE `id` = %u", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_languages` WHERE `id` = %u", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_bind` WHERE `id` = %u", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_alternate_abilities` WHERE `id` = %u", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_currency` WHERE `id` = %u", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_data` WHERE `id` = %u", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_spells` WHERE `id` = %u", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_memmed_spells` WHERE `id` = %u", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_disciplines` WHERE `id` = %u", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_material` WHERE `id` = %u", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_tribute` WHERE `id` = %u", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_bandolier` WHERE `id` = %u", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_potionbelt` WHERE `id` = %u", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_inspect_messages` WHERE `id` = %u", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_leadership_abilities` WHERE `id` = %u", character_id); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_alt_currency` WHERE `char_id` = '%d'", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `quest_globals` WHERE `charid` = '%d'", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_activities` WHERE `charid` = '%d'", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_enabledtasks` WHERE `charid` = '%d'", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_tasks` WHERE `charid` = '%d'", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `completed_tasks` WHERE `charid` = '%d'", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `friends` WHERE `charid` = '%d'", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `mail` WHERE `charid` = '%d'", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `timers` WHERE `char_id` = '%d'", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `inventory` WHERE `charid` = '%d'", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `char_recipe_list` WHERE `char_id` = '%d'", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `adventure_stats` WHERE `player_id` ='%d'", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `zone_flags` WHERE `charID` = '%d'", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `titles` WHERE `char_id` = '%d'", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `player_titlesets` WHERE `char_id` = '%d'", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `keyring` WHERE `char_id` = '%d'", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `faction_values` WHERE `char_id` = '%d'", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `instance_list_player` WHERE `charid` = '%d'", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_data` WHERE `id` = '%d'", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_skills` WHERE `id` = %u", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_languages` WHERE `id` = %u", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_bind` WHERE `id` = %u", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_alternate_abilities` WHERE `id` = %u", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_currency` WHERE `id` = %u", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_data` WHERE `id` = %u", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_spells` WHERE `id` = %u", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_memmed_spells` WHERE `id` = %u", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_disciplines` WHERE `id` = %u", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_material` WHERE `id` = %u", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_tribute` WHERE `id` = %u", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_bandolier` WHERE `id` = %u", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_potionbelt` WHERE `id` = %u", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_inspect_messages` WHERE `id` = %u", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_leadership_abilities` WHERE `id` = %u", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_alt_currency` WHERE `char_id` = '%d'", charid); QueryDatabase(query);
 #ifdef BOTS
-	query = StringFormat("DELETE FROM `guild_members` WHERE `char_id` = '%d' AND GetMobTypeById(%i) = 'C'", character_id); // note: only use of GetMobTypeById()
+	query = StringFormat("DELETE FROM `guild_members` WHERE `char_id` = '%d' AND GetMobTypeById(%i) = 'C'", charid); // note: only use of GetMobTypeById()
 #else
-	query = StringFormat("DELETE FROM `guild_members` WHERE `char_id` = '%d'", character_id);
+	query = StringFormat("DELETE FROM `guild_members` WHERE `char_id` = '%d'", charid);
 #endif
 	QueryDatabase(query);
 
@@ -706,7 +652,6 @@ 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), "
@@ -1281,7 +1226,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
 	);
@@ -1312,7 +1257,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()){

common/database.h

@@ -107,7 +107,7 @@ public:
 
 	bool	AddToNameFilter(const char* name);
 	bool	CreateCharacter(uint32 account_id, char* name, uint16 gender, uint16 race, uint16 class_, uint8 str, uint8 sta, uint8 cha, uint8 dex, uint8 int_, uint8 agi, uint8 wis, uint8 face);
-	bool	DeleteCharacter(char* character_name);
+	bool	DeleteCharacter(char* name);
 	bool	MoveCharacterToZone(const char* charname, const char* zonename);
 	bool	MoveCharacterToZone(const char* charname, const char* zonename,uint32 zoneid);
 	bool	MoveCharacterToZone(uint32 iCharID, const char* iZonename);
@@ -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,7 +179,6 @@ 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

@@ -1,295 +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
- *
- */
-
-#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 = {
-			"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

@@ -146,7 +146,7 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo
 			LogF(
 				Logs::General,
 				Logs::MySQLQuery,
-				"{0} ({1} row{2} returned) ({3}s)",
+				"{0} ({1} row{2} returned) ({3}ms)",
 				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}s)",
+				"{0} ({1} row{2} affected) ({3}ms)",
 				query,
 				requestResult.RowsAffected(),
 				requestResult.RowsAffected() == 1 ? "" : "s",

common/eq_packet_structs.h

@@ -1358,24 +1358,21 @@ struct BecomeCorpse_Struct {
 */
 struct PlayerPositionUpdateServer_Struct
 {
-/*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*/
+/*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*/
 };
 
 /*
@@ -1386,23 +1383,21 @@ struct PlayerPositionUpdateServer_Struct
 */
 struct PlayerPositionUpdateClient_Struct
 {
-/*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*/
+/*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*/
 };
 
 struct SpawnPositionUpdate_Struct

common/eqemu_config.h

@@ -165,7 +165,7 @@ class EQEmuConfig
 				fconfig >> _config->_root;
 				_config->parse_config();
 			}
-			catch (std::exception &) {
+			catch (std::exception) {
 				return false;
 			}			
 			return true;

common/eqemu_logsys.cpp

@@ -579,25 +579,3 @@ 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,12 +107,6 @@ namespace Logs {
 		Emergency,
 		Alert,
 		Notice,
-		AIScanClose,
-		AIYellForHelp,
-		AICastBeneficialClose,
-		AoeCast,
-		EntityManagement,
-		Flee,
 		MaxCategoryID /* Don't Remove this */
 	};
 
@@ -178,13 +172,7 @@ namespace Logs {
 		"Critical",
 		"Emergency",
 		"Alert",
-		"Notice",
-		"AI Scan Close",
-		"AI Yell For Help",
-		"AI Cast Beneficial Close",
-		"AOE Cast",
-		"Entity Management",
-		"Flee",
+		"Notice"
 	};
 }
 
@@ -291,16 +279,6 @@ 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:
 
 	/**

common/eqemu_logsys_log_aliases.h

@@ -21,8 +21,6 @@
 #ifndef EQEMU_EQEMU_LOGSYS_LOG_ALIASES_H
 #define EQEMU_EQEMU_LOGSYS_LOG_ALIASES_H
 
-#ifdef BUILD_LOGGING
-
 /**
  * RFC 5424
  */
@@ -491,65 +489,9 @@
         OutF(LogSys, Logs::Detail, Logs::Status, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)
 
-#define LogAIScanClose(message, ...) do {\
-    if (LogSys.log_settings[Logs::AIScanClose].is_category_enabled == 1)\
-        OutF(LogSys, Logs::General, Logs::AIScanClose, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogAIScanCloseDetail(message, ...) do {\
-    if (LogSys.log_settings[Logs::AIScanClose].is_category_enabled == 1)\
-        OutF(LogSys, Logs::Detail, Logs::AIScanClose, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogAIYellForHelp(message, ...) do {\
-    if (LogSys.log_settings[Logs::AIYellForHelp].is_category_enabled == 1)\
-        OutF(LogSys, Logs::General, Logs::AIYellForHelp, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogAIYellForHelpDetail(message, ...) do {\
-    if (LogSys.log_settings[Logs::AIYellForHelp].is_category_enabled == 1)\
-        OutF(LogSys, Logs::Detail, Logs::AIYellForHelp, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogAICastBeneficialClose(message, ...) do {\
-    if (LogSys.log_settings[Logs::AICastBeneficialClose].is_category_enabled == 1)\
-        OutF(LogSys, Logs::General, Logs::AICastBeneficialClose, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogAICastBeneficialCloseDetail(message, ...) do {\
-    if (LogSys.log_settings[Logs::AICastBeneficialClose].is_category_enabled == 1)\
-        OutF(LogSys, Logs::Detail, Logs::AICastBeneficialClose, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogAoeCast(message, ...) do {\
-    if (LogSys.log_settings[Logs::AoeCast].is_category_enabled == 1)\
-        OutF(LogSys, Logs::General, Logs::AoeCast, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogAoeCastDetail(message, ...) do {\
-    if (LogSys.log_settings[Logs::AoeCast].is_category_enabled == 1)\
-        OutF(LogSys, Logs::Detail, Logs::AoeCast, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogEntityManagement(message, ...) do {\
-    if (LogSys.log_settings[Logs::EntityManagement].is_category_enabled == 1)\
-        OutF(LogSys, Logs::General, Logs::EntityManagement, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogEntityManagementDetail(message, ...) do {\
-    if (LogSys.log_settings[Logs::EntityManagement].is_category_enabled == 1)\
-        OutF(LogSys, Logs::Detail, Logs::EntityManagement, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogFlee(message, ...) do {\
-    if (LogSys.log_settings[Logs::Flee].is_category_enabled == 1)\
-        OutF(LogSys, Logs::General, Logs::Flee, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogFleeDetail(message, ...) do {\
-    if (LogSys.log_settings[Logs::Flee].is_category_enabled == 1)\
-        OutF(LogSys, Logs::Detail, Logs::Flee, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
+/**
+* Misc
+*/
 
 #define Log(debug_level, log_category, message, ...) do {\
     if (LogSys.log_settings[log_category].is_category_enabled == 1)\
@@ -561,328 +503,5 @@
         OutF(LogSys, debug_level, log_category, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)
 
-#else
-#define LogEmergency(message, ...) do {\
-} while (0)
-
-#define LogAlert(message, ...) do {\
-} while (0)
-
-#define LogCritical(message, ...) do {\
-} while (0)
-
-#define LogError(message, ...) do {\
-} while (0)
-
-#define LogWarning(message, ...) do {\
-} while (0)
-
-#define LogNotice(message, ...) do {\
-} while (0)
-
-#define LogInfo(message, ...) do {\
-} while (0)
-
-#define LogDebug(message, ...) do {\
-} while (0)
-
-/**
- * Category
- */
-
-#define LogAA(message, ...) do {\
-} while (0)
-
-#define LogAADetail(message, ...) do {\
-} while (0)
-
-#define LogAI(message, ...) do {\
-} while (0)
-
-#define LogAIDetail(message, ...) do {\
-} while (0)
-
-#define LogAggro(message, ...) do {\
-} while (0)
-
-#define LogAggroDetail(message, ...) do {\
-} while (0)
-
-#define LogAttack(message, ...) do {\
-} while (0)
-
-#define LogAttackDetail(message, ...) do {\
-} while (0)
-
-#define LogPacketClientServer(message, ...) do {\
-} while (0)
-
-#define LogPacketClientServerDetail(message, ...) do {\
-} while (0)
-
-#define LogCombat(message, ...) do {\
-} while (0)
-
-#define LogCombatDetail(message, ...) do {\
-} while (0)
-
-#define LogCommands(message, ...) do {\
-} while (0)
-
-#define LogCommandsDetail(message, ...) do {\
-} while (0)
-
-#define LogCrash(message, ...) do {\
-} while (0)
-
-#define LogCrashDetail(message, ...) do {\
-} while (0)
-
-#define LogDoors(message, ...) do {\
-} while (0)
-
-#define LogDoorsDetail(message, ...) do {\
-} while (0)
-
-#define LogGuilds(message, ...) do {\
-} while (0)
-
-#define LogGuildsDetail(message, ...) do {\
-} while (0)
-
-#define LogInventory(message, ...) do {\
-} while (0)
-
-#define LogInventoryDetail(message, ...) do {\
-} while (0)
-
-#define LogLauncher(message, ...) do {\
-} while (0)
-
-#define LogLauncherDetail(message, ...) do {\
-} while (0)
-
-#define LogNetcode(message, ...) do {\
-} while (0)
-
-#define LogNetcodeDetail(message, ...) do {\
-} while (0)
-
-#define LogNormal(message, ...) do {\
-} while (0)
-
-#define LogNormalDetail(message, ...) do {\
-} while (0)
-
-#define LogObject(message, ...) do {\
-} while (0)
-
-#define LogObjectDetail(message, ...) do {\
-} while (0)
-
-#define LogPathing(message, ...) do {\
-} while (0)
-
-#define LogPathingDetail(message, ...) do {\
-} while (0)
-
-#define LogQSServer(message, ...) do {\
-} while (0)
-
-#define LogQSServerDetail(message, ...) do {\
-} while (0)
-
-#define LogQuests(message, ...) do {\
-} while (0)
-
-#define LogQuestsDetail(message, ...) do {\
-} while (0)
-
-#define LogRules(message, ...) do {\
-} while (0)
-
-#define LogRulesDetail(message, ...) do {\
-} while (0)
-
-#define LogSkills(message, ...) do {\
-} while (0)
-
-#define LogSkillsDetail(message, ...) do {\
-} while (0)
-
-#define LogSpawns(message, ...) do {\
-} while (0)
-
-#define LogSpawnsDetail(message, ...) do {\
-} while (0)
-
-#define LogSpells(message, ...) do {\
-} while (0)
-
-#define LogSpellsDetail(message, ...) do {\
-} while (0)
-
-#define LogTCPConnection(message, ...) do {\
-} while (0)
-
-#define LogTCPConnectionDetail(message, ...) do {\
-} while (0)
-
-#define LogTasks(message, ...) do {\
-} while (0)
-
-#define LogTasksDetail(message, ...) do {\
-} while (0)
-
-#define LogTradeskills(message, ...) do {\
-} while (0)
-
-#define LogTradeskillsDetail(message, ...) do {\
-} while (0)
-
-#define LogTrading(message, ...) do {\
-} while (0)
-
-#define LogTradingDetail(message, ...) do {\
-} while (0)
-
-#define LogTribute(message, ...) do {\
-} while (0)
-
-#define LogTributeDetail(message, ...) do {\
-} while (0)
-
-#define LogMySQLError(message, ...) do {\
-} while (0)
-
-#define LogMySQLErrorDetail(message, ...) do {\
-} while (0)
-
-#define LogMySQLQuery(message, ...) do {\
-} while (0)
-
-#define LogMySQLQueryDetail(message, ...) do {\
-} while (0)
-
-#define LogMercenaries(message, ...) do {\
-} while (0)
-
-#define LogMercenariesDetail(message, ...) do {\
-} while (0)
-
-#define LogQuestDebug(message, ...) do {\
-} while (0)
-
-#define LogQuestDebugDetail(message, ...) do {\
-} while (0)
-
-#define LogLoginserver(message, ...) do {\
-} while (0)
-
-#define LogLoginserverDetail(message, ...) do {\
-} while (0)
-
-#define LogClientLogin(message, ...) do {\
-} while (0)
-
-#define LogClientLoginDetail(message, ...) do {\
-} while (0)
-
-#define LogHeadlessClient(message, ...) do {\
-} while (0)
-
-#define LogHeadlessClientDetail(message, ...) do {\
-} while (0)
-
-#define LogHPUpdate(message, ...) do {\
-} while (0)
-
-#define LogHPUpdateDetail(message, ...) do {\
-} while (0)
-
-#define LogFixZ(message, ...) do {\
-} while (0)
-
-#define LogFixZDetail(message, ...) do {\
-} while (0)
-
-#define LogFood(message, ...) do {\
-} while (0)
-
-#define LogFoodDetail(message, ...) do {\
-} while (0)
-
-#define LogTraps(message, ...) do {\
-} while (0)
-
-#define LogTrapsDetail(message, ...) do {\
-} while (0)
-
-#define LogNPCRoamBox(message, ...) do {\
-} while (0)
-
-#define LogNPCRoamBoxDetail(message, ...) do {\
-} while (0)
-
-#define LogNPCScaling(message, ...) do {\
-} while (0)
-
-#define LogNPCScalingDetail(message, ...) do {\
-} while (0)
-
-#define LogMobAppearance(message, ...) do {\
-} while (0)
-
-#define LogMobAppearanceDetail(message, ...) do {\
-} while (0)
-
-#define LogStatus(message, ...) do {\
-} while (0)
-
-#define LogStatusDetail(message, ...) do {\
-} while (0)
-
-#define LogAIScanClose(message, ...) do {\
-} while (0)
-
-#define LogAIScanCloseDetail(message, ...) do {\
-} while (0)
-
-#define LogAIYellForHelp(message, ...) do {\
-} while (0)
-
-#define LogAIYellForHelpDetail(message, ...) do {\
-} while (0)
-
-#define LogAICastBeneficialClose(message, ...) do {\
-} while (0)
-
-#define LogAICastBeneficialCloseDetail(message, ...) do {\
-} while (0)
-
-#define LogAoeCast(message, ...) do {\
-} while (0)
-
-#define LogAoeCastDetail(message, ...) do {\
-} while (0)
-
-#define LogEntityManagement(message, ...) do {\
-} while (0)
-
-#define LogEntityManagementDetail(message, ...) do {\
-} while (0)
-
-#define LogFlee(message, ...) do {\
-} while (0)
-
-#define LogFleeDetail(message, ...) do {\
-} while (0)
-
-#define Log(debug_level, log_category, message, ...) do {\
-} while (0)
-
-#define LogF(debug_level, log_category, message, ...) do {\
-} while (0)
-#endif
 
 #endif //EQEMU_EQEMU_LOGSYS_LOG_ALIASES_H

common/event/event_loop.h

@@ -21,10 +21,6 @@ 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"] = "  ";
+  (*settings)["indentation"] = "\t";
   (*settings)["enableYAMLCompatibility"] = false;
   (*settings)["dropNullPlaceholders"] = false;
   (*settings)["useSpecialFloats"] = false;

common/json_config.cpp

@@ -32,7 +32,7 @@ EQ::JsonConfigFile EQ::JsonConfigFile::Load(
 	try {
 		ifs >> ret.m_root;
 	}
-	catch (std::exception &) {
+	catch (std::exception) {
 		return ret;
 	}
 
@@ -81,7 +81,7 @@ std::string EQ::JsonConfigFile::GetVariableString(
 			return m_root[title][parameter].asString();
 		}
 	}
-	catch (std::exception &) {
+	catch (std::exception) {
 		return default_value;
 	}
 
@@ -105,7 +105,7 @@ int EQ::JsonConfigFile::GetVariableInt(
 			return m_root[title][parameter].asInt();
 		}
 	}
-	catch (std::exception &) {
+	catch (std::exception) {
 		return default_value;
 	}
 
@@ -129,7 +129,7 @@ bool EQ::JsonConfigFile::GetVariableBool(
 			return m_root[title][parameter].asBool();
 		}
 	}
-	catch (std::exception &) {
+	catch (std::exception) {
 		return default_value;
 	}
 
@@ -153,7 +153,7 @@ double EQ::JsonConfigFile::GetVariableDouble(
 			return m_root[title][parameter].asDouble();
 		}
 	}
-	catch (std::exception &) {
+	catch (std::exception) {
 		return default_value;
 	}
 

common/linked_list.h

@@ -278,6 +278,12 @@ void LinkedListIterator<TYPE>::Replace(const TYPE& new_data)
 template<class TYPE>
 void LinkedListIterator<TYPE>::Reset()
 {
+	if (!(&list))
+	{
+		current_element=0;
+		return;
+	}
+
 	if (dir == FORWARD)
 	{
 		current_element = list.first;

common/metric_event.h

@@ -1,65 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-	
-	Copyright (C) 2001-2020 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
-*/
-
-#ifndef METRIC_EVENT_H
-#define METRIC_EVENT_H
-
-#include "types.h"
-
-namespace EQEmu
-{
-	class MetricEvent {
-	public:
-
-		enum class EventType {
-			eventNone,
-			eventNpcStatsMonitor
-		};
-
-		MetricEvent() {
-			
-			m_finalized = false;
-			m_expired = false;
-			m_event_id = 0;
-		}
-
-		virtual EventType GetEventType() const = 0;
-
-		virtual void Process() = 0;
-		virtual void Flush() = 0;
-
-		virtual void Finalize() { m_finalized = true; } // invoke MetricEvent::Finalize() inside of derived class function if not handled locally
-		bool IsFinalized() const { return m_finalized; }
-
-		virtual void Expire() { m_finalized = true; m_expired = true; } // invoke MetricEvent::Expire() inside of derived class function if not handled locally
-		bool IsExpired() const { return m_expired; }
-
-		void SetEventId(int value) { if (m_event_id == 0) { m_event_id = value; } }
-		int GetEventId() const { return m_event_id; }
-
-	private:
-
-		bool m_finalized;
-		bool m_expired;
-		int m_event_id;
-	};
-
-} // EQEmu
-
-#endif // METRIC_EVENT_H

common/metric_manager.cpp

@@ -1,112 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-	
-	Copyright (C) 2001-2020 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
-*/
-
-#include "metric_manager.h"
-#include "metric_event.h"
-
-EQEmu::MetricManager::MetricManager() {
-
-	m_current_event_id = 0;
-}
-
-void EQEmu::MetricManager::Process() {
-
-	for (std::list<MetricEvent*>::iterator iter = m_event_list.begin(); iter != m_event_list.end(); ) {
-
-		if ((*iter)->IsExpired()) {
-
-			iter = m_event_list.erase(iter);
-			continue;
-		}
-
-		(*iter)->Process();
-		++iter;
-	}
-}
-
-int EQEmu::MetricManager::RegisterEvent(MetricEvent* event_object) {
-
-	if (event_object == nullptr) {
-		return 0;
-	}
-
-	event_object->SetEventId(get_next_event_id());
-	m_event_list.push_back(event_object);
-
-	return event_object->GetEventId();
-}
-
-void EQEmu::MetricManager::FlushAll() {
-
-	for (auto iter : m_event_list) {
-		iter->Flush();
-	}
-}
-
-void EQEmu::MetricManager::FlushById(int event_id) {
-
-	for (auto iter : m_event_list) {
-		if (iter->GetEventId() == event_id) {
-
-			iter->Flush();
-			break;
-		}
-	}
-}
-
-void EQEmu::MetricManager::FinalizeAll() {
-
-	for (auto iter : m_event_list) {
-		iter->Finalize();
-	}
-}
-
-void EQEmu::MetricManager::FinalizeById(int event_id) {
-
-	for (auto iter : m_event_list) {
-		if (iter->GetEventId() == event_id) {
-
-			iter->Finalize();
-			break;
-		}
-	}
-}
-
-void EQEmu::MetricManager::ExpireAll() {
-
-	for (auto iter : m_event_list) {
-		iter->Expire();
-	}
-}
-
-void EQEmu::MetricManager::ExpireById(int event_id) {
-
-	for (auto iter : m_event_list) {
-		if (iter->GetEventId() == event_id) {
-
-			iter->Expire();
-			break;
-		}
-	}
-}
-
-int EQEmu::MetricManager::get_next_event_id() {
-
-	return ++m_current_event_id;
-}

common/misc.cpp

@@ -19,6 +19,9 @@
 #include "types.h"
 #include <cstring>
 
+#define ENC(c) (((c) & 0x3f) + ' ')
+#define DEC(c)	(((c) - ' ') & 0x3f)
+
 std::map<int,std::string> DBFieldNames;
 
 #ifndef WIN32
@@ -330,6 +333,64 @@ void LoadItemDBFieldNames() {
 	DBFieldNames[113]="unknown115";		// ? (end quote)
 }
 
+void encode_length(unsigned long length, char *out)
+{
+char buf[4];
+	memcpy(buf,&length,sizeof(unsigned long));
+	encode_chunk(buf,3,out);
+}
+
+unsigned long encode(char *in, unsigned long length, char *out)
+{
+unsigned long used=0,len=0;
+	while(used<length) {
+		encode_chunk(in+used,length-used,out+len);
+		used+=3;
+		len+=4;
+	}
+	*(out+len)=0;
+
+	return len;
+}
+
+unsigned long decode_length(char *in)
+{
+int length;
+char buf[4];
+	decode_chunk(in,&buf[0]);
+	buf[3]=0;
+	memcpy(&length,buf,sizeof(unsigned long));
+
+	return length;
+}
+
+void decode(char *in, char *out)
+{
+char *ptr=in;
+char *outptr=out;
+	while(*ptr) {
+		decode_chunk(ptr,outptr);
+		ptr+=4;
+		outptr+=3;
+	}
+	*outptr=0;
+}
+
+void encode_chunk(char *in, int len, char *out)
+{
+	*out=ENC(in[0] >> 2);
+	*(out+1)=ENC((in[0] << 4)|(((len<2 ? 0 : in[1]) >> 4) & 0xF));
+	*(out+2)=ENC(((len<2 ? 0 : in[1]) << 2)|(((len<3 ? 0 : in[2]) >> 6) & 0x3));
+	*(out+3)=ENC((len<3 ? 0 : in[2]));
+}
+
+void decode_chunk(char *in, char *out)
+{
+	*out = DEC(*in) << 2 | DEC(in[1]) >> 4;
+	*(out+1) = DEC(in[1]) << 4 | DEC(in[2]) >> 2;
+	*(out+2) = DEC(in[2]) << 6 | DEC(in[3]);
+}
+
 void dump_message_column(unsigned char *buffer, unsigned long length, std::string leader, FILE *to)
 {
 unsigned long i,j;

common/misc.h

@@ -17,6 +17,13 @@ int Tokenize(std::string s, std::map<int,std::string> & tokens, char delim='|');
 
 void LoadItemDBFieldNames();
 
+void encode_length(unsigned long length, char *out);
+unsigned long decode_length(char *in);
+unsigned long encode(char *in, unsigned long length, char *out);
+void decode(char *in, char *out);
+void encode_chunk(char *in, int len, char *out);
+void decode_chunk(char *in, char *out);
+
 #ifndef WIN32
 int print_stacktrace();
 #endif

common/net/console_server_connection.cpp

@@ -116,21 +116,17 @@ bool EQ::Net::ConsoleServerConnection::SendChannelMessage(const ServerChannelMes
 	}
 
 	switch (scm->chan_num) {
-		case 4: {
-			if (RuleB(Chat, ServerWideAuction)) {
+		if (RuleB(Chat, ServerWideAuction)) {
+			case 4: {
 				QueueMessage(fmt::format("{0} auctions, '{1}'", scm->from, scm->message));
 				break;
-			} else { // I think we want default action in this case?
-				return false;
 			}
 		}
 
-		case 5: {
-			if (RuleB(Chat, ServerWideOOC)) {
+		if (RuleB(Chat, ServerWideOOC)) {
+			case 5: {
 				QueueMessage(fmt::format("{0} says ooc, '{1}'", scm->from, scm->message));
 				break;
-			} else { // I think we want default action in this case?
-				return false;
 			}
 		}
 

common/net/daybreak_connection.cpp

@@ -399,7 +399,7 @@ void EQ::Net::DaybreakConnection::Process()
 
 		ProcessQueue();
 	}
-	catch (std::exception &ex) {
+	catch (std::exception ex) {
 		if (m_owner->m_on_error_message) {
 			m_owner->m_on_error_message(fmt::format("Error processing connection: {0}", ex.what()));
 		}

common/net/tcp_connection.cpp

@@ -203,10 +203,6 @@ 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);
@@ -224,10 +220,6 @@ 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);
@@ -244,11 +236,3 @@ 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,12 +24,10 @@ 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/net/websocket_server.cpp

@@ -61,7 +61,7 @@ EQ::Net::WebsocketServer::WebsocketServer(const std::string &addr, int port)
 				auto &connection = iter->second;
 				connection->GetWebsocketConnection()->ping("keepalive");
 			}
-			catch (std::exception &) {
+			catch (std::exception) {
 				iter->second->GetTCPConnection()->Disconnect();
 			}
 
@@ -157,7 +157,7 @@ void EQ::Net::WebsocketServer::DispatchEvent(WebsocketSubscriptionEvent evt, Jso
 			}
 		}
 	}
-	catch (std::exception &) {
+	catch (std::exception) {
 	}
 }
 
@@ -190,7 +190,7 @@ Json::Value EQ::Net::WebsocketServer::Login(WebsocketServerConnection *connectio
 
 		return ret;
 	}
-	catch (std::exception &) {
+	catch (std::exception) {
 		throw WebsocketException("Unable to process login request");
 	}
 }
@@ -212,7 +212,7 @@ Json::Value EQ::Net::WebsocketServer::Subscribe(WebsocketServerConnection *conne
 	catch (WebsocketException &ex) {
 		throw ex;
 	}
-	catch (std::exception &) {
+	catch (std::exception) {
 		throw WebsocketException("Unable to process unsubscribe request");
 	}
 }
@@ -234,7 +234,7 @@ Json::Value EQ::Net::WebsocketServer::Unsubscribe(WebsocketServerConnection *con
 	catch (WebsocketException &ex) {
 		throw ex;
 	}
-	catch (std::exception &) {
+	catch (std::exception) {
 		throw WebsocketException("Unable to process unsubscribe request");
 	}
 }

common/patches/rof.cpp

@@ -624,7 +624,6 @@ 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);
@@ -4315,7 +4314,6 @@ 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

@@ -37,7 +37,6 @@
 #include <sstream>
 #include <numeric>
 #include <cassert>
-#include <cinttypes>
 
 
 namespace RoF2
@@ -687,6 +686,25 @@ 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);
@@ -3549,7 +3567,7 @@ namespace RoF2
 			{
 				eq->items[i].Unknown18 = 0;
 				if (i < 80) {
-					snprintf(eq->items[i].SerialNumber, sizeof(eq->items[i].SerialNumber), "%016" PRId64, emu->SerialNumber[i]);
+					snprintf(eq->items[i].SerialNumber, sizeof(eq->items[i].SerialNumber), "%016d", emu->SerialNumber[i]);
 					eq->ItemCost[i] = emu->ItemCost[i];
 				}
 				else {
@@ -4527,6 +4545,27 @@ 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,6 +52,7 @@ E(OP_CastSpell)
 E(OP_ChannelMessage)
 E(OP_CharInventory)
 E(OP_ClickObjectAction)
+E(OP_ClientUpdate)
 E(OP_Consider)
 E(OP_Damage)
 E(OP_DeleteCharge)
@@ -154,6 +155,7 @@ 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		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*/
+	/*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*/
 };
 
 /*
@@ -1648,23 +1648,22 @@ struct PlayerPositionUpdateServer_Struct
 */
 struct PlayerPositionUpdateClient_Struct
 {
-/*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*/
+	/*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*/
 };
 
 /*

common/patches/rof_structs.h

@@ -1608,22 +1608,22 @@ struct RespawnWindow_Struct {
 */
 struct PlayerPositionUpdateServer_Struct
 {
-/*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;
+/*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;
 /*0024*/
 };
 
@@ -1636,22 +1636,21 @@ struct PlayerPositionUpdateServer_Struct
 */
 struct PlayerPositionUpdateClient_Struct
 {
-/*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
+/*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
 /*0042*/
 };
 

common/patches/sod.cpp

@@ -2926,7 +2926,6 @@ 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,7 +2387,6 @@ 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,25 +350,6 @@ 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);
@@ -1897,28 +1878,6 @@ 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,7 +27,6 @@ E(OP_BecomeTrader)
 E(OP_Buff)
 E(OP_ChannelMessage)
 E(OP_CharInventory)
-E(OP_ClientUpdate)
 E(OP_Damage)
 E(OP_DeleteCharge)
 E(OP_DeleteItem)
@@ -83,7 +82,6 @@ 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,7 +3252,6 @@ 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/ptimer.cpp

@@ -190,6 +190,10 @@ bool PersistentTimer::Clear(Database *db) {
 
 /* This function checks if the timer triggered */
 bool PersistentTimer::Expired(Database *db, bool iReset) {
+	if (this == nullptr) {
+		LogError("Null timer during ->Check()!?\n");
+		return(true);
+	}
 	uint32 current_time = get_current_time();
 	if (current_time-start_time >= timer_time) {
 		if (enabled && iReset) {

common/ruletypes.h

@@ -157,8 +157,6 @@ 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_BOOL(Character, SoftDeletes, true, "When characters are deleted in character select, they are only soft deleted")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Mercs)
@@ -213,7 +211,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, "")
@@ -494,7 +492,6 @@ 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)
@@ -568,13 +565,13 @@ RULE_INT(Range, MobPositionUpdates, 600, "")
 RULE_INT(Range, ClientPositionUpdates, 300, "")
 RULE_INT(Range, ClientForceSpawnUpdateRange, 1000, "")
 RULE_INT(Range, CriticalDamage, 80, "")
-RULE_INT(Range, MobCloseScanDistance, 600, "")
+RULE_INT(Range, ClientNPCScan, 300, "")
 RULE_CATEGORY_END()
 
 
 #ifdef BOTS
 RULE_CATEGORY(Bots)
-RULE_INT(Bots, BotExpansionSettings, 16383, "Sets the expansion settings for bot use. Defaults to all expansions enabled up to TSS")
+RULE_INT(Bots, AAExpansion, 8, "Bots get AAs through this expansion")
 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")
@@ -598,12 +595,8 @@ 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, 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_BOOL(Bots, AllowOwnerAutoDefend, false, "When active, 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
 
@@ -633,7 +626,6 @@ 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)
@@ -734,6 +726,7 @@ RULE_BOOL(Inventory, EnforceAugmentWear, true, "Forces augment wear slot validat
 RULE_BOOL(Inventory, DeleteTransformationMold, true, "False if you want mold to last forever")
 RULE_BOOL(Inventory, AllowAnyWeaponTransformation, false, "Weapons can use any weapon transformation")
 RULE_BOOL(Inventory, TransformSummonedBags, false, "Transforms summoned bags into disenchanted ones instead of deleting")
+RULE_BOOL(Inventory, BulkSendEnMasse, false, "Sends player 'Enter World' inventory as one massive packet (true = normal behavior)")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Client)

common/servertalk.h

@@ -262,6 +262,9 @@ public:
 	}
 
 	ServerPacket* Copy() {
+		if (this == 0) {
+			return 0;
+		}
 		ServerPacket* ret = new ServerPacket(this->opcode, this->size);
 		if (this->size)
 			memcpy(ret->pBuffer, this->pBuffer, this->size);

common/shareddb.cpp

@@ -132,36 +132,18 @@ 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();
 	}
 
-	if (!results.RowCount()) {
-
-		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];
 
-		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();
-	}
+	if (mail_key.length() > 8 && key_only)
+		return mail_key.substr(8);
+	else
+		return mail_key;
 }
 
 bool SharedDatabase::SaveCursor(uint32 char_id, std::list<EQEmu::ItemInstance*>::const_iterator &start, std::list<EQEmu::ItemInstance*>::const_iterator &end)

common/spdat.cpp

@@ -87,9 +87,8 @@
 
 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.cpp

@@ -222,7 +222,7 @@ bool StringIsNumber(const std::string &s) {
 		auto r = stod(s);
 		return true;
 	}
-	catch (std::exception &) {
+	catch (std::exception) {
 		return false;
 	}
 }

common/string_util.h

@@ -27,12 +27,6 @@
 #include <fmt/format.h>
 #endif
 
-#ifdef _WINDOWS
-#include <ctype.h>
-#include <functional>
-#include <algorithm>
-#endif
-
 #include "types.h"
 
 //std::string based
@@ -44,38 +38,6 @@ 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,10 +13,6 @@
 #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,22 +1,20 @@
-/**
- * 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
- *
- */
+/*	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
+*/
 
 #ifndef _EQEMU_VERSION_H
 #define _EQEMU_VERSION_H
@@ -24,24 +22,22 @@
 #define LOGIN_VERSION "0.8.0"
 #define EQEMU_PROTOCOL_VERSION "0.3.10"
 
-#define CURRENT_VERSION "2.0"
+#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
+*/
 
 
-/**
- * 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 9146
+#define CURRENT_BINARY_DATABASE_VERSION 9143
 
 #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 3.2)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
 SET(eqlaunch_sources
 	eqlaunch.cpp

hc/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
 SET(hc_sources
 	eq.cpp
@@ -13,10 +13,14 @@ 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})
+TARGET_LINK_LIBRARIES(hc ${SERVER_LIBS} ${OPENSSL_LIBRARIES})
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)

libs/luabind/CMakeLists.txt

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

loginserver/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
 SET(eqlogin_sources
 	account_management.cpp
@@ -28,10 +28,14 @@ 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})
+TARGET_LINK_LIBRARIES(loginserver ${SERVER_LIBS} ${OPENSSL_LIBRARIES})
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)

loginserver/encryption.cpp

@@ -1,17 +1,26 @@
-#include "encryption.h"
+/**
+ * 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
+ *
+ */
 
-#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>
 
@@ -21,45 +30,7 @@
 
 #endif
 
-/**
- * @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 "";
-	}
-}
+#include "encryption.h"
 
 /**
  * @param buffer_in
@@ -70,69 +41,17 @@ std::string GetEncryptionByModeId(uint32 mode)
  */
 const char *eqcrypt_block(const char *buffer_in, size_t buffer_in_sz, char *buffer_out, bool enc)
 {
-#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;
-	
+	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);
-#endif
+
+	DES_ncbc_encrypt((const unsigned char *) buffer_in, (unsigned char *) buffer_out, (long) buffer_in_sz, &k, &v, enc);
 	return buffer_out;
 }
 
@@ -142,34 +61,17 @@ 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;
-	ret.reserve(32);
-
-#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
+	std::string   ret;
 	unsigned char md5_digest[16];
-	char tmp[4];
+	char          tmp[4];
 
-	MD5((const unsigned char*)msg.c_str(), msg.length(), md5_digest);
+	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;
 }
@@ -180,34 +82,17 @@ std::string eqcrypt_md5(const std::string &msg)
  */
 std::string eqcrypt_sha1(const std::string &msg)
 {
-	std::string ret;
-	ret.reserve(40);
-
-#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
+	std::string   ret;
 	unsigned char sha_digest[20];
-	char tmp[4];
+	char          tmp[4];
 
-	SHA1((const unsigned char*)msg.c_str(), msg.length(), sha_digest);
+	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;
 }
@@ -218,34 +103,17 @@ std::string eqcrypt_sha1(const std::string &msg)
  */
 std::string eqcrypt_sha512(const std::string &msg)
 {
-	std::string ret;
-	ret.reserve(128);
-
-#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
+	std::string   ret;
 	unsigned char sha_digest[64];
-	char tmp[4];
+	char          tmp[4];
 
-	SHA512((const unsigned char*)msg.c_str(), msg.length(), sha_digest);
+	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;
 }
@@ -258,8 +126,7 @@ std::string eqcrypt_sha512(const std::string &msg)
  */
 std::string eqcrypt_argon2(const std::string &msg)
 {
-	char        buffer[crypto_pwhash_STRBYTES] = {0};
-	std::string ret;
+	char buffer[crypto_pwhash_STRBYTES];
 
 	if (crypto_pwhash_str(
 		&buffer[0],
@@ -271,8 +138,7 @@ std::string eqcrypt_argon2(const std::string &msg)
 		return "";
 	}
 
-	ret = buffer;
-	return ret;
+	return buffer;
 }
 
 /**
@@ -281,21 +147,16 @@ std::string eqcrypt_argon2(const std::string &msg)
  */
 std::string eqcrypt_scrypt(const std::string &msg)
 {
-	char        buffer[crypto_pwhash_scryptsalsa208sha256_STRBYTES] = {0};
-	std::string ret;
+	char buffer[crypto_pwhash_scryptsalsa208sha256_STRBYTES];
 
 	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 "";
 	}
 
-	ret = buffer;
-	return ret;
+	return buffer;
 }
 
 #endif
@@ -370,3 +231,38 @@ 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,7 +38,6 @@
 struct LoginServer
 {
 public:
-
 	LoginServer() : db(nullptr), server_manager(nullptr) {
 
 	}

loginserver/login_util/login.json

@@ -1,37 +1,39 @@
 {
   "database": {
-    "host": "127.0.0.1",
-    "port": "3306",
-    "db": "peq",
-    "user": "root",
-    "password": "eqemu"
+    "host": "127.0.0.1", // database host
+    "port": "3306", // database port
+    "db": "peq", // database name
+    "user": "root", // database user
+    "password": "eqemu" // database password
   },
   "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,
-    "reject_duplicate_servers": false
+    "unregistered_allowed": true, // allows worldservers to connect to your loginserver without server admin authentication
+    "reject_duplicate_servers": false // if enabled, rejects duplicate worldservers
   },
   "web_api": {
-    "enabled": true,
-    "port": 6000
+    "enabled": true, // enable/disable embedded webserver api
+    "port": 6000 // the port you want the web api to serve on (recommended not to change)
   },
   "security": {
-    "mode": 14,
-    "allow_password_login": true,
-    "allow_token_login": true
+    "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
   },
   "logging": {
-    "trace": false,
-    "world_trace": false,
-    "dump_packets_in": false,
-    "dump_packets_out": false
+    "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
   },
   "client_configuration": {
-    "titanium_port": 5998,
-    "titanium_opcodes": "login_opcodes.conf",
-    "sod_port": 5999,
-    "sod_opcodes": "login_opcodes_sod.conf"
+    "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
   }
-}
+}

loginserver/loginserver_command_handler.cpp

@@ -112,9 +112,6 @@ 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}]",
@@ -136,8 +133,8 @@ namespace LoginserverCommandHandler {
 		description = "Creates Local Loginserver Account";
 
 		std::vector<std::string> arguments = {
-			"{username}",
-			"{password}"
+			"--username",
+			"--password"
 		};
 		std::vector<std::string> options   = {
 			"--email=*"
@@ -150,8 +147,8 @@ namespace LoginserverCommandHandler {
 		EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
 
 		AccountManagement::CreateLoginServerAccount(
-			cmd(2).str(),
-			cmd(3).str(),
+			cmd("--username").str(),
+			cmd("--password").str(),
 			cmd("--email").str()
 		);
 	}
@@ -167,9 +164,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   = {};
 
@@ -180,9 +177,9 @@ namespace LoginserverCommandHandler {
 		EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
 
 		AccountManagement::CreateLoginserverWorldAdminAccount(
-			cmd(2).str(),
-			cmd(3).str(),
-			cmd(4).str()
+			cmd("--username").str(),
+			cmd("--password").str(),
+			cmd("--email").str()
 		);
 	}
 
@@ -197,8 +194,8 @@ namespace LoginserverCommandHandler {
 		description = "Check user login credentials";
 
 		std::vector<std::string> arguments = {
-			"{username}",
-			"{password}"
+			"--username",
+			"--password"
 		};
 		std::vector<std::string> options   = {};
 
@@ -209,11 +206,11 @@ namespace LoginserverCommandHandler {
 		EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
 
 		auto res = AccountManagement::CheckLoginserverUserCredentials(
-			cmd(2).str(),
-			cmd(3).str()
+			cmd("--username").str(),
+			cmd("--password").str()
 		);
 
-		LogInfo("Credentials were {0}", res != 0 ? "accepted" : "not accepted");
+		LogInfo("Credentials were {0}", res == true ? "accepted" : "not accepted");
 	}
 
 	/**
@@ -227,8 +224,8 @@ namespace LoginserverCommandHandler {
 		description = "Change user login credentials";
 
 		std::vector<std::string> arguments = {
-			"{username}",
-			"{password}"
+			"--username",
+			"--password"
 		};
 		std::vector<std::string> options   = {};
 
@@ -239,8 +236,8 @@ namespace LoginserverCommandHandler {
 		EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
 
 		AccountManagement::UpdateLoginserverUserCredentials(
-			cmd(2).str(),
-			cmd(3).str()
+			cmd("--username").str(),
+			cmd("--password").str()
 		);
 	}
 
@@ -255,8 +252,8 @@ namespace LoginserverCommandHandler {
 		description = "Check user external login credentials";
 
 		std::vector<std::string> arguments = {
-			"{username}",
-			"{password}"
+			"--username",
+			"--password"
 		};
 		std::vector<std::string> options   = {};
 
@@ -267,8 +264,8 @@ namespace LoginserverCommandHandler {
 		EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
 
 		auto res = AccountManagement::CheckExternalLoginserverUserCredentials(
-			cmd(2).str(),
-			cmd(3).str()
+			cmd("--username").str(),
+			cmd("--password").str()
 		);
 
 		LogInfo("Credentials were {0}", res ? "accepted" : "not accepted");
@@ -285,8 +282,8 @@ namespace LoginserverCommandHandler {
 		description = "Update world admin account password";
 
 		std::vector<std::string> arguments = {
-			"{username}",
-			"{password}"
+			"--username",
+			"--password"
 		};
 		std::vector<std::string> options   = {};
 
@@ -297,8 +294,8 @@ namespace LoginserverCommandHandler {
 		EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
 
 		AccountManagement::UpdateLoginserverWorldAdminAccountPasswordByName(
-			cmd(2).str(),
-			cmd(3).str()
+			cmd("--username").str(),
+			cmd("--password").str()
 		);
 	}
 }

loginserver/main.cpp

@@ -43,28 +43,22 @@ void CatchSignal(int sig_num)
 {
 }
 
-void LoadDatabaseConnection()
+int main(int argc, char **argv)
 {
-	LogInfo("MySQL Database Init");
+	RegisterExecutablePlatform(ExePlatformLogin);
+	set_exception_handler();
 
-	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")
-	);
+	LogInfo("Logging System Init");
 
-}
+	if (argc == 1) {
+		LogSys.LoadLogSettingsDefaults();
+	}
 
-void LoadServerConfig()
-{
 	server.config = EQ::JsonConfigFile::Load("login.json");
 	LogInfo("Config System Init");
 
-
 	/**
-	 * Logging
+	 * options: logging
 	 */
 	server.options.Trace(server.config.GetVariableBool("logging", "trace", false));
 	server.options.WorldTrace(server.config.GetVariableBool("logging", "world_trace", false));
@@ -72,7 +66,7 @@ void LoadServerConfig()
 	server.options.DumpOutPackets(server.config.GetVariableBool("logging", "dump_packets_out", false));
 
 	/**
-	 * Worldservers
+	 * options: worldservers
 	 */
 	server.options.RejectDuplicateServers(
 		server.config.GetVariableBool(
@@ -83,7 +77,7 @@ void LoadServerConfig()
 	server.options.AllowUnregistered(server.config.GetVariableBool("worldservers", "unregistered_allowed", true));
 
 	/**
-	 * Account
+	 * options: account
 	 */
 	server.options.AutoCreateAccounts(server.config.GetVariableBool("account", "auto_create_accounts", true));
 	server.options.AutoLinkAccounts(server.config.GetVariableBool("account", "auto_link_accounts", false));
@@ -98,9 +92,6 @@ void LoadServerConfig()
 	);
 #endif
 
-	/**
-	 * Default Loginserver Name (Don't change)
-	 */
 	server.options.DefaultLoginServerName(
 		server.config.GetVariableString(
 			"general",
@@ -109,10 +100,6 @@ void LoadServerConfig()
 		)
 	);
 
-	/**
-	 * Security
-	 */
-
 #ifdef ENABLE_SECURITY
 	server.options.EncryptionMode(server.config.GetVariableInt("security", "mode", 13));
 #else
@@ -128,41 +115,19 @@ void LoadServerConfig()
 			true
 		)
 	);
-}
-
-int main(int argc, char **argv)
-{
-	RegisterExecutablePlatform(ExePlatformLogin);
-	set_exception_handler();
-
-	LogInfo("Logging System Init");
-
-	if (argc == 1) {
-		LogSys.LoadLogSettingsDefaults();
-	}
-
-	/**
-	 * Command handler
-	 */
-	if (argc > 1) {
-		LogSys.SilenceConsoleLogging();
-
-		LoadServerConfig();
-		LoadDatabaseConnection();
-
-		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);
-	}
-
-	LoadServerConfig();
 
 	/**
 	 * mysql connect
 	 */
-	LoadDatabaseConnection();
+	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")
+	);
 
 	if (argc == 1) {
 		server.db->LoadLogSettings(LogSys.log_settings);
@@ -230,6 +195,14 @@ 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 3.2)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
 SET(qserv_sources
 	database.cpp

shared_memory/CMakeLists.txt

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

tests/CMakeLists.txt

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

tests/cppunit/CMakeLists.txt

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

ucs/CMakeLists.txt

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

utils/scripts/eqemu_server.pl

@@ -516,20 +516,13 @@ sub check_for_input {
 }
 
 sub check_for_world_bootup_database_update {
-
-    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`);
+        @db_version = split(': ', `world db_version`);
     }
     if ($OS eq "Linux") {
-        @db_version = split(': ', `./$world_path db_version`);
+        @db_version = split(': ', `./world db_version`);
     }
-    
+
     $binary_database_version = trim($db_version[1]);
     $local_database_version  = trim(get_mysql_result("SELECT version FROM db_version LIMIT 1"));
 
@@ -813,7 +806,7 @@ sub fetch_utility_scripts {
 
 sub setup_bots {
     if ($OS eq "Windows") {
-        fetch_latest_windows_appveyor_bots();
+        fetch_latest_windows_binaries_bots();
     }
     if ($OS eq "Linux") {
         build_linux_source("bots");
@@ -821,7 +814,7 @@ sub setup_bots {
     bots_db_management();
     run_database_check();
 
-    print "Bots should be setup, run your server and the bot command should be available in-game (type '^help')\n";
+    print "Bots should be setup, run your server and the #bot command should be available in-game\n";
 }
 
 sub show_menu_prompt {
@@ -1693,7 +1686,7 @@ sub fetch_server_dlls {
 
 sub fetch_peq_db_full {
     print "[Install] Downloading latest PEQ Database... Please wait...\n";
-    get_remote_file("http://edit.projecteq.net/weekly/peq_beta.zip", "updates_staged/peq_beta.zip", 1);
+    get_remote_file("http://edit.peqtgc.com/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";
@@ -1828,8 +1821,6 @@ sub quest_files_fetch {
     if ($fc == 0) {
         print "[Update] No Quest Updates found... \n\n";
     }
-	
-    rmtree("updates_staged/");
 }
 
 sub lua_modules_fetch {

utils/sql/character_table_list.txt

@@ -1,15 +1,9 @@
-account
-account_ip
-account_flags
-account_rewards
-adventure_details
 adventure_stats
-buyer
 char_recipe_list
+character_auras
 character_activities
 character_alt_currency
 character_alternate_abilities
-character_auras
 character_bandolier
 character_bind
 character_buffs
@@ -26,22 +20,15 @@ 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
@@ -49,9 +36,6 @@ keyring
 mail
 player_titlesets
 quest_globals
-sharedbank
 timers
 titles
-trader
-trader_audit
-zone_flags"
+zone_flags

utils/sql/db_update_manifest.txt

@@ -397,9 +397,6 @@
 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|
-9146|2020_01_10_character_soft_deletes.sql|SHOW COLUMNS FROM `character_data` LIKE 'deleted_at'|empty|
 
 # Upgrade conditions:
 # 	This won't be needed after this system is implemented, but it is used database that are not

utils/sql/git/bots/bots_db_update_manifest.txt

@@ -21,9 +21,9 @@
 9020|2018_08_13_bots_inventory_update.sql|SELECT * FROM `inventory_versions` WHERE `version` = 2 and `bot_step` = 0|not_empty|
 9021|2018_10_09_bots_owner_options.sql|SHOW TABLES LIKE 'bot_owner_options'|empty|
 9022|2019_02_07_bots_stance_type_update.sql|SELECT * FROM `bot_spell_casting_chances` WHERE `spell_type_index` = '255' AND `class_id` = '255' AND `stance_index` = '0'|not_empty|
-9023|2019_06_22_bots_owner_option_stats_update.sql|SELECT * FROM db_version WHERE bots_version >= 9023|empty|
+9023|2019_06_22_bots_owner_option_stats_update.sql|SHOW COLUMNS FROM `bot_owner_options` LIKE 'stats_update'|empty|
 9024|2019_06_27_bots_pet_get_lost.sql|SELECT `bot_command` FROM `bot_command_settings` WHERE `bot_command` LIKE 'petgetlost'|empty|
-9025|2019_08_26_bots_owner_option_spawn_message.sql|SELECT * FROM db_version WHERE bots_version >= 9025|empty|
+9025|2019_08_26_bots_owner_option_spawn_message.sql|SHOW COLUMNS FROM `bot_owner_options` LIKE 'spawn_message_enabled'|empty|
 9026|2019_09_09_bots_owner_options_rework.sql|SHOW COLUMNS FROM `bot_owner_options` LIKE 'option_type'|empty|
 
 # Upgrade conditions:

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: Client -> Server With Dump'); 
+REPLACE INTO `logsys_categories` (`log_category_id`, `log_category_description`) VALUES ('42', 'Packet: Server -> Client With Dump'); 

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

@@ -1,11 +0,0 @@
-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

@@ -1,5 +0,0 @@
-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/git/required/2020_01_10_character_soft_deletes.sql

@@ -1 +0,0 @@
-ALTER TABLE `character_data` ADD COLUMN `deleted_at` datetime NULL DEFAULT NULL;

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

@@ -0,0 +1,47 @@
+# 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

@@ -0,0 +1,17 @@
+# 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

@@ -0,0 +1,27 @@
+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

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

wi/http/common.js

@@ -0,0 +1,26 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,319 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,43 @@
+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

@@ -0,0 +1,56 @@
+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) });

wi/key.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAoijNhaW4sH2yLEQOUCNLSU0qIGnr9mxewEPXSNURKFExC1WE
+ah983xy+WTbKjakH6Rp2OwCvLxNIu6QBKRgcJ963ICWY7ysn4bU2Q2KoSJgAEel8
+UMDHWYfyyAPdr4DUwUw7YMf4LBThCGBC5DTPilZiVqQNyOf8KL5w/oKcavVMddod
+eBNE1ewoxVveHN6WUDkYQKZK2AsrpNG6TjfJc3wI3Z722tRHui4E772l/sD0SuEj
+41pBzOG0VM7DHwUpHQosnvnwx9kjefPNE/uvo14PuzP5yYG2h2PFkQ7uuXjK2/le
+iVcyap/zgheOHjlYmOJGT1cnVSodv+rY56eilwIDAQABAoIBAQAM/sAZqcI3Qpt4
+uKt8+Jcb9Lcfid2DDgQ53DXwfEK3vGn1wpCuAH/9UUxf0ehBmf4sTBaVe+SOHTmC
+8A23wVrgRxTd2qV65TZ4/BCxLcLWrney98cioZBYOHDYXpbxbZ2fMADCLMRSpAm0
+piI2L5VCPNH8p4EDTLQEf96GRulKGOWETeVNai3C7Ept6Fxv0YIiiER8j2oPsb1O
+LVCBKBPsNs0IlabJAzfDnaqdfWzuLWIT0L4w/qvzfwkdM8tVxch2zjEVosbz4ser
+rPO3tle3mobgDvXrW9jEYkIpOtEqCS7l4ybidVuEfY55KlkZ7rGBQ2N1jbLvKjb5
+AUyHUBchAoGBAOKjzzBPB/mofycF8iF1QJwripGTDUGM7aXBS0Clp4mh0ksvBsUf
+Zg+Qnzr2xZaN53lU65xQlMrebMJow4iJj71VesF9FWPPNbIhh7eMTX4pABcKZNvc
+Y0iFf5XZAl3LFdDocQSuB3j5WLNrjSFMBZuYUiZhgiRadtcdpQr+O4lbAoGBALcq
+ltbFogxXoo7/CIajbYdNUGbba96jQMOzC1D7yeim1MTtDNGs56ZhDjFZepMRMyfX
+/Z7iqxjZQQ1m1THtuiM4g+ug08EYI8G/7DYO5DqMABGFb3vKU9ilhYASqfznpKMJ
+2sl/d5j8ocS7crkKwR8Tbo3ZG8NgObQNTL+mIFR1AoGAJS66zzIoHM2IDt7q2pJi
+Bz0dfsShaB+23XrY3cJPukTSO4N7mNuN4v/XH9VclVayozVLclnGD4JuVXbanYv0
+CRv9B8F9wOI97PuTSIm8LPaNDTqnUWrW3w8H34261ah768o2wI3MrAw8gTMj9FKE
+mQJkd+eHcm9lD+XNLgCHxAECgYBiMQ2t00L89NnraKLscp4b44GPsl9QehoVD12o
+q2JhO1Ziv2WY3eVNV0hhgkNopdbTrEGFNKRebNEn2xG9c2DO0tQ9s/jw0f0RN87s
+Z+1HyZebzPmn1h4+zPUVZGwGbTPgRz8nuBKoS/541bg5pJ9FBojEuDfe9C3a7SpQ
+r0EzpQKBgBmYrKi07wTUSZ3TjHWvOK75XhJ5pOdfbuDZk+N02jzhmihzI2M/Sh7s
+l1gavtY9o9JGUAW35L/Ju4X1Xgm3t5Cg9+4n6ecOfSKP9nJpgj1EvHyWvw9t8ZSg
+V9M0Hf5EoSPWuEj+mlWrIuvV/HgkouUVqDzUm6wUuyTqdTCgUQrA
+-----END RSA PRIVATE KEY-----