wow

.dockerignore

@@ -3,8 +3,8 @@ Dockerfile
 *.md
 logo.png
 versions.txt
+build.sh
 docker-compose.yml
 .env
 docker/__pycache__
-.env.example
-build
+.env.example

.env.example

@@ -14,4 +14,4 @@ EXTERNAL_IP=localhost
 MARIADB_USER=darkflame
 MARIADB_PASSWORD=SECRET_VALUE_CHANGE_ME
 MARIADB_ROOT_PASSWORD=SECRET_VALUE_CHANGE_ME
-MARIADB_DATABASE=darkflame
+MARIADB_DATABASE=darkflame

.github/workflows/build-and-push-docker.yml

@@ -1,56 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - "main"
-    tags:
-      - "v*.*.*"
-  pull_request:
-    branches:
-      - "main"
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-
-jobs:
-  build-and-push-image:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          # generate Docker tags based on the following events/attributes
-          tags: |
-            type=ref,event=pr
-            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}

.gitignore

@@ -122,4 +122,3 @@ docker/__pycache__
 docker-compose.override.yml
 
 !*Test.bin
-!cmake/*

.gitmodules

@@ -14,6 +14,6 @@
 	path = thirdparty/mariadb-connector-cpp
 	url = https://github.com/mariadb-corporation/mariadb-connector-cpp.git
 	ignore = dirty
-[submodule "thirdparty/magic_enum"]
-	path = thirdparty/magic_enum
-	url = https://github.com/Neargye/magic_enum.git
+[submodule "thirdparty/AccountManager"]
+	path = thirdparty/AccountManager
+	url = https://github.com/DarkflameUniverse/AccountManager

CMakeLists.txt

@@ -2,8 +2,7 @@ cmake_minimum_required(VERSION 3.18)
 project(Darkflame)
 include(CTest)
 
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+set (CMAKE_CXX_STANDARD 17)
 
 # Read variables from file
 FILE(READ "${CMAKE_SOURCE_DIR}/CMakeVariables.txt" variables)
@@ -15,26 +14,30 @@ string(REPLACE "\n" ";" variables ${variables})
 foreach(variable ${variables})
 	# If the string contains a #, skip it
 	if(NOT "${variable}" MATCHES "#")
+
 		# Split the variable into name and value
 		string(REPLACE "=" ";" variable ${variable})
 
 		# Check that the length of the variable is 2 (name and value)
 		list(LENGTH variable length)
-
 		if(${length} EQUAL 2)
+
 			list(GET variable 0 variable_name)
 			list(GET variable 1 variable_value)
 
 			# Set the variable
 			set(${variable_name} ${variable_value})
 
+			# Add compiler definition
+			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D${variable_name}=${variable_value}")
+
 			message(STATUS "Variable: ${variable_name} = ${variable_value}")
 		endif()
 	endif()
 endforeach()
 
 # Set the version
-set(PROJECT_VERSION "\"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}\"")
+set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 
 # Echo the version
 message(STATUS "Version: ${PROJECT_VERSION}")
@@ -50,22 +53,19 @@ set(RECASTNAVIGATION_EXAMPLES OFF CACHE BOOL "" FORCE)
 # Disabled misleading indentation as DL_LinkedList from RakNet has a weird indent.
 # Disabled no-register
 # Disabled unknown pragmas because Linux doesn't understand Windows pragmas.
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPROJECT_VERSION=${PROJECT_VERSION}")
 if(UNIX)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17 -O2 -Wuninitialized -fPIC")
-	add_compile_definitions(_GLIBCXX_USE_CXX11_ABI=0 _GLIBCXX_USE_CXX17_ABI=0)
-
-	if(NOT APPLE)
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -lstdc++fs")
+	if(APPLE)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17 -O2 -Wuninitialized -D_GLIBCXX_USE_CXX11_ABI=0 -D_GLIBCXX_USE_CXX17_ABI=0 -fPIC")
+	else()
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17 -O2 -Wuninitialized -D_GLIBCXX_USE_CXX11_ABI=0 -D_GLIBCXX_USE_CXX17_ABI=0 -static-libgcc -fPIC -lstdc++fs")
 	endif()
-
-	if(${DYNAMIC} AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+	if (__dynamic AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -rdynamic")
 	endif()
-
-	if(${GGDB})
+	if (__ggdb)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb")
 	endif()
-
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -O2 -fPIC")
 elseif(MSVC)
 	# Skip warning for invalid conversion from size_t to uint32_t for all targets below for now
@@ -97,89 +97,29 @@ make_directory(${CMAKE_BINARY_DIR}/logs)
 
 # Copy resource files on first build
 set(RESOURCE_FILES "sharedconfig.ini" "authconfig.ini" "chatconfig.ini" "worldconfig.ini" "masterconfig.ini" "blacklist.dcf")
-message(STATUS "Checking resource file integrity")
-
-include(Utils)
-UpdateConfigOption(${PROJECT_BINARY_DIR}/authconfig.ini "port" "auth_server_port")
-UpdateConfigOption(${PROJECT_BINARY_DIR}/chatconfig.ini "port" "chat_server_port")
-UpdateConfigOption(${PROJECT_BINARY_DIR}/masterconfig.ini "port" "master_server_port")
-
 foreach(resource_file ${RESOURCE_FILES})
-	set(file_size 0)
-
-	if(EXISTS ${PROJECT_BINARY_DIR}/${resource_file})
-		file(SIZE ${PROJECT_BINARY_DIR}/${resource_file} file_size)
-	endif()
-
-	if(${file_size} EQUAL 0)
+	if (NOT EXISTS ${PROJECT_BINARY_DIR}/${resource_file})
 		configure_file(
 			${CMAKE_SOURCE_DIR}/resources/${resource_file} ${PROJECT_BINARY_DIR}/${resource_file}
 			COPYONLY
 		)
-		message(STATUS "Moved " ${resource_file} " to project binary directory")
-	elseif(resource_file MATCHES ".ini")
-		message(STATUS "Checking " ${resource_file} " for missing config options")
-		file(READ ${PROJECT_BINARY_DIR}/${resource_file} current_file_contents)
-		string(REPLACE "\\\n" "" current_file_contents ${current_file_contents})
-		string(REPLACE "\n" ";" current_file_contents ${current_file_contents})
-		set(parsed_current_file_contents "")
-
-		# Remove comment lines so they do not interfere with the variable parsing
-		foreach(line ${current_file_contents})
-			string(FIND ${line} "#" is_comment)
-
-			if(NOT ${is_comment} EQUAL 0)
-				string(APPEND parsed_current_file_contents ${line})
-			endif()
-		endforeach()
-
-		file(READ ${CMAKE_SOURCE_DIR}/resources/${resource_file} depot_file_contents)
-		string(REPLACE "\\\n" "" depot_file_contents ${depot_file_contents})
-		string(REPLACE "\n" ";" depot_file_contents ${depot_file_contents})
-		set(line_to_add "")
-
-		foreach(line ${depot_file_contents})
-			string(FIND ${line} "#" is_comment)
-
-			if(NOT ${is_comment} EQUAL 0)
-				string(REPLACE "=" ";" line_split ${line})
-				list(GET line_split 0 variable_name)
-
-				if(NOT ${parsed_current_file_contents} MATCHES ${variable_name})
-					message(STATUS "Adding missing config option " ${variable_name} " to " ${resource_file})
-					set(line_to_add ${line_to_add} ${line})
-
-					foreach(line_to_append ${line_to_add})
-						file(APPEND ${PROJECT_BINARY_DIR}/${resource_file} "\n" ${line_to_append})
-					endforeach()
-
-					file(APPEND ${PROJECT_BINARY_DIR}/${resource_file} "\n")
-				endif()
-
-				set(line_to_add "")
-			else()
-				set(line_to_add ${line_to_add} ${line})
-			endif()
-		endforeach()
+		message("Moved ${resource_file} to project binary directory")
 	endif()
 endforeach()
 
-message(STATUS "Resource file integrity check complete")
-
-# if navmeshes directory does not exist, create it
-if(NOT EXISTS ${PROJECT_BINARY_DIR}/navmeshes)
-	file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/navmeshes)
-endif()
-
 # Copy navmesh data on first build and extract it
-configure_file(${CMAKE_SOURCE_DIR}/resources/navmeshes.zip ${PROJECT_BINARY_DIR}/navmeshes.zip COPYONLY)
+if (NOT EXISTS ${PROJECT_BINARY_DIR}/navmeshes/)
+	configure_file(
+		${CMAKE_SOURCE_DIR}/resources/navmeshes.zip ${PROJECT_BINARY_DIR}/navmeshes.zip
+		COPYONLY
+	)
 
-file(ARCHIVE_EXTRACT INPUT ${PROJECT_BINARY_DIR}/navmeshes.zip DESTINATION ${PROJECT_BINARY_DIR}/navmeshes)
-file(REMOVE ${PROJECT_BINARY_DIR}/navmeshes.zip)
+	file(ARCHIVE_EXTRACT INPUT ${PROJECT_BINARY_DIR}/navmeshes.zip)
+	file(REMOVE ${PROJECT_BINARY_DIR}/navmeshes.zip)
+endif()
 
 # Copy vanity files on first build
 set(VANITY_FILES "CREDITS.md" "INFO.md" "TESTAMENT.md" "NPC.xml")
-
 foreach(file ${VANITY_FILES})
 	configure_file("${CMAKE_SOURCE_DIR}/vanity/${file}" "${CMAKE_BINARY_DIR}/vanity/${file}" COPYONLY)
 endforeach()
@@ -187,18 +127,26 @@ endforeach()
 # Move our migrations for MasterServer to run
 file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/migrations/dlu/)
 file(GLOB SQL_FILES ${CMAKE_SOURCE_DIR}/migrations/dlu/*.sql)
-
 foreach(file ${SQL_FILES})
 	get_filename_component(file ${file} NAME)
-	configure_file(${CMAKE_SOURCE_DIR}/migrations/dlu/${file} ${PROJECT_BINARY_DIR}/migrations/dlu/${file})
+	if (NOT EXISTS ${PROJECT_BINARY_DIR}/migrations/dlu/${file})
+		configure_file(
+			${CMAKE_SOURCE_DIR}/migrations/dlu/${file} ${PROJECT_BINARY_DIR}/migrations/dlu/${file}
+			COPYONLY
+		)
+	endif()
 endforeach()
 
 file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/migrations/cdserver/)
 file(GLOB SQL_FILES ${CMAKE_SOURCE_DIR}/migrations/cdserver/*.sql)
-
 foreach(file ${SQL_FILES})
 	get_filename_component(file ${file} NAME)
-	configure_file(${CMAKE_SOURCE_DIR}/migrations/cdserver/${file} ${PROJECT_BINARY_DIR}/migrations/cdserver/${file})
+	if (NOT EXISTS ${PROJECT_BINARY_DIR}/migrations/cdserver/${file})
+		configure_file(
+			${CMAKE_SOURCE_DIR}/migrations/cdserver/${file} ${PROJECT_BINARY_DIR}/migrations/cdserver/${file}
+			COPYONLY
+		)
+	endif()
 endforeach()
 
 # Create our list of include directories
@@ -206,9 +154,7 @@ set(INCLUDED_DIRECTORIES
 	"dCommon"
 	"dCommon/dClient"
 	"dCommon/dEnums"
-
 	"dChatFilter"
-
 	"dGame"
 	"dGame/dBehaviors"
 	"dGame/dComponents"
@@ -219,53 +165,115 @@ set(INCLUDED_DIRECTORIES
 	"dGame/dPropertyBehaviors"
 	"dGame/dPropertyBehaviors/ControlBehaviorMessages"
 	"dGame/dUtilities"
-
 	"dPhysics"
-
 	"dNavigation"
 	"dNavigation/dTerrain"
-
 	"dZoneManager"
-
 	"dDatabase"
-	"dDatabase/CDClientDatabase"
-	"dDatabase/CDClientDatabase/CDClientTables"
-	"dDatabase/GameDatabase"
-	"dDatabase/GameDatabase/ITables"
-	"dDatabase/GameDatabase/MySQL"
-	"dDatabase/GameDatabase/MySQL/Tables"
-
+	"dDatabase/Tables"
 	"dNet"
+	"dScripts"
+	"dScripts/02_server"
+	"dScripts/ai"
+	"dScripts/client"
+	"dScripts/EquipmentScripts"
+	"dScripts/EquipmentTriggers"
+	"dScripts/zone"
+	"dScripts/02_server/DLU"
+	"dScripts/02_server/Enemy"
+	"dScripts/02_server/Equipment"
+	"dScripts/02_server/Map"
+	"dScripts/02_server/Minigame"
+	"dScripts/02_server/Objects"
+	"dScripts/02_server/Pets"
+	"dScripts/02_server/Enemy/AG"
+	"dScripts/02_server/Enemy/AM"
+	"dScripts/02_server/Enemy/FV"
+	"dScripts/02_server/Enemy/General"
+	"dScripts/02_server/Enemy/Survival"
+	"dScripts/02_server/Enemy/VE"
+	"dScripts/02_server/Enemy/Waves"
+	"dScripts/02_server/Map/AG"
+	"dScripts/02_server/Map/AG_Spider_Queen"
+	"dScripts/02_server/Map/AM"
+	"dScripts/02_server/Map/FV"
+	"dScripts/02_server/Map/General"
+	"dScripts/02_server/Map/GF"
+	"dScripts/02_server/Map/njhub"
+	"dScripts/02_server/Map/NS"
+	"dScripts/02_server/Map/NT"
+	"dScripts/02_server/Map/PR"
+	"dScripts/02_server/Map/Property"
+	"dScripts/02_server/Map/SS"
+	"dScripts/02_server/Map/VE"
+	"dScripts/02_server/Map/FV/Racing"
+	"dScripts/02_server/Map/General/Ninjago"
+	"dScripts/02_server/Map/njhub/boss_instance"
+	"dScripts/02_server/Map/NS/Waves"
+	"dScripts/02_server/Map/Property/AG_Med"
+	"dScripts/02_server/Map/Property/AG_Small"
+	"dScripts/02_server/Map/Property/NS_Med"
+	"dScripts/02_server/Minigame/General"
+	"dScripts/ai/ACT"
+	"dScripts/ai/AG"
+	"dScripts/ai/FV"
+	"dScripts/ai/GENERAL"
+	"dScripts/ai/GF"
+	"dScripts/ai/MINIGAME"
+	"dScripts/ai/NP"
+	"dScripts/ai/NS"
+	"dScripts/ai/PETS"
+	"dScripts/ai/PROPERTY"
+	"dScripts/ai/RACING"
+	"dScripts/ai/SPEC"
+	"dScripts/ai/WILD"
+	"dScripts/ai/ACT/FootRace"
+	"dScripts/ai/MINIGAME/SG_GF"
+	"dScripts/ai/MINIGAME/SG_GF/SERVER"
+	"dScripts/ai/NS/NS_PP_01"
+	"dScripts/ai/NS/WH"
+	"dScripts/ai/PROPERTY/AG"
+	"dScripts/ai/RACING/OBJECTS"
+	"dScripts/client/ai"
+	"dScripts/client/ai/PR"
+	"dScripts/zone/AG"
+	"dScripts/zone/LUPs"
+	"dScripts/zone/PROPERTY"
+	"dScripts/zone/PROPERTY/FV"
+	"dScripts/zone/PROPERTY/GF"
+	"dScripts/zone/PROPERTY/NS"
 
-	"thirdparty/magic_enum/include/magic_enum"
 	"thirdparty/raknet/Source"
 	"thirdparty/tinyxml2"
 	"thirdparty/recastnavigation"
 	"thirdparty/SQLite"
 	"thirdparty/cpplinq"
-	"thirdparty/cpp-httplib"
 
 	"tests"
 	"tests/dCommonTests"
 	"tests/dGameTests"
 	"tests/dGameTests/dComponentsTests"
-)
+	)
 
 # Add system specfic includes for Apple, Windows and Other Unix OS' (including Linux)
-if(APPLE)
+if (APPLE)
 	include_directories("/usr/local/include/")
 endif()
 
-# Actually include the directories from our list
-foreach(dir ${INCLUDED_DIRECTORIES})
-	include_directories(${PROJECT_SOURCE_DIR}/${dir})
-endforeach()
-
-if(NOT WIN32)
-	include_directories("${PROJECT_SOURCE_DIR}/thirdparty/libbcrypt/include/bcrypt")
+if (WIN32)
+	set(INCLUDED_DIRECTORIES ${INCLUDED_DIRECTORIES} "thirdparty/libbcrypt/include")
+elseif (UNIX)
+	set(INCLUDED_DIRECTORIES ${INCLUDED_DIRECTORIES} "thirdparty/libbcrypt")
+	set(INCLUDED_DIRECTORIES ${INCLUDED_DIRECTORIES} "thirdparty/libbcrypt/include/bcrypt")
 endif()
 
-include_directories("${PROJECT_SOURCE_DIR}/thirdparty/libbcrypt/include")
+# Add binary directory as an include directory
+include_directories(${PROJECT_BINARY_DIR})
+
+# Actually include the directories from our list
+foreach (dir ${INCLUDED_DIRECTORIES})
+	include_directories(${PROJECT_SOURCE_DIR}/${dir})
+endforeach()
 
 # Add linking directories:
 link_directories(${PROJECT_BINARY_DIR})
@@ -277,9 +285,8 @@ add_subdirectory(thirdparty)
 file(
 	GLOB HEADERS_DDATABASE
 	LIST_DIRECTORIES false
-	${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/*.h
-	${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/CDClientTables/*.h
-	${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables/*.h
+	${PROJECT_SOURCE_DIR}/dDatabase/*.h
+	${PROJECT_SOURCE_DIR}/dDatabase/Tables/*.h
 	${PROJECT_SOURCE_DIR}/thirdparty/SQLite/*.h
 )
 
@@ -316,13 +323,13 @@ add_subdirectory(dNavigation)
 add_subdirectory(dPhysics)
 
 # Create a list of common libraries shared between all binaries
-set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "mariadbConnCpp" "magic_enum")
+set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "mariadbConnCpp")
 
 # Add platform specific common libraries
-if(UNIX)
+if (UNIX)
 	set(COMMON_LIBRARIES ${COMMON_LIBRARIES} "dl" "pthread")
 
-	if(NOT APPLE AND ${INCLUDE_BACKTRACE})
+	if (NOT APPLE AND __include_backtrace__)
 		set(COMMON_LIBRARIES ${COMMON_LIBRARIES} "backtrace")
 	endif()
 endif()
@@ -333,6 +340,12 @@ add_subdirectory(dAuthServer)
 add_subdirectory(dChatServer)
 add_subdirectory(dMasterServer) # Add MasterServer last so it can rely on the other binaries
 
+# Add our precompiled headers
+target_precompile_headers(
+	dGame PRIVATE
+	${HEADERS_DGAME}
+)
+
 target_precompile_headers(
 	dZoneManager PRIVATE
 	${HEADERS_DZONEMANAGER}
@@ -354,6 +367,6 @@ target_precompile_headers(
 	"$<$<COMPILE_LANGUAGE:CXX>:${PROJECT_SOURCE_DIR}/thirdparty/tinyxml2/tinyxml2.h>"
 )
 
-if(${ENABLE_TESTING})
+if (${__enable_testing__} MATCHES "1")
 	add_subdirectory(tests)
 endif()

CMakeVariables.txt

@@ -1,32 +1,24 @@
 PROJECT_VERSION_MAJOR=1
-PROJECT_VERSION_MINOR=1
-PROJECT_VERSION_PATCH=1
-
+PROJECT_VERSION_MINOR=0
+PROJECT_VERSION_PATCH=4
+# LICENSE
+LICENSE=AGPL-3.0
+# The network version.
+# 171023 - Darkflame Universe client
+# 171022 - Unmodded client
+NET_VERSION=171022
 # Debugging
-# Set DYNAMIC to 1 to enable the -rdynamic flag for the linker, yielding some symbols in crashlogs.
-DYNAMIC=1
-
-# Set GGDB to 1 to enable the -ggdb flag for the linker, including more debug info.
-# Do note, changing this will re-build the whole server
-GGDB=0
-
-# Set INCLUDE_BACKTRACE to 1 to includes the backtrace library for better crashlogs.
-# Do note, changing this will re-build the whole server
-INCLUDE_BACKTRACE=0
-
-# Set COMPILE_BACKTRACE to 1 to compile the backtrace library instead of using system libraries.
-# Do note, changing this will re-build the whole server
-COMPILE_BACKTRACE=0
-
+# Set __dynamic to 1 to enable the -rdynamic flag for the linker, yielding some symbols in crashlogs.
+__dynamic=1
+# Set __ggdb to 1 to enable the -ggdb flag for the linker, including more debug info.
+# __ggdb=1
+# Set __include_backtrace__ to 1 to includes the backtrace library for better crashlogs.
+# __include_backtrace__=1
+# Set __compile_backtrace__ to 1 to compile the backtrace library instead of using system libraries.
+# __compile_backtrace__=1
 # Set to the number of jobs (make -j equivalent) to compile the mariadbconn files with.
-MARIADB_CONNECTOR_COMPILE_JOBS=1
-
+__maria_db_connector_compile_jobs__=1
 # When set to 1 and uncommented, compiling and linking testing folders and libraries will be done.
-ENABLE_TESTING=1
-
+__enable_testing__=1
 # The path to OpenSSL.  Change this if your OpenSSL install path is different than the default.
 OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3/
-
-# Whether or not to cache the entire CDClient Database into memory instead of lazy loading.
-# 0 means to lazy load, all other values mean load the entire database.
-CDCLIENT_CACHE_ALL=0

Docker.md

@@ -0,0 +1,46 @@
+# Run the Darkflame Server inside Docker
+
+## What you need
+
+- [Docker](https://docs.docker.com/get-docker/) (Docker Desktop or on Linux normal Docker)
+- [Docker Compose](https://docs.docker.com/compose/install/) (Included in Docker Desktop)
+- LEGO® Universe Client. Check the main [README](./README.md) for details on this.
+
+## Run server inside Docker
+
+1. Copy `.env.example` and save it as `.env` inside the root directory of this repository
+2. Edit the `.env` file and add your path to the root directory of your LEGO® Universe Client after `CLIENT_PATH=`
+3. Update other values in the `.env` file as needed (be sure to update passwords!)
+4. Run `docker compose up -d --build`
+5. Run `docker compose exec darkflame /app/MasterServer -a` and setup your admin account
+6. Follow the directions [here](https://github.com/DarkflameUniverse/AccountManager) to setup regular user accounts. The server will be accessible at: `http://<EXTERNAL_IP>:5000`
+7. Now you can see the output of the server with `docker compose logs -f --tail 100` or `docker compose logs -f --tail 100`. This can help you understand issues and there you can also see when the server finishes it's startup.
+8. You're ready to connect your client!
+
+**NOTE #1**: If you're running an older version of Docker, you may need to use the command `docker-compose` instead of `docker compose`.
+
+**NOTE #2**: To stop the server simply run `docker compose down` and to restart it just run `docker compose up -d` again. No need to run all the steps above every time.
+
+**NOTE #3**: Docker buildkit needs to be enabled. https://docs.docker.com/develop/develop-images/build_enhancements/#to-enable-buildkit-builds
+
+**NOTE #4**: Make sure to run the following in the repo root directory after cloning so submodules are also downloaded.
+```
+git submodule update --init --recursive
+```
+**NOTE #5**: If DarkflameSetup fails due to not having cdclient.fdb, rename CDClient.fdb (in the same folder) to cdclient.fdb
+
+## Disable brickbuildfix
+
+If you don't need the http server running on port 80 do this:
+
+1. Create a file with the name `docker-compose.override.yml` in the root of the repository
+2. Paste this content:
+
+```yml
+services:
+  brickbuildfix:
+    profiles:
+      - donotstart
+```
+
+3. Now run `docker compose up -d`

Docker_Windows.md

@@ -0,0 +1,58 @@
+# Installation under Windows
+## First Run
+1. Navigate to the [Docker download page](https://www.docker.com/products/docker-desktop) and download docker.
+
+    ![Docker Download Page](docker/images/Docker_Download_Page.png)
+
+2. Once the file has finished downloading, run it and proceed through the installation. Make sure, "Install required Windows components for WSL 2" is checked.
+
+    ![Docker Desktop Installer Configuration](docker/images/Docker_Desktop_Installer_Configuration.png)
+
+3. If necessary, restart your computer.
+4. After the restart, Docker Desktop will automatically open. If it does not, simply start it like any other program.
+5. If a window "WSL 2 Installation is incomplete." pops up, follow the link and click "WSL2 Linux kernel update package for x64 machines". Run the downloaded file and once that finishes, click "Restart" in the Docker Desktop window.
+
+    ![WSL 2 download](docker/images/WSL_2_download.png)
+
+6. Wait until Docker Desktop has started. You may skip the tutorial.
+7. You may want to disable "Open Docker Dashboard at startup" in _Settings_ -> _General_
+
+    ![Disable Dashboard Autostart](docker/images/DD_General_Settings.png)
+
+8. Install [Git for Windows](https://git-scm.com/download/win). During the installation, simply confirming the defaults is sufficient.
+9. In the folder you wish to save the Server, right click and select "Git Bash Here".
+10. Type `git clone --recursive https://github.com/DarkflameUniverse/DarkflameServer`
+11. Once the command has completed (you can see you path again and can enter commands), close the window.
+12. Inside the downloaded folder, copy `.env.example` and name the copy `.env`
+13. Open `.env` with Notepad by right-clicking it and selecting _Open With_ -> _More apps_ -> _Notepad_.
+14. Change the text after `CLIENT_PATH=` to the location of your client. This folder must contain either a folder `client` or `legouniverse.exe`.
+    > If you need the extra performance, place the client files in `\\wsl$\<your linux OS>\...` to avoid working across file systems, see [Docker Best Practices](https://docs.docker.com/desktop/windows/wsl/#best-practices) and [WSL documentation](https://docs.microsoft.com/en-us/windows/wsl/filesystems#file-storage-and-performance-across-file-systems).
+
+15. Optionally, you can change the number after `BUILD_THREADS=` to the number of cores / threads your processor has. If your computer crashes while building, you can try to reduce this value.
+16. After `ACCOUNT_MANAGER_SECRET=` paste a "SHA 256-bit Key" from https://keygen.io/
+17. If you are not only hosting a local server, change the value after `EXTERNAL_IP=` to the external IP address of your computer.
+18. Change the two values `SECRET_VALUE_CHANGE_ME` to passwords only you know. Save and close the file.
+19. In the extracted folder hit Shift+Right Click and select "Open PowerShell window here".
+
+    ![Open PowerShell](docker/images/Open_Powershell.png)
+
+17. In the new window, paste (with right click) or type `docker compose up -d --build` and confirm with enter.
+18. Once you see the blinking cursor and the path again, setup has finished and the server is already running.
+
+    ![setup done](docker/images/setup_finished.png)
+
+19. Create an admin account by pasting `docker compose exec darkflame /app/MasterServer -a` and following the prompts.
+
+    ![admin account creation](docker/images/Account_Creation.png)
+
+20. You can now login with these credentials at `http://your_ip:5000` (replace your_ip with your external IP). There you can create your account for playing as well as generate keys for other people to join; use these at `http://your_ip:5000/activate`
+
+## Normal Use
+1. In Docker Desktop you should now see an entry `darkflameserver-main` and when you click on it all containers but `DarkflameSetup` should eventually be green. That means the server is running.
+
+    ![server running](docker/images/Docker_Compose_Finished.png)
+
+2. For troubleshooting, you can check the logs of the various parts by clicking their entry.
+3. You can start and stop the server with the corresponding buttons. Once all containers are grey, the server has shut down, and when all containers but `DarkflameSetup` are green, the server is running. Note that starting and stopping takes some time, please be patient.
+
+    ![start stop buttons](docker/images/DD_Server_Startstop.png)

Dockerfile

@@ -1,51 +0,0 @@
-FROM gcc:12 as build
-
-WORKDIR /app
-
-RUN set -ex; \
-    apt-get update; \
-    apt-get install -y cmake
-
-COPY . /app/
-COPY --chmod=0500 ./build.sh /app/
-
-RUN sed -i 's/MARIADB_CONNECTOR_COMPILE_JOBS__=.*/MARIADB_CONNECTOR_COMPILE_JOBS__=2/' /app/CMakeVariables.txt 
-
-RUN ./build.sh
-
-FROM debian:12 as runtime
-
-WORKDIR /app
-
-RUN --mount=type=cache,id=build-apt-cache,target=/var/cache/apt \
-    apt update && \
-    apt install -y libssl3 libcurl4 && \
-    rm -rf /var/lib/apt/lists/*
-
-# Grab libraries and load them
-COPY --from=build /app/build/mariadbcpp/src/mariadb_connector_cpp-build/libmariadbcpp.so /usr/local/lib/
-COPY --from=build /app/build/mariadbcpp/src/mariadb_connector_cpp-build/libmariadb/libmariadb/libmariadb.so.3 /usr/local/lib
-RUN ldconfig
-
-# Server bins
-COPY --from=build /app/build/*Server /app/
-
-# Necessary suplimentary files
-COPY --from=build /app/build/*.ini /app/configs/
-COPY --from=build /app/build/vanity/*.* /app/vanity/*
-COPY --from=build /app/build/navmeshes /app/navmeshes
-COPY --from=build /app/build/migrations /app/migrations
-COPY --from=build /app/build/*.dcf /app/
-
-# backup of config and vanity files to copy to the host incase 
-# of a mount clobbering the copy from above
-COPY --from=build /app/build/*.ini /app/default-configs/ 
-COPY --from=build /app/build/vanity/*.* /app/default-vanity/*
-
-# needed as the container runs with the root user
-# and therefore sudo doesn't exist
-ENV USE_SUDO_AUTH=0
-ENV DLU_CONFIG_DIR=/app/configs/
-
-COPY --chmod=0500 ./entrypoint.sh /app/
-ENTRYPOINT [ "/app/entrypoint.sh" ]

README.md

@@ -23,9 +23,6 @@ We do not recommend hosting public servers. Darkflame Universe is intended for s
 ### Supply of resource files
 Darkflame Universe is a server emulator and does not distribute any LEGO® Universe files. A separate game client is required to setup this server emulator and play the game, which we cannot supply. Users are strongly suggested to refer to the safe checksums listed [here](#verifying-your-client-files) to see if a client will work.
 
-## Step by step walkthrough for a single-player server
-If you would like a setup for a single player server only on a Windows machine, use the [Native Windows Setup Guide by HailStorm](https://gist.github.com/HailStorm32/169df65a47a104199b5cc57d10fa57de) and skip this README.
-
 ## Steps to setup server
 * [Clone this repository](#clone-the-repository)
 * [Install dependencies](#install-dependencies)
@@ -37,7 +34,6 @@ If you would like a setup for a single player server only on a Windows machine,
 * [Verify your setup](#verify-your-setup)
 * [Running the server](#running-the-server)
 * [User Guide](#user-guide)
-* [Docker](#docker)
 
 ## Clone the repository
 If you are on Windows, you will need to download and install git from [here](https://git-scm.com/download/win)
@@ -183,7 +179,7 @@ If you would like to build the server faster, append `-j<number>` where number i
 ### Notes
 Depending on your operating system, you may need to adjust some pre-processor defines in [CMakeVariables.txt](./CMakeVariables.txt) before building:
 * If you are on MacOS, ensure OPENSSL_ROOT_DIR is pointing to the openssl root directory.
-* If you are using a Darkflame Universe client, ensure `client_net_version` in `build/sharedconfig.ini` is changed to 171023.
+* If you are using a Darkflame Universe client, ensure NET_VERSION is changed to 171023.
 
 ## Configuring your server
 This server has a few steps that need to be taken to configure the server for your use case.
@@ -228,44 +224,6 @@ sudo setcap 'cap_net_bind_service=+ep' AuthServer
 ```
 and then go to `build/masterconfig.ini` and change `use_sudo_auth` to 0.
 
-### Linux Service
-If you are running this on a linux based system, it will use your terminal to run the program interactively, preventing you using it for other tasks and requiring it to be open to run the server.  
-_Note: You could use screen or tmux instead for virtual terminals_  
-To run the server non-interactively, we can use a systemctl service by copying the following file:  
-```shell
-cp ./systemd.example /etc/systemd/system/darkflame.service
-```  
-
-Make sure to edit the file in `/etc/systemd/system/darkflame.service` and change the:  
-- `User` and `Group` to the user that runs the darkflame server.  
-- `ExecPath` to the full file path of the server executable.  
-
-To register, enable and start the service use the following commands:
-
-- Reload the systemd manager configuration to make it aware of the new service file:
-```shell
-systemctl daemon-reload
-```
-- Start the service:
-```shell
-systemctl start darkflame.service
-```
-- Enable OR disable the service to start on boot using:
-```shell
-systemctl enable darkflame.service
-systemctl disable darkflame.service
-```
-- Verify that the service is running without errors:
-```shell
-systemctl status darkflame.service
-```
-- You can also restart, stop, or check the logs of the service using journalctl
-```shell
-systemctl restart darkflame.service
-systemctl stop darkflame.service
-journalctl -xeu darkflame.service
-```
-
 ### First admin user
 Run `MasterServer -a` to get prompted to create an admin account. This method is only intended for the system administrator as a means to get started, do NOT use this method to create accounts for other users!
 
@@ -327,7 +285,6 @@ Below are known good SHA256 checksums of the client:
 * `0d862f71eedcadc4494c4358261669721b40b2131101cbd6ef476c5a6ec6775b` (unpacked client, includes extra locales, rar compressed)
 
 If the returned hash matches one of the lines above then you can continue with setting up the server. If you are using a fully downloaded and complete client from live, then it will work, but the hash above may not match. Otherwise you must obtain a full install of LEGO® Universe 1.10.64.
-You must also make absolutely sure your LEGO Universe client is not in a Windows OneDrive. DLU is not and will not support a client being stored in a OneDrive, so ensure you have moved the client outside of that location.
 
 ### Darkflame Universe Client
 Darkflame Universe clients identify themselves using a higher version number than the regular live clients out there.
@@ -348,42 +305,6 @@ certutil -hashfile <file> SHA1
 Known good *SHA1* checksum of the Darkflame Universe client:
 - `91498e09b83ce69f46baf9e521d48f23fe502985` (packed client, zip compressed)
 
-# Docker
-
-## Standalone
-
-For standalone deployment, you can use the image provided via Github's Container Repository:
-`ghcr.io/darkflameuniverse/darkflameserver`
-
-This assumes that you have a database deployed to your host or in another docker container.
-
-A basic deployment of this contianer would look like:
-```sh
-# example docker contianer deployment
-docker run -it \
-    -v /path/to/configs/:/app/configs \
-    -v /path/to/logs/:/app/logs \
-    -v /path/to/dumps/:/app/dumps \
-    -v /path/to/res:/app/res:ro \
-    -v /path/to/resServer:/app/resServer \
-    -e DUMP_FOLDER=/app/dumps \
-    -p 1001:1001/udp \
-    -p 2005:2005/udp \
-    -p 3000-3300:3000-3300/udp \
-ghcr.io/darkflameuniverse/darkflameserver:latest
-```
-You will need to replace the `/path/to/`'s to reflect the paths on your host.
-
-Any config option in the `.ini`'s can be overridden with environmental variables: Ex: `log_to_console=1` from `shared_config.ini` would be overidden like  `-e LOG_TO_CONSOLE=0`
-
-## Compose
-
-See the [compose](docker-compose.yml) file in the root of the repo.
-
-This compose file is for a full deployment: MariaDB, DarkflameServer, and Nexus Dashboard.
-
-All of the environmental options are listed in the compose file so the can be pass through, or you can edit the compose file to suit your specific needs
-
 # Development Documentation
 This is a Work in Progress, but below are some quick links to documentaion for systems and structs in the server
 [Networked message structs](https://lcdruniverse.org/lu_packets/lu_packets/index.html)

cmake/Utils.cmake

@@ -1,51 +0,0 @@
-# Parses a config file for a specific option and appends the new option if it does not exist
-# If the new option does exist, this function will do nothing.
-# file_name: The name of the file to parse
-# old_option_name: The name of the option to find
-# new_option_name: The name of the option to add
-function(UpdateConfigOption file_name old_option_name new_option_name)
-	string(APPEND old_option_name "=")
-	string(APPEND new_option_name "=")
-	message(STATUS "Checking " ${file_name} " for " ${old_option_name} " and adding " ${new_option_name} " if it does not exist")
-	if(NOT EXISTS ${file_name}) 
-		message(STATUS ${file_name} " does not exist. Doing nothing")
-		return()
-	endif()
-	file(READ ${file_name} current_file_contents)
-	string(REPLACE "\\\n" "" current_file_contents ${current_file_contents})
-	string(REPLACE "\n" ";" current_file_contents ${current_file_contents})
-	set(parsed_current_file_contents "")
-
-	# Remove comment lines so they do not interfere with the variable parsing
-	foreach(line ${current_file_contents})
-		string(FIND ${line} "#" is_comment)
-
-		if(NOT ${is_comment} EQUAL 0)
-			string(APPEND parsed_current_file_contents ${line})
-		endif()
-	endforeach()
-
-	set(found_new_option -1)
-	set(found_old_option -1)
-	set(current_value -1)
-
-	foreach(line ${current_file_contents})
-		string(FIND ${line} ${old_option_name} old_option_in_file)
-
-		if(${old_option_in_file} EQUAL 0)
-			set(found_old_option 1)
-			set(current_value ${line})
-		endif()
-
-		string(FIND ${line} ${new_option_name} found_new_option_in_file)
-
-		if(${found_new_option_in_file} EQUAL 0)
-			set(found_new_option 1)
-		endif()
-	endforeach(line ${current_file_contents})
-
-	if(${found_old_option} EQUAL 1 AND NOT ${found_new_option} EQUAL 1)
-		string(REPLACE ${old_option_name} ${new_option_name} current_value ${current_value})
-		file(APPEND ${file_name} "\n" ${current_value})
-	endif()
-endfunction()

dAuthServer/AuthServer.cpp

@@ -1,14 +1,13 @@
 #include <iostream>
 #include <string>
 #include <ctime>
-#include <csignal>
 #include <chrono>
 #include <thread>
 
 //DLU Includes:
 #include "dCommonVars.h"
 #include "dServer.h"
-#include "Logger.h"
+#include "dLogger.h"
 #include "Database.h"
 #include "dConfig.h"
 #include "Diagnostics.h"
@@ -16,7 +15,7 @@
 
 //RakNet includes:
 #include "RakNetDefines.h"
-#include "MessageIdentifiers.h"
+#include <MessageIdentifiers.h>
 
 //Auth includes:
 #include "AuthPackets.h"
@@ -26,14 +25,13 @@
 
 #include "Game.h"
 namespace Game {
-	Logger* logger = nullptr;
+	dLogger* logger = nullptr;
 	dServer* server = nullptr;
 	dConfig* config = nullptr;
-	Game::signal_t lastSignal = 0;
-	std::mt19937 randomEngine;
+	bool shouldShutdown = false;
 }
 
-Logger* SetupLogger();
+dLogger* SetupLogger();
 void HandlePacket(Packet* packet);
 
 int main(int argc, char** argv) {
@@ -43,26 +41,29 @@ int main(int argc, char** argv) {
 	Diagnostics::SetProcessFileName(argv[0]);
 	Diagnostics::Initialize();
 
-	std::signal(SIGINT, Game::OnSignal);
-	std::signal(SIGTERM, Game::OnSignal);
-
 	//Create all the objects we need to run our service:
 	Game::logger = SetupLogger();
 	if (!Game::logger) return EXIT_FAILURE;
 
 	//Read our config:
-	Game::config = new dConfig("authconfig.ini");
+	Game::config = new dConfig((BinaryPathFinder::GetBinaryDir() / "authconfig.ini").string());
 	Game::logger->SetLogToConsole(Game::config->GetValue("log_to_console") != "0");
 	Game::logger->SetLogDebugStatements(Game::config->GetValue("log_debug_statements") == "1");
 
-	LOG("Starting Auth server...");
-	LOG("Version: %s", PROJECT_VERSION);
-	LOG("Compiled on: %s", __TIMESTAMP__);
+	Game::logger->Log("AuthServer", "Starting Auth server...");
+	Game::logger->Log("AuthServer", "Version: %i.%i", PROJECT_VERSION_MAJOR, PROJECT_VERSION_MINOR);
+	Game::logger->Log("AuthServer", "Compiled on: %s", __TIMESTAMP__);
+
+	//Connect to the MySQL Database
+	std::string mysql_host = Game::config->GetValue("mysql_host");
+	std::string mysql_database = Game::config->GetValue("mysql_database");
+	std::string mysql_username = Game::config->GetValue("mysql_username");
+	std::string mysql_password = Game::config->GetValue("mysql_password");
 
 	try {
-		Database::Connect();
+		Database::Connect(mysql_host, mysql_database, mysql_username, mysql_password);
 	} catch (sql::SQLException& ex) {
-		LOG("Got an error while connecting to the database: %s", ex.what());
+		Game::logger->Log("AuthServer", "Got an error while connecting to the database: %s", ex.what());
 		Database::Destroy("AuthServer");
 		delete Game::server;
 		delete Game::logger;
@@ -72,26 +73,23 @@ int main(int argc, char** argv) {
 	//Find out the master's IP:
 	std::string masterIP;
 	uint32_t masterPort = 1500;
-
-	auto masterInfo = Database::Get()->GetMasterInfo();
-	if (masterInfo) {
-		masterIP = masterInfo->ip;
-		masterPort = masterInfo->port;
+	sql::PreparedStatement* stmt = Database::CreatePreppedStmt("SELECT ip, port FROM servers WHERE name='master';");
+	auto res = stmt->executeQuery();
+	while (res->next()) {
+		masterIP = res->getString(1).c_str();
+		masterPort = res->getInt(2);
 	}
-	LOG("Master is at %s:%d", masterIP.c_str(), masterPort);
 
-	Game::randomEngine = std::mt19937(time(0));
+	delete res;
+	delete stmt;
 
 	//It's safe to pass 'localhost' here, as the IP is only used as the external IP.
-	uint32_t maxClients = 999;
+	uint32_t maxClients = 50;
 	uint32_t ourPort = 1001; //LU client is hardcoded to use this for auth port, so I'm making it the default.
-	std::string ourIP = "localhost";
-	GeneralUtils::TryParse(Game::config->GetValue("max_clients"), maxClients);
-	GeneralUtils::TryParse(Game::config->GetValue("auth_server_port"), ourPort);
-	const auto externalIPString = Game::config->GetValue("external_ip");
-	if (!externalIPString.empty()) ourIP = externalIPString;
+	if (Game::config->GetValue("max_clients") != "") maxClients = std::stoi(Game::config->GetValue("max_clients"));
+	if (Game::config->GetValue("port") != "") ourPort = std::atoi(Game::config->GetValue("port").c_str());
 
-	Game::server = new dServer(ourIP, ourPort, 0, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::Auth, Game::config, &Game::lastSignal);
+	Game::server = new dServer(Game::config->GetValue("external_ip"), ourPort, 0, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::Auth, Game::config, &Game::shouldShutdown);
 
 	//Run it until server gets a kill message from Master:
 	auto t = std::chrono::high_resolution_clock::now();
@@ -102,18 +100,13 @@ int main(int argc, char** argv) {
 	uint32_t framesSinceMasterDisconnect = 0;
 	uint32_t framesSinceLastSQLPing = 0;
 
-	AuthPackets::LoadClaimCodes();
-	
-	Game::logger->Flush(); // once immediately before main loop
-	while (!Game::ShouldShutdown()) {
+	while (!Game::shouldShutdown) {
 		//Check if we're still connected to master:
 		if (!Game::server->GetIsConnectedToMaster()) {
 			framesSinceMasterDisconnect++;
 
-			if (framesSinceMasterDisconnect >= authFramerate) {
-				LOG("No connection to master!");
+			if (framesSinceMasterDisconnect >= authFramerate)
 				break; //Exit our loop, shut down.
-			}
 		} else framesSinceMasterDisconnect = 0;
 
 		//In world we'd update our other systems here.
@@ -138,12 +131,16 @@ int main(int argc, char** argv) {
 			//Find out the master's IP for absolutely no reason:
 			std::string masterIP;
 			uint32_t masterPort;
-			auto masterInfo = Database::Get()->GetMasterInfo();
-			if (masterInfo) {
-				masterIP = masterInfo->ip;
-				masterPort = masterInfo->port;
+			sql::PreparedStatement* stmt = Database::CreatePreppedStmt("SELECT ip, port FROM servers WHERE name='master';");
+			auto res = stmt->executeQuery();
+			while (res->next()) {
+				masterIP = res->getString(1).c_str();
+				masterPort = res->getInt(2);
 			}
 
+			delete res;
+			delete stmt;
+
 			framesSinceLastSQLPing = 0;
 		} else framesSinceLastSQLPing++;
 
@@ -152,7 +149,6 @@ int main(int argc, char** argv) {
 		std::this_thread::sleep_until(t);
 	}
 
-	LOG("Exited Main Loop! (signal %d)", Game::lastSignal);
 	//Delete our objects here:
 	Database::Destroy("AuthServer");
 	delete Game::server;
@@ -162,7 +158,7 @@ int main(int argc, char** argv) {
 	return EXIT_SUCCESS;
 }
 
-Logger* SetupLogger() {
+dLogger* SetupLogger() {
 	std::string logPath = (BinaryPathFinder::GetBinaryDir() / ("logs/AuthServer_" + std::to_string(time(nullptr)) + ".log")).string();
 	bool logToConsole = false;
 	bool logDebugStatements = false;
@@ -171,7 +167,7 @@ Logger* SetupLogger() {
 	logDebugStatements = true;
 #endif
 
-	return new Logger(logPath, logToConsole, logDebugStatements);
+	return new dLogger(logPath, logToConsole, logDebugStatements);
 }
 
 void HandlePacket(Packet* packet) {

dAuthServer/CMakeLists.txt

@@ -1,3 +1,2 @@
 add_executable(AuthServer "AuthServer.cpp")
 target_link_libraries(AuthServer ${COMMON_LIBRARIES})
-add_compile_definitions(AuthServer PRIVATE PROJECT_VERSION="\"${PROJECT_VERSION}\"")

dChatFilter/dChatFilter.cpp

@@ -8,7 +8,7 @@
 #include <regex>
 
 #include "dCommonVars.h"
-#include "Logger.h"
+#include "dLogger.h"
 #include "dConfig.h"
 #include "Database.h"
 #include "Game.h"
@@ -32,11 +32,15 @@ dChatFilter::dChatFilter(const std::string& filepath, bool dontGenerateDCF) {
 	}
 
 	//Read player names that are ok as well:
-	auto approvedNames = Database::Get()->GetApprovedCharacterNames();
-	for (auto& name : approvedNames) {
-		std::transform(name.begin(), name.end(), name.begin(), ::tolower); //Transform to lowercase
-		m_ApprovedWords.push_back(CalculateHash(name));
+	auto stmt = Database::CreatePreppedStmt("select name from charinfo;");
+	auto res = stmt->executeQuery();
+	while (res->next()) {
+		std::string line = res->getString(1).c_str();
+		std::transform(line.begin(), line.end(), line.begin(), ::tolower); //Transform to lowercase
+		m_ApprovedWords.push_back(CalculateHash(line));
 	}
+	delete res;
+	delete stmt;
 }
 
 dChatFilter::~dChatFilter() {
@@ -140,7 +144,7 @@ std::vector<std::pair<uint8_t, uint8_t>> dChatFilter::IsSentenceOkay(const std::
 			listOfBadSegments.emplace_back(position, originalSegment.length());
 		}
 
-		position += originalSegment.length() + 1;
+		position += segment.length() + 1;
 	}
 
 	return listOfBadSegments;

dChatServer/CMakeLists.txt

@@ -1,12 +1,10 @@
 set(DCHATSERVER_SOURCES
-	"ChatIgnoreList.cpp"
 	"ChatPacketHandler.cpp"
 	"PlayerContainer.cpp"
 )
 
 add_executable(ChatServer "ChatServer.cpp")
 add_library(dChatServer ${DCHATSERVER_SOURCES})
-add_compile_definitions(ChatServer PRIVATE PROJECT_VERSION="\"${PROJECT_VERSION}\"")
 
 target_link_libraries(dChatServer ${COMMON_LIBRARIES} dChatFilter)
 target_link_libraries(ChatServer ${COMMON_LIBRARIES} dChatFilter dChatServer)

dChatServer/ChatIgnoreList.cpp

@@ -1,173 +0,0 @@
-#include "ChatIgnoreList.h"
-#include "PlayerContainer.h"
-#include "eChatInternalMessageType.h"
-#include "BitStreamUtils.h"
-#include "PacketUtils.h"
-#include "Game.h"
-#include "Logger.h"
-#include "eObjectBits.h"
-
-#include "Database.h"
-
-// A note to future readers, The client handles all the actual ignoring logic:
-// not allowing teams, rejecting DMs, friends requets etc.
-// The only thing not auto-handled is instance activities force joining the team on the server.
-
-void WriteOutgoingReplyHeader(RakNet::BitStream& bitStream, const LWOOBJID& receivingPlayer, const ChatIgnoreList::Response type) {
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
-	bitStream.Write(receivingPlayer);
-
-	//portion that will get routed:
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, type);
-}
-
-void ChatIgnoreList::GetIgnoreList(Packet* packet) {
-	CINSTREAM_SKIP_HEADER;
-	LWOOBJID playerId;
-	inStream.Read(playerId);
-
-	auto* receiver = Game::playerContainer.GetPlayerData(playerId);
-	if (!receiver) {
-		LOG("Tried to get ignore list, but player %llu not found in container", playerId);
-		return;
-	}
-
-	if (!receiver->ignoredPlayers.empty()) {
-		LOG_DEBUG("Player %llu already has an ignore list", playerId);
-		return;
-	}
-
-	auto ignoreList = Database::Get()->GetIgnoreList(static_cast<uint32_t>(playerId));
-	if (ignoreList.empty()) {
-		LOG_DEBUG("Player %llu has no ignores", playerId);
-		return;
-	}
-
-	for (auto& ignoredPlayer : ignoreList) {
-		receiver->ignoredPlayers.push_back(IgnoreData{ ignoredPlayer.id, ignoredPlayer.name });
-		GeneralUtils::SetBit(receiver->ignoredPlayers.back().playerId, eObjectBits::CHARACTER);
-		GeneralUtils::SetBit(receiver->ignoredPlayers.back().playerId, eObjectBits::PERSISTENT);
-	}
-
-	CBITSTREAM;
-	WriteOutgoingReplyHeader(bitStream, receiver->playerID, ChatIgnoreList::Response::GET_IGNORE);
-
-	bitStream.Write<uint8_t>(false); // Probably is Is Free Trial, but we don't care about that
-	bitStream.Write<uint16_t>(0); // literally spacing due to struct alignment
-
-	bitStream.Write<uint16_t>(receiver->ignoredPlayers.size());
-	for (const auto& ignoredPlayer : receiver->ignoredPlayers) {
-		bitStream.Write(ignoredPlayer.playerId);
-		bitStream.Write(LUWString(ignoredPlayer.playerName, 36));
-	}
-
-	Game::server->Send(&bitStream, packet->systemAddress, false);
-}
-
-void ChatIgnoreList::AddIgnore(Packet* packet) {
-	CINSTREAM_SKIP_HEADER;
-	LWOOBJID playerId;
-	inStream.Read(playerId);
-
-	auto* receiver = Game::playerContainer.GetPlayerData(playerId);
-	if (!receiver) {
-		LOG("Tried to get ignore list, but player %llu not found in container", playerId);
-		return;
-	}
-
-	constexpr int32_t MAX_IGNORES = 32;
-	if (receiver->ignoredPlayers.size() > MAX_IGNORES) {
-		LOG_DEBUG("Player %llu has too many ignores", playerId);
-		return;
-	}
-
-	inStream.IgnoreBytes(4); // ignore some garbage zeros idk
-
-	LUWString toIgnoreName(33);
-	inStream.Read(toIgnoreName);
-	std::string toIgnoreStr = toIgnoreName.GetAsString();
-
-	CBITSTREAM;
-	WriteOutgoingReplyHeader(bitStream, receiver->playerID, ChatIgnoreList::Response::ADD_IGNORE);
-
-	// Check if the player exists
-	LWOOBJID ignoredPlayerId = LWOOBJID_EMPTY;
-	if (toIgnoreStr == receiver->playerName || toIgnoreStr.find("[GM]") == 0) {
-		LOG_DEBUG("Player %llu tried to ignore themselves", playerId);
-
-		bitStream.Write(ChatIgnoreList::AddResponse::GENERAL_ERROR);
-	} else if (std::count(receiver->ignoredPlayers.begin(), receiver->ignoredPlayers.end(), toIgnoreStr) > 0) {
-		LOG_DEBUG("Player %llu is already ignoring %s", playerId, toIgnoreStr.c_str());
-
-		bitStream.Write(ChatIgnoreList::AddResponse::ALREADY_IGNORED);
-	} else {
-		// Get the playerId falling back to query if not online
-		auto* playerData = Game::playerContainer.GetPlayerData(toIgnoreStr);
-		if (!playerData) {
-			// Fall back to query
-			auto player = Database::Get()->GetCharacterInfo(toIgnoreStr);
-			if (!player || player->name != toIgnoreStr) {
-				LOG_DEBUG("Player %s not found", toIgnoreStr.c_str());
-			} else {
-				ignoredPlayerId = player->id;
-			}
-		} else {
-			ignoredPlayerId = playerData->playerID;
-		}
-
-		if (ignoredPlayerId != LWOOBJID_EMPTY) {
-			Database::Get()->AddIgnore(static_cast<uint32_t>(playerId), static_cast<uint32_t>(ignoredPlayerId));
-			GeneralUtils::SetBit(ignoredPlayerId, eObjectBits::CHARACTER);
-			GeneralUtils::SetBit(ignoredPlayerId, eObjectBits::PERSISTENT);
-
-			receiver->ignoredPlayers.push_back(IgnoreData{ ignoredPlayerId, toIgnoreStr });
-			LOG_DEBUG("Player %llu is ignoring %s", playerId, toIgnoreStr.c_str());
-
-			bitStream.Write(ChatIgnoreList::AddResponse::SUCCESS);
-		} else {
-			bitStream.Write(ChatIgnoreList::AddResponse::PLAYER_NOT_FOUND);
-		}
-	}
-
-	LUWString playerNameSend(toIgnoreStr, 33);
-	bitStream.Write(playerNameSend);
-	bitStream.Write(ignoredPlayerId);
-
-	Game::server->Send(&bitStream, packet->systemAddress, false);
-}
-
-void ChatIgnoreList::RemoveIgnore(Packet* packet) {
-	CINSTREAM_SKIP_HEADER;
-	LWOOBJID playerId;
-	inStream.Read(playerId);
-
-	auto* receiver = Game::playerContainer.GetPlayerData(playerId);
-	if (!receiver) {
-		LOG("Tried to get ignore list, but player %llu not found in container", playerId);
-		return;
-	}
-
-	inStream.IgnoreBytes(4); // ignore some garbage zeros idk
-
-	LUWString removedIgnoreName(33);
-	inStream.Read(removedIgnoreName);
-	std::string removedIgnoreStr = removedIgnoreName.GetAsString();
-
-	auto toRemove = std::remove(receiver->ignoredPlayers.begin(), receiver->ignoredPlayers.end(), removedIgnoreStr);
-	if (toRemove == receiver->ignoredPlayers.end()) {
-		LOG_DEBUG("Player %llu is not ignoring %s", playerId, removedIgnoreStr.c_str());
-		return;
-	}
-
-	Database::Get()->RemoveIgnore(static_cast<uint32_t>(playerId), static_cast<uint32_t>(toRemove->playerId));
-	receiver->ignoredPlayers.erase(toRemove, receiver->ignoredPlayers.end());
-
-	CBITSTREAM;
-	WriteOutgoingReplyHeader(bitStream, receiver->playerID, ChatIgnoreList::Response::REMOVE_IGNORE);
-
-	bitStream.Write<int8_t>(0);
-	LUWString playerNameSend(removedIgnoreStr, 33);
-	bitStream.Write(playerNameSend);
-
-	Game::server->Send(&bitStream, packet->systemAddress, false);
-}

dChatServer/ChatIgnoreList.h

@@ -1,27 +0,0 @@
-#ifndef __CHATIGNORELIST__H__
-#define __CHATIGNORELIST__H__
-
-struct Packet;
-
-#include <cstdint>
-
-namespace ChatIgnoreList {
-	void GetIgnoreList(Packet* packet);
-	void AddIgnore(Packet* packet);
-	void RemoveIgnore(Packet* packet);
-
-	enum class Response : uint8_t {
-		ADD_IGNORE = 32,
-		REMOVE_IGNORE = 33,
-		GET_IGNORE = 34,
-	};
-
-	enum class AddResponse : uint8_t {
-		SUCCESS,
-		ALREADY_IGNORED,
-		PLAYER_NOT_FOUND,
-		GENERAL_ERROR,
-	};
-};
-
-#endif  //!__CHATIGNORELIST__H__

dChatServer/ChatPacketHandler.cpp

@@ -3,11 +3,10 @@
 #include "Database.h"
 #include <vector>
 #include "PacketUtils.h"
-#include "BitStreamUtils.h"
 #include "Game.h"
 #include "dServer.h"
 #include "GeneralUtils.h"
-#include "Logger.h"
+#include "dLogger.h"
 #include "eAddFriendResponseCode.h"
 #include "eAddFriendResponseType.h"
 #include "RakString.h"
@@ -19,29 +18,46 @@
 #include "eClientMessageType.h"
 #include "eGameMessageType.h"
 
+extern PlayerContainer playerContainer;
+
 void ChatPacketHandler::HandleFriendlistRequest(Packet* packet) {
 	//Get from the packet which player we want to do something with:
 	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID = 0;
 	inStream.Read(playerID);
 
-	auto player = Game::playerContainer.GetPlayerData(playerID);
+	auto player = playerContainer.GetPlayerData(playerID);
 	if (!player) return;
 
-	auto friendsList = Database::Get()->GetFriendsList(playerID);
-	for (const auto& friendData : friendsList) {
+	//Get our friends list from the Db.  Using a derived table since the friend of a player can be in either column.
+	std::unique_ptr<sql::PreparedStatement> stmt(Database::CreatePreppedStmt(
+		"SELECT fr.requested_player, best_friend, ci.name FROM "
+		"(SELECT CASE "
+		"WHEN player_id = ? THEN friend_id "
+		"WHEN friend_id = ? THEN player_id "
+		"END AS requested_player, best_friend FROM friends) AS fr "
+		"JOIN charinfo AS ci ON ci.id = fr.requested_player "
+		"WHERE fr.requested_player IS NOT NULL AND fr.requested_player != ?;"));
+	stmt->setUInt(1, static_cast<uint32_t>(playerID));
+	stmt->setUInt(2, static_cast<uint32_t>(playerID));
+	stmt->setUInt(3, static_cast<uint32_t>(playerID));
+
+	std::vector<FriendData> friends;
+
+	std::unique_ptr<sql::ResultSet> res(stmt->executeQuery());
+	while (res->next()) {
 		FriendData fd;
 		fd.isFTP = false; // not a thing in DLU
-		fd.friendID = friendData.friendID;
+		fd.friendID = res->getUInt(1);
 		GeneralUtils::SetBit(fd.friendID, eObjectBits::PERSISTENT);
 		GeneralUtils::SetBit(fd.friendID, eObjectBits::CHARACTER);
 
-		fd.isBestFriend = friendData.isBestFriend; //0 = friends, 1 = left_requested, 2 = right_requested, 3 = both_accepted - are now bffs
+		fd.isBestFriend = res->getInt(2) == 3; //0 = friends, 1 = left_requested, 2 = right_requested, 3 = both_accepted - are now bffs
 		if (fd.isBestFriend) player->countOfBestFriends += 1;
-		fd.friendName = friendData.friendName;
+		fd.friendName = res->getString(3);
 
 		//Now check if they're online:
-		auto fr = Game::playerContainer.GetPlayerData(fd.friendID);
+		auto fr = playerContainer.GetPlayerData(fd.friendID);
 
 		if (fr) {
 			fd.isOnline = true;
@@ -54,29 +70,34 @@ void ChatPacketHandler::HandleFriendlistRequest(Packet* packet) {
 			fd.zoneID = LWOZONEID();
 		}
 
-		player->friends.push_back(fd);
+		friends.push_back(fd);
 	}
 
 	//Now, we need to send the friendlist to the server they came from:
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(playerID);
 
 	//portion that will get routed:
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::GET_FRIENDS_LIST_RESPONSE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::GET_FRIENDS_LIST_RESPONSE);
 	bitStream.Write<uint8_t>(0);
 	bitStream.Write<uint16_t>(1); //Length of packet -- just writing one as it doesn't matter, client skips it.
-	bitStream.Write<uint16_t>(player->friends.size());
+	bitStream.Write((uint16_t)friends.size());
 
-	for (auto& data : player->friends) {
+	for (auto& data : friends) {
 		data.Serialize(bitStream);
 	}
 
+	player->friends = friends;
+
 	SystemAddress sysAddr = player->sysAddr;
 	SEND_PACKET;
 }
 
 void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
+	auto maxNumberOfBestFriendsAsString = Game::config->GetValue("max_number_of_best_friends");
+	// If this config option doesn't exist, default to 5 which is what live used.
+	auto maxNumberOfBestFriends = maxNumberOfBestFriendsAsString != "" ? std::stoi(maxNumberOfBestFriendsAsString) : 5U;
 	CINSTREAM_SKIP_HEADER;
 	LWOOBJID requestorPlayerID;
 	inStream.Read(requestorPlayerID);
@@ -95,17 +116,12 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
 	char isBestFriendRequest{};
 	inStream.Read(isBestFriendRequest);
 
-	auto requestor = Game::playerContainer.GetPlayerData(requestorPlayerID);
-	if (!requestor) {
-		LOG("No requestor player %llu sent to %s found.", requestorPlayerID, playerName.c_str());
-		return;
-	}
-
+	auto requestor = playerContainer.GetPlayerData(requestorPlayerID);
 	if (requestor->playerName == playerName) {
 		SendFriendResponse(requestor, requestor, eAddFriendResponseType::MYTHRAN);
 		return;
 	};
-	std::unique_ptr<PlayerData> requestee(Game::playerContainer.GetPlayerData(playerName));
+	std::unique_ptr<PlayerData> requestee(playerContainer.GetPlayerData(playerName));
 
 	// Check if player is online first
 	if (isBestFriendRequest && !requestee) {
@@ -133,26 +149,35 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
 	// If at this point we dont have a target, then they arent online and we cant send the request.
 	// Send the response code that corresponds to what the error is.
 	if (!requestee) {
+		std::unique_ptr<sql::PreparedStatement> nameQuery(Database::CreatePreppedStmt("SELECT name from charinfo where name = ?;"));
+		nameQuery->setString(1, playerName);
+		std::unique_ptr<sql::ResultSet> result(nameQuery->executeQuery());
+
 		requestee.reset(new PlayerData());
 		requestee->playerName = playerName;
-		auto responseType = Database::Get()->GetCharacterInfo(playerName)
-			? eAddFriendResponseType::NOTONLINE
-			: eAddFriendResponseType::INVALIDCHARACTER;
 
-		SendFriendResponse(requestor, requestee.get(), responseType);
+		SendFriendResponse(requestor, requestee.get(), result->next() ? eAddFriendResponseType::NOTONLINE : eAddFriendResponseType::INVALIDCHARACTER);
 		return;
 	}
 
 	if (isBestFriendRequest) {
+		std::unique_ptr<sql::PreparedStatement> friendUpdate(Database::CreatePreppedStmt("SELECT * FROM friends WHERE (player_id = ? AND friend_id = ?) OR (player_id = ? AND friend_id = ?) LIMIT 1;"));
+		friendUpdate->setUInt(1, static_cast<uint32_t>(requestorPlayerID));
+		friendUpdate->setUInt(2, static_cast<uint32_t>(requestee->playerID));
+		friendUpdate->setUInt(3, static_cast<uint32_t>(requestee->playerID));
+		friendUpdate->setUInt(4, static_cast<uint32_t>(requestorPlayerID));
+		std::unique_ptr<sql::ResultSet> result(friendUpdate->executeQuery());
 
+		LWOOBJID queryPlayerID = LWOOBJID_EMPTY;
+		LWOOBJID queryFriendID = LWOOBJID_EMPTY;
 		uint8_t oldBestFriendStatus{};
 		uint8_t bestFriendStatus{};
-		auto bestFriendInfo = Database::Get()->GetBestFriendStatus(requestorPlayerID, requestee->playerID);
-		if (bestFriendInfo) {
+
+		if (result->next()) {
 			// Get the IDs
-			LWOOBJID queryPlayerID = bestFriendInfo->playerCharacterId;
-			LWOOBJID queryFriendID = bestFriendInfo->friendCharacterId;
-			oldBestFriendStatus = bestFriendInfo->bestFriendStatus;
+			queryPlayerID = result->getInt(1);
+			queryFriendID = result->getInt(2);
+			oldBestFriendStatus = result->getInt(3);
 			bestFriendStatus = oldBestFriendStatus;
 
 			// Set the bits
@@ -173,17 +198,22 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
 
 		// Only do updates if there was a change in the bff status.
 		if (oldBestFriendStatus != bestFriendStatus) {
-			auto maxBestFriends = Game::playerContainer.GetMaxNumberOfBestFriends();
-			if (requestee->countOfBestFriends >= maxBestFriends || requestor->countOfBestFriends >= maxBestFriends) {
-				if (requestee->countOfBestFriends >= maxBestFriends) {
+			if (requestee->countOfBestFriends >= maxNumberOfBestFriends || requestor->countOfBestFriends >= maxNumberOfBestFriends) {
+				if (requestee->countOfBestFriends >= maxNumberOfBestFriends) {
 					SendFriendResponse(requestor, requestee.get(), eAddFriendResponseType::THEIRFRIENDLISTFULL, false);
 				}
-				if (requestor->countOfBestFriends >= maxBestFriends) {
+				if (requestor->countOfBestFriends >= maxNumberOfBestFriends) {
 					SendFriendResponse(requestor, requestee.get(), eAddFriendResponseType::YOURFRIENDSLISTFULL, false);
 				}
 			} else {
 				// Then update the database with this new info.
-				Database::Get()->SetBestFriendStatus(requestorPlayerID, requestee->playerID, bestFriendStatus);
+				std::unique_ptr<sql::PreparedStatement> updateQuery(Database::CreatePreppedStmt("UPDATE friends SET best_friend = ? WHERE (player_id = ? AND friend_id = ?) OR (player_id = ? AND friend_id = ?) LIMIT 1;"));
+				updateQuery->setUInt(1, bestFriendStatus);
+				updateQuery->setUInt(2, static_cast<uint32_t>(requestorPlayerID));
+				updateQuery->setUInt(3, static_cast<uint32_t>(requestee->playerID));
+				updateQuery->setUInt(4, static_cast<uint32_t>(requestee->playerID));
+				updateQuery->setUInt(5, static_cast<uint32_t>(requestorPlayerID));
+				updateQuery->executeUpdate();
 				// Sent the best friend update here if the value is 3
 				if (bestFriendStatus == 3U) {
 					requestee->countOfBestFriends += 1;
@@ -206,15 +236,8 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
 			if (requestor->sysAddr != UNASSIGNED_SYSTEM_ADDRESS) SendFriendResponse(requestor, requestee.get(), eAddFriendResponseType::WAITINGAPPROVAL, true, true);
 		}
 	} else {
-		auto maxFriends = Game::playerContainer.GetMaxNumberOfFriends();
-		if (requestee->friends.size() >= maxFriends) {
-			SendFriendResponse(requestor, requestee.get(), eAddFriendResponseType::THEIRFRIENDLISTFULL, false);
-		} else if (requestor->friends.size() >= maxFriends) {
-			SendFriendResponse(requestor, requestee.get(), eAddFriendResponseType::YOURFRIENDSLISTFULL, false);
-		} else {
-			// Do not send this if we are requesting to be a best friend.
-			SendFriendRequest(requestee.get(), requestor);
-		}
+		// Do not send this if we are requesting to be a best friend.
+		SendFriendRequest(requestee.get(), requestor);
 	}
 
 	// If the player is actually a player and not a ghost one defined above, release it from being deleted.
@@ -230,8 +253,8 @@ void ChatPacketHandler::HandleFriendResponse(Packet* packet) {
 	std::string friendName = PacketUtils::ReadString(0x15, packet, true);
 
 	//Now to try and find both of these:
-	auto requestor = Game::playerContainer.GetPlayerData(playerID);
-	auto requestee = Game::playerContainer.GetPlayerData(friendName);
+	auto requestor = playerContainer.GetPlayerData(playerID);
+	auto requestee = playerContainer.GetPlayerData(friendName);
 	if (!requestor || !requestee) return;
 
 	eAddFriendResponseType serverResponseCode{};
@@ -285,7 +308,11 @@ void ChatPacketHandler::HandleFriendResponse(Packet* packet) {
 		requesteeData.isOnline = true;
 		requestor->friends.push_back(requesteeData);
 
-		Database::Get()->AddFriend(requestor->playerID, requestee->playerID);
+		std::unique_ptr<sql::PreparedStatement> statement(Database::CreatePreppedStmt("INSERT IGNORE INTO `friends` (`player_id`, `friend_id`, `best_friend`) VALUES (?,?,?);"));
+		statement->setUInt(1, static_cast<uint32_t>(requestor->playerID));
+		statement->setUInt(2, static_cast<uint32_t>(requestee->playerID));
+		statement->setInt(3, 0);
+		statement->execute();
 	}
 
 	if (serverResponseCode != eAddFriendResponseType::DECLINED) SendFriendResponse(requestor, requestee, serverResponseCode, isAlreadyBestFriends);
@@ -300,20 +327,28 @@ void ChatPacketHandler::HandleRemoveFriend(Packet* packet) {
 
 	//we'll have to query the db here to find the user, since you can delete them while they're offline.
 	//First, we need to find their ID:
+	std::unique_ptr<sql::PreparedStatement> stmt(Database::CreatePreppedStmt("SELECT id FROM charinfo WHERE name=? LIMIT 1;"));
+	stmt->setString(1, friendName.c_str());
+
 	LWOOBJID friendID = 0;
-	auto friendIdResult = Database::Get()->GetCharacterInfo(friendName);
-	if (friendIdResult) {
-		friendID = friendIdResult->id;
+	std::unique_ptr<sql::ResultSet> res(stmt->executeQuery());
+	while (res->next()) {
+		friendID = res->getUInt(1);
 	}
 
 	// Convert friendID to LWOOBJID
 	GeneralUtils::SetBit(friendID, eObjectBits::PERSISTENT);
 	GeneralUtils::SetBit(friendID, eObjectBits::CHARACTER);
 
-	Database::Get()->RemoveFriend(playerID, friendID);
+	std::unique_ptr<sql::PreparedStatement> deletestmt(Database::CreatePreppedStmt("DELETE FROM friends WHERE (player_id = ? AND friend_id = ?) OR (player_id = ? AND friend_id = ?) LIMIT 1;"));
+	deletestmt->setUInt(1, static_cast<uint32_t>(playerID));
+	deletestmt->setUInt(2, static_cast<uint32_t>(friendID));
+	deletestmt->setUInt(3, static_cast<uint32_t>(friendID));
+	deletestmt->setUInt(4, static_cast<uint32_t>(playerID));
+	deletestmt->execute();
 
 	//Now, we need to send an update to notify the sender (and possibly, receiver) that their friendship has been ended:
-	auto goonA = Game::playerContainer.GetPlayerData(playerID);
+	auto goonA = playerContainer.GetPlayerData(playerID);
 	if (goonA) {
 		// Remove the friend from our list of friends
 		for (auto friendData = goonA->friends.begin(); friendData != goonA->friends.end(); friendData++) {
@@ -326,7 +361,7 @@ void ChatPacketHandler::HandleRemoveFriend(Packet* packet) {
 		SendRemoveFriend(goonA, friendName, true);
 	}
 
-	auto goonB = Game::playerContainer.GetPlayerData(friendID);
+	auto goonB = playerContainer.GetPlayerData(friendID);
 	if (!goonB) return;
 	// Do it again for other person
 	for (auto friendData = goonB->friends.begin(); friendData != goonB->friends.end(); friendData++) {
@@ -337,7 +372,7 @@ void ChatPacketHandler::HandleRemoveFriend(Packet* packet) {
 		}
 	}
 
-	std::string goonAName = GeneralUtils::UTF16ToWTF8(Game::playerContainer.GetName(playerID));
+	std::string goonAName = GeneralUtils::UTF16ToWTF8(playerContainer.GetName(playerID));
 	SendRemoveFriend(goonB, goonAName, true);
 }
 
@@ -346,11 +381,11 @@ void ChatPacketHandler::HandleChatMessage(Packet* packet) {
 	LWOOBJID playerID = LWOOBJID_EMPTY;
 	inStream.Read(playerID);
 
-	auto* sender = Game::playerContainer.GetPlayerData(playerID);
+	auto* sender = playerContainer.GetPlayerData(playerID);
 
 	if (sender == nullptr) return;
 
-	if (Game::playerContainer.GetIsMuted(sender)) return;
+	if (playerContainer.GetIsMuted(sender)) return;
 
 	const auto senderName = std::string(sender->playerName.c_str());
 
@@ -361,37 +396,37 @@ void ChatPacketHandler::HandleChatMessage(Packet* packet) {
 
 	std::string message = PacketUtils::ReadString(0x66, packet, true, 512);
 
-	LOG("Got a message from (%s) [%d]: %s", senderName.c_str(), channel, message.c_str());
+	Game::logger->Log("ChatPacketHandler", "Got a message from (%s) [%d]: %s", senderName.c_str(), channel, message.c_str());
 
 	if (channel != 8) return;
 
-	auto* team = Game::playerContainer.GetTeam(playerID);
+	auto* team = playerContainer.GetTeam(playerID);
 
 	if (team == nullptr) return;
 
 	for (const auto memberId : team->memberIDs) {
-		auto* otherMember = Game::playerContainer.GetPlayerData(memberId);
+		auto* otherMember = playerContainer.GetPlayerData(memberId);
 
 		if (otherMember == nullptr) return;
 
 		const auto otherName = std::string(otherMember->playerName.c_str());
 
 		CBITSTREAM;
-		BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
+		PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 		bitStream.Write(otherMember->playerID);
 
-		BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::PRIVATE_CHAT_MESSAGE);
+		PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::PRIVATE_CHAT_MESSAGE);
 		bitStream.Write(otherMember->playerID);
 		bitStream.Write<uint8_t>(8);
 		bitStream.Write<unsigned int>(69);
-		bitStream.Write(LUWString(senderName));
+		PacketUtils::WritePacketWString(senderName, 33, &bitStream);
 		bitStream.Write(sender->playerID);
 		bitStream.Write<uint16_t>(0);
 		bitStream.Write<uint8_t>(0); //not mythran nametag
-		bitStream.Write(LUWString(otherName));
+		PacketUtils::WritePacketWString(otherName, 33, &bitStream);
 		bitStream.Write<uint8_t>(0); //not mythran for receiver
 		bitStream.Write<uint8_t>(0); //teams?
-		bitStream.Write(LUWString(message, 512));
+		PacketUtils::WritePacketWString(message, 512, &bitStream);
 
 		SystemAddress sysAddr = otherMember->sysAddr;
 		SEND_PACKET;
@@ -399,16 +434,16 @@ void ChatPacketHandler::HandleChatMessage(Packet* packet) {
 }
 
 void ChatPacketHandler::HandlePrivateChatMessage(Packet* packet) {
-	LWOOBJID senderID = PacketUtils::ReadS64(0x08, packet);
+	LWOOBJID senderID = PacketUtils::ReadPacketS64(0x08, packet);
 	std::string receiverName = PacketUtils::ReadString(0x66, packet, true);
 	std::string message = PacketUtils::ReadString(0xAA, packet, true, 512);
 
 	//Get the bois:
-	auto goonA = Game::playerContainer.GetPlayerData(senderID);
-	auto goonB = Game::playerContainer.GetPlayerData(receiverName);
+	auto goonA = playerContainer.GetPlayerData(senderID);
+	auto goonB = playerContainer.GetPlayerData(receiverName);
 	if (!goonA || !goonB) return;
 
-	if (Game::playerContainer.GetIsMuted(goonA)) return;
+	if (playerContainer.GetIsMuted(goonA)) return;
 
 	std::string goonAName = goonA->playerName.c_str();
 	std::string goonBName = goonB->playerName.c_str();
@@ -416,21 +451,21 @@ void ChatPacketHandler::HandlePrivateChatMessage(Packet* packet) {
 	//To the sender:
 	{
 		CBITSTREAM;
-		BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
+		PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 		bitStream.Write(goonA->playerID);
 
-		BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::PRIVATE_CHAT_MESSAGE);
+		PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::PRIVATE_CHAT_MESSAGE);
 		bitStream.Write(goonA->playerID);
 		bitStream.Write<uint8_t>(7);
 		bitStream.Write<unsigned int>(69);
-		bitStream.Write(LUWString(goonAName));
+		PacketUtils::WritePacketWString(goonAName, 33, &bitStream);
 		bitStream.Write(goonA->playerID);
 		bitStream.Write<uint16_t>(0);
 		bitStream.Write<uint8_t>(0); //not mythran nametag
-		bitStream.Write(LUWString(goonBName));
+		PacketUtils::WritePacketWString(goonBName, 33, &bitStream);
 		bitStream.Write<uint8_t>(0); //not mythran for receiver
 		bitStream.Write<uint8_t>(0); //success
-		bitStream.Write(LUWString(message, 512));
+		PacketUtils::WritePacketWString(message, 512, &bitStream);
 
 		SystemAddress sysAddr = goonA->sysAddr;
 		SEND_PACKET;
@@ -439,21 +474,21 @@ void ChatPacketHandler::HandlePrivateChatMessage(Packet* packet) {
 	//To the receiver:
 	{
 		CBITSTREAM;
-		BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
+		PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 		bitStream.Write(goonB->playerID);
 
-		BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::PRIVATE_CHAT_MESSAGE);
+		PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::PRIVATE_CHAT_MESSAGE);
 		bitStream.Write(goonA->playerID);
 		bitStream.Write<uint8_t>(7);
 		bitStream.Write<unsigned int>(69);
-		bitStream.Write(LUWString(goonAName));
+		PacketUtils::WritePacketWString(goonAName, 33, &bitStream);
 		bitStream.Write(goonA->playerID);
 		bitStream.Write<uint16_t>(0);
 		bitStream.Write<uint8_t>(0); //not mythran nametag
-		bitStream.Write(LUWString(goonBName));
+		PacketUtils::WritePacketWString(goonBName, 33, &bitStream);
 		bitStream.Write<uint8_t>(0); //not mythran for receiver
 		bitStream.Write<uint8_t>(3); //new whisper
-		bitStream.Write(LUWString(message, 512));
+		PacketUtils::WritePacketWString(message, 512, &bitStream);
 
 		SystemAddress sysAddr = goonB->sysAddr;
 		SEND_PACKET;
@@ -466,38 +501,38 @@ void ChatPacketHandler::HandleTeamInvite(Packet* packet) {
 	inStream.Read(playerID);
 	std::string invitedPlayer = PacketUtils::ReadString(0x14, packet, true);
 
-	auto* player = Game::playerContainer.GetPlayerData(playerID);
+	auto* player = playerContainer.GetPlayerData(playerID);
 
 	if (player == nullptr) {
 		return;
 	}
 
-	auto* team = Game::playerContainer.GetTeam(playerID);
+	auto* team = playerContainer.GetTeam(playerID);
 
 	if (team == nullptr) {
-		team = Game::playerContainer.CreateTeam(playerID);
+		team = playerContainer.CreateTeam(playerID);
 	}
 
-	auto* other = Game::playerContainer.GetPlayerData(invitedPlayer);
+	auto* other = playerContainer.GetPlayerData(invitedPlayer);
 
 	if (other == nullptr) {
 		return;
 	}
 
-	if (Game::playerContainer.GetTeam(other->playerID) != nullptr) {
+	if (playerContainer.GetTeam(other->playerID) != nullptr) {
 		return;
 	}
 
 	if (team->memberIDs.size() > 3) {
 		// no more teams greater than 4
 
-		LOG("Someone tried to invite a 5th player to a team");
+		Game::logger->Log("ChatPacketHandler", "Someone tried to invite a 5th player to a team");
 		return;
 	}
 
 	SendTeamInvite(other, player);
 
-	LOG("Got team invite: %llu -> %s", playerID, invitedPlayer.c_str());
+	Game::logger->Log("ChatPacketHandler", "Got team invite: %llu -> %s", playerID, invitedPlayer.c_str());
 }
 
 void ChatPacketHandler::HandleTeamInviteResponse(Packet* packet) {
@@ -511,26 +546,26 @@ void ChatPacketHandler::HandleTeamInviteResponse(Packet* packet) {
 	LWOOBJID leaderID = LWOOBJID_EMPTY;
 	inStream.Read(leaderID);
 
-	LOG("Accepted invite: %llu -> %llu (%d)", playerID, leaderID, declined);
+	Game::logger->Log("ChatPacketHandler", "Accepted invite: %llu -> %llu (%d)", playerID, leaderID, declined);
 
 	if (declined) {
 		return;
 	}
 
-	auto* team = Game::playerContainer.GetTeam(leaderID);
+	auto* team = playerContainer.GetTeam(leaderID);
 
 	if (team == nullptr) {
-		LOG("Failed to find team for leader (%llu)", leaderID);
+		Game::logger->Log("ChatPacketHandler", "Failed to find team for leader (%llu)", leaderID);
 
-		team = Game::playerContainer.GetTeam(playerID);
+		team = playerContainer.GetTeam(playerID);
 	}
 
 	if (team == nullptr) {
-		LOG("Failed to find team for player (%llu)", playerID);
+		Game::logger->Log("ChatPacketHandler", "Failed to find team for player (%llu)", playerID);
 		return;
 	}
 
-	Game::playerContainer.AddMember(team, playerID);
+	playerContainer.AddMember(team, playerID);
 }
 
 void ChatPacketHandler::HandleTeamLeave(Packet* packet) {
@@ -540,12 +575,12 @@ void ChatPacketHandler::HandleTeamLeave(Packet* packet) {
 	uint32_t size = 0;
 	inStream.Read(size);
 
-	auto* team = Game::playerContainer.GetTeam(playerID);
+	auto* team = playerContainer.GetTeam(playerID);
 
-	LOG("(%llu) leaving team", playerID);
+	Game::logger->Log("ChatPacketHandler", "(%llu) leaving team", playerID);
 
 	if (team != nullptr) {
-		Game::playerContainer.RemoveMember(team, playerID, false, false, true);
+		playerContainer.RemoveMember(team, playerID, false, false, true);
 	}
 }
 
@@ -556,26 +591,26 @@ void ChatPacketHandler::HandleTeamKick(Packet* packet) {
 
 	std::string kickedPlayer = PacketUtils::ReadString(0x14, packet, true);
 
-	LOG("(%llu) kicking (%s) from team", playerID, kickedPlayer.c_str());
+	Game::logger->Log("ChatPacketHandler", "(%llu) kicking (%s) from team", playerID, kickedPlayer.c_str());
 
-	auto* kicked = Game::playerContainer.GetPlayerData(kickedPlayer);
+	auto* kicked = playerContainer.GetPlayerData(kickedPlayer);
 
 	LWOOBJID kickedId = LWOOBJID_EMPTY;
 
 	if (kicked != nullptr) {
 		kickedId = kicked->playerID;
 	} else {
-		kickedId = Game::playerContainer.GetId(GeneralUtils::UTF8ToUTF16(kickedPlayer));
+		kickedId = playerContainer.GetId(GeneralUtils::UTF8ToUTF16(kickedPlayer));
 	}
 
 	if (kickedId == LWOOBJID_EMPTY) return;
 
-	auto* team = Game::playerContainer.GetTeam(playerID);
+	auto* team = playerContainer.GetTeam(playerID);
 
 	if (team != nullptr) {
 		if (team->leaderID != playerID || team->leaderID == kickedId) return;
 
-		Game::playerContainer.RemoveMember(team, kickedId, false, true, false);
+		playerContainer.RemoveMember(team, kickedId, false, true, false);
 	}
 }
 
@@ -586,18 +621,18 @@ void ChatPacketHandler::HandleTeamPromote(Packet* packet) {
 
 	std::string promotedPlayer = PacketUtils::ReadString(0x14, packet, true);
 
-	LOG("(%llu) promoting (%s) to team leader", playerID, promotedPlayer.c_str());
+	Game::logger->Log("ChatPacketHandler", "(%llu) promoting (%s) to team leader", playerID, promotedPlayer.c_str());
 
-	auto* promoted = Game::playerContainer.GetPlayerData(promotedPlayer);
+	auto* promoted = playerContainer.GetPlayerData(promotedPlayer);
 
 	if (promoted == nullptr) return;
 
-	auto* team = Game::playerContainer.GetTeam(playerID);
+	auto* team = playerContainer.GetTeam(playerID);
 
 	if (team != nullptr) {
 		if (team->leaderID != playerID) return;
 
-		Game::playerContainer.PromoteMember(team, promoted->playerID);
+		playerContainer.PromoteMember(team, promoted->playerID);
 	}
 }
 
@@ -611,16 +646,16 @@ void ChatPacketHandler::HandleTeamLootOption(Packet* packet) {
 	char option;
 	inStream.Read(option);
 
-	auto* team = Game::playerContainer.GetTeam(playerID);
+	auto* team = playerContainer.GetTeam(playerID);
 
 	if (team != nullptr) {
 		if (team->leaderID != playerID) return;
 
 		team->lootFlag = option;
 
-		Game::playerContainer.TeamStatusUpdate(team);
+		playerContainer.TeamStatusUpdate(team);
 
-		Game::playerContainer.UpdateTeamsOnWorld(team, false);
+		playerContainer.UpdateTeamsOnWorld(team, false);
 	}
 }
 
@@ -629,18 +664,18 @@ void ChatPacketHandler::HandleTeamStatusRequest(Packet* packet) {
 	LWOOBJID playerID = LWOOBJID_EMPTY;
 	inStream.Read(playerID);
 
-	auto* team = Game::playerContainer.GetTeam(playerID);
-	auto* data = Game::playerContainer.GetPlayerData(playerID);
+	auto* team = playerContainer.GetTeam(playerID);
+	auto* data = playerContainer.GetPlayerData(playerID);
 
 	if (team != nullptr && data != nullptr) {
 		if (team->local && data->zoneID.GetMapID() != team->zoneId.GetMapID() && data->zoneID.GetCloneID() != team->zoneId.GetCloneID()) {
-			Game::playerContainer.RemoveMember(team, playerID, false, false, true, true);
+			playerContainer.RemoveMember(team, playerID, false, false, true, true);
 
 			return;
 		}
 
 		if (team->memberIDs.size() <= 1 && !team->local) {
-			Game::playerContainer.DisbandTeam(team);
+			playerContainer.DisbandTeam(team);
 
 			return;
 		}
@@ -651,16 +686,16 @@ void ChatPacketHandler::HandleTeamStatusRequest(Packet* packet) {
 			ChatPacketHandler::SendTeamSetLeader(data, LWOOBJID_EMPTY);
 		}
 
-		Game::playerContainer.TeamStatusUpdate(team);
+		playerContainer.TeamStatusUpdate(team);
 
 		const auto leaderName = GeneralUtils::UTF8ToUTF16(data->playerName);
 
 		for (const auto memberId : team->memberIDs) {
-			auto* otherMember = Game::playerContainer.GetPlayerData(memberId);
+			auto* otherMember = playerContainer.GetPlayerData(memberId);
 
 			if (memberId == playerID) continue;
 
-			const auto memberName = Game::playerContainer.GetName(memberId);
+			const auto memberName = playerContainer.GetName(memberId);
 
 			if (otherMember != nullptr) {
 				ChatPacketHandler::SendTeamSetOffWorldFlag(otherMember, data->playerID, data->zoneID);
@@ -668,19 +703,19 @@ void ChatPacketHandler::HandleTeamStatusRequest(Packet* packet) {
 			ChatPacketHandler::SendTeamAddPlayer(data, false, team->local, false, memberId, memberName, otherMember != nullptr ? otherMember->zoneID : LWOZONEID(0, 0, 0));
 		}
 
-		Game::playerContainer.UpdateTeamsOnWorld(team, false);
+		playerContainer.UpdateTeamsOnWorld(team, false);
 	}
 }
 
 void ChatPacketHandler::SendTeamInvite(PlayerData* receiver, PlayerData* sender) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver->playerID);
 
 	//portion that will get routed:
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::TEAM_INVITE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::TEAM_INVITE);
 
-	bitStream.Write(LUWString(sender->playerName.c_str()));
+	PacketUtils::WritePacketWString(sender->playerName.c_str(), 33, &bitStream);
 	bitStream.Write(sender->playerID);
 
 	SystemAddress sysAddr = receiver->sysAddr;
@@ -689,7 +724,7 @@ void ChatPacketHandler::SendTeamInvite(PlayerData* receiver, PlayerData* sender)
 
 void ChatPacketHandler::SendTeamInviteConfirm(PlayerData* receiver, bool bLeaderIsFreeTrial, LWOOBJID i64LeaderID, LWOZONEID i64LeaderZoneID, uint8_t ucLootFlag, uint8_t ucNumOfOtherPlayers, uint8_t ucResponseCode, std::u16string wsLeaderName) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver->playerID);
 
 	//portion that will get routed:
@@ -705,7 +740,7 @@ void ChatPacketHandler::SendTeamInviteConfirm(PlayerData* receiver, bool bLeader
 	bitStream.Write(ucLootFlag);
 	bitStream.Write(ucNumOfOtherPlayers);
 	bitStream.Write(ucResponseCode);
-	bitStream.Write<uint32_t>(wsLeaderName.size());
+	bitStream.Write(static_cast<uint32_t>(wsLeaderName.size()));
 	for (const auto character : wsLeaderName) {
 		bitStream.Write(character);
 	}
@@ -716,7 +751,7 @@ void ChatPacketHandler::SendTeamInviteConfirm(PlayerData* receiver, bool bLeader
 
 void ChatPacketHandler::SendTeamStatus(PlayerData* receiver, LWOOBJID i64LeaderID, LWOZONEID i64LeaderZoneID, uint8_t ucLootFlag, uint8_t ucNumOfOtherPlayers, std::u16string wsLeaderName) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver->playerID);
 
 	//portion that will get routed:
@@ -730,7 +765,7 @@ void ChatPacketHandler::SendTeamStatus(PlayerData* receiver, LWOOBJID i64LeaderI
 	bitStream.Write<uint32_t>(0); // BinaryBuffe, no clue what's in here
 	bitStream.Write(ucLootFlag);
 	bitStream.Write(ucNumOfOtherPlayers);
-	bitStream.Write<uint32_t>(wsLeaderName.size());
+	bitStream.Write(static_cast<uint32_t>(wsLeaderName.size()));
 	for (const auto character : wsLeaderName) {
 		bitStream.Write(character);
 	}
@@ -741,7 +776,7 @@ void ChatPacketHandler::SendTeamStatus(PlayerData* receiver, LWOOBJID i64LeaderI
 
 void ChatPacketHandler::SendTeamSetLeader(PlayerData* receiver, LWOOBJID i64PlayerID) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver->playerID);
 
 	//portion that will get routed:
@@ -758,7 +793,7 @@ void ChatPacketHandler::SendTeamSetLeader(PlayerData* receiver, LWOOBJID i64Play
 
 void ChatPacketHandler::SendTeamAddPlayer(PlayerData* receiver, bool bIsFreeTrial, bool bLocal, bool bNoLootOnDeath, LWOOBJID i64PlayerID, std::u16string wsPlayerName, LWOZONEID zoneID) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver->playerID);
 
 	//portion that will get routed:
@@ -771,7 +806,7 @@ void ChatPacketHandler::SendTeamAddPlayer(PlayerData* receiver, bool bIsFreeTria
 	bitStream.Write(bLocal);
 	bitStream.Write(bNoLootOnDeath);
 	bitStream.Write(i64PlayerID);
-	bitStream.Write<uint32_t>(wsPlayerName.size());
+	bitStream.Write(static_cast<uint32_t>(wsPlayerName.size()));
 	for (const auto character : wsPlayerName) {
 		bitStream.Write(character);
 	}
@@ -787,7 +822,7 @@ void ChatPacketHandler::SendTeamAddPlayer(PlayerData* receiver, bool bIsFreeTria
 
 void ChatPacketHandler::SendTeamRemovePlayer(PlayerData* receiver, bool bDisband, bool bIsKicked, bool bIsLeaving, bool bLocal, LWOOBJID i64LeaderID, LWOOBJID i64PlayerID, std::u16string wsPlayerName) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver->playerID);
 
 	//portion that will get routed:
@@ -802,7 +837,7 @@ void ChatPacketHandler::SendTeamRemovePlayer(PlayerData* receiver, bool bDisband
 	bitStream.Write(bLocal);
 	bitStream.Write(i64LeaderID);
 	bitStream.Write(i64PlayerID);
-	bitStream.Write<uint32_t>(wsPlayerName.size());
+	bitStream.Write(static_cast<uint32_t>(wsPlayerName.size()));
 	for (const auto character : wsPlayerName) {
 		bitStream.Write(character);
 	}
@@ -813,7 +848,7 @@ void ChatPacketHandler::SendTeamRemovePlayer(PlayerData* receiver, bool bDisband
 
 void ChatPacketHandler::SendTeamSetOffWorldFlag(PlayerData* receiver, LWOOBJID i64PlayerID, LWOZONEID zoneID) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver->playerID);
 
 	//portion that will get routed:
@@ -847,16 +882,16 @@ void ChatPacketHandler::SendFriendUpdate(PlayerData* friendData, PlayerData* pla
 		[bool] - is FTP*/
 
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(friendData->playerID);
 
 	//portion that will get routed:
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::UPDATE_FRIEND_NOTIFY);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::UPDATE_FRIEND_NOTIFY);
 	bitStream.Write<uint8_t>(notifyType);
 
 	std::string playerName = playerData->playerName.c_str();
 
-	bitStream.Write(LUWString(playerName));
+	PacketUtils::WritePacketWString(playerName, 33, &bitStream);
 
 	bitStream.Write(playerData->zoneID.GetMapID());
 	bitStream.Write(playerData->zoneID.GetInstanceID());
@@ -886,12 +921,12 @@ void ChatPacketHandler::SendFriendRequest(PlayerData* receiver, PlayerData* send
 	}
 
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver->playerID);
 
 	//portion that will get routed:
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::ADD_FRIEND_REQUEST);
-	bitStream.Write(LUWString(sender->playerName.c_str()));
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::ADD_FRIEND_REQUEST);
+	PacketUtils::WritePacketWString(sender->playerName.c_str(), 33, &bitStream);
 	bitStream.Write<uint8_t>(0); // This is a BFF flag however this is unused in live and does not have an implementation client side.
 
 	SystemAddress sysAddr = receiver->sysAddr;
@@ -902,16 +937,16 @@ void ChatPacketHandler::SendFriendResponse(PlayerData* receiver, PlayerData* sen
 	if (!receiver || !sender) return;
 
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver->playerID);
 
 	// Portion that will get routed:
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::ADD_FRIEND_RESPONSE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::ADD_FRIEND_RESPONSE);
 	bitStream.Write(responseCode);
 	// For all requests besides accepted, write a flag that says whether or not we are already best friends with the receiver.
 	bitStream.Write<uint8_t>(responseCode != eAddFriendResponseType::ACCEPTED ? isBestFriendsAlready : sender->sysAddr != UNASSIGNED_SYSTEM_ADDRESS);
 	// Then write the player name
-	bitStream.Write(LUWString(sender->playerName.c_str()));
+	PacketUtils::WritePacketWString(sender->playerName.c_str(), 33, &bitStream);
 	// Then if this is an acceptance code, write the following extra info.
 	if (responseCode == eAddFriendResponseType::ACCEPTED) {
 		bitStream.Write(sender->playerID);
@@ -927,13 +962,13 @@ void ChatPacketHandler::SendRemoveFriend(PlayerData* receiver, std::string& pers
 	if (!receiver) return;
 
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver->playerID);
 
 	//portion that will get routed:
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::REMOVE_FRIEND_RESPONSE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::REMOVE_FRIEND_RESPONSE);
 	bitStream.Write<uint8_t>(isSuccessful); //isOnline
-	bitStream.Write(LUWString(personToRemove));
+	PacketUtils::WritePacketWString(personToRemove, 33, &bitStream);
 
 	SystemAddress sysAddr = receiver->sysAddr;
 	SEND_PACKET;

dChatServer/ChatServer.cpp

@@ -6,7 +6,7 @@
 //DLU Includes:
 #include "dCommonVars.h"
 #include "dServer.h"
-#include "Logger.h"
+#include "dLogger.h"
 #include "Database.h"
 #include "dConfig.h"
 #include "dChatFilter.h"
@@ -19,28 +19,28 @@
 #include "eChatMessageType.h"
 #include "eChatInternalMessageType.h"
 #include "eWorldMessageType.h"
-#include "ChatIgnoreList.h"
 
 #include "Game.h"
 
 //RakNet includes:
 #include "RakNetDefines.h"
-#include "MessageIdentifiers.h"
+#include <MessageIdentifiers.h>
 
 namespace Game {
-	Logger* logger = nullptr;
+	dLogger* logger = nullptr;
 	dServer* server = nullptr;
 	dConfig* config = nullptr;
 	dChatFilter* chatFilter = nullptr;
 	AssetManager* assetManager = nullptr;
-	Game::signal_t lastSignal = 0;
-	std::mt19937 randomEngine;
-	PlayerContainer playerContainer;
+	bool shouldShutdown = false;
 }
 
-Logger* SetupLogger();
+
+dLogger* SetupLogger();
 void HandlePacket(Packet* packet);
 
+PlayerContainer playerContainer;
+
 int main(int argc, char** argv) {
 	constexpr uint32_t chatFramerate = mediumFramerate;
 	constexpr uint32_t chatFrameDelta = mediumFrameDelta;
@@ -48,21 +48,18 @@ int main(int argc, char** argv) {
 	Diagnostics::SetProcessFileName(argv[0]);
 	Diagnostics::Initialize();
 
-	std::signal(SIGINT, Game::OnSignal);
-	std::signal(SIGTERM, Game::OnSignal);
-
 	//Create all the objects we need to run our service:
 	Game::logger = SetupLogger();
 	if (!Game::logger) return EXIT_FAILURE;
 
 	//Read our config:
-	Game::config = new dConfig("chatconfig.ini");
+	Game::config = new dConfig((BinaryPathFinder::GetBinaryDir() / "chatconfig.ini").string());
 	Game::logger->SetLogToConsole(Game::config->GetValue("log_to_console") != "0");
 	Game::logger->SetLogDebugStatements(Game::config->GetValue("log_debug_statements") == "1");
 
-	LOG("Starting Chat server...");
-	LOG("Version: %s", PROJECT_VERSION);
-	LOG("Compiled on: %s", __TIMESTAMP__);
+	Game::logger->Log("ChatServer", "Starting Chat server...");
+	Game::logger->Log("ChatServer", "Version: %i.%i", PROJECT_VERSION_MAJOR, PROJECT_VERSION_MINOR);
+	Game::logger->Log("ChatServer", "Compiled on: %s", __TIMESTAMP__);
 
 	try {
 		std::string clientPathStr = Game::config->GetValue("client_location");
@@ -74,16 +71,21 @@ int main(int argc, char** argv) {
 
 		Game::assetManager = new AssetManager(clientPath);
 	} catch (std::runtime_error& ex) {
-		LOG("Got an error while setting up assets: %s", ex.what());
+		Game::logger->Log("ChatServer", "Got an error while setting up assets: %s", ex.what());
 
 		return EXIT_FAILURE;
 	}
 
 	//Connect to the MySQL Database
+	std::string mysql_host = Game::config->GetValue("mysql_host");
+	std::string mysql_database = Game::config->GetValue("mysql_database");
+	std::string mysql_username = Game::config->GetValue("mysql_username");
+	std::string mysql_password = Game::config->GetValue("mysql_password");
+
 	try {
-		Database::Connect();
+		Database::Connect(mysql_host, mysql_database, mysql_username, mysql_password);
 	} catch (sql::SQLException& ex) {
-		LOG("Got an error while connecting to the database: %s", ex.what());
+		Game::logger->Log("ChatServer", "Got an error while connecting to the database: %s", ex.what());
 		Database::Destroy("ChatServer");
 		delete Game::server;
 		delete Game::logger;
@@ -93,29 +95,25 @@ int main(int argc, char** argv) {
 	//Find out the master's IP:
 	std::string masterIP;
 	uint32_t masterPort = 1000;
-	auto masterInfo = Database::Get()->GetMasterInfo();
-	if (masterInfo) {
-		masterIP = masterInfo->ip;
-		masterPort = masterInfo->port;
+	sql::PreparedStatement* stmt = Database::CreatePreppedStmt("SELECT ip, port FROM servers WHERE name='master';");
+	auto res = stmt->executeQuery();
+	while (res->next()) {
+		masterIP = res->getString(1).c_str();
+		masterPort = res->getInt(2);
 	}
+
+	delete res;
+	delete stmt;
+
 	//It's safe to pass 'localhost' here, as the IP is only used as the external IP.
-	uint32_t maxClients = 999;
+	uint32_t maxClients = 50;
 	uint32_t ourPort = 1501;
-	std::string ourIP = "localhost";
-	GeneralUtils::TryParse(Game::config->GetValue("max_clients"), maxClients);
-	GeneralUtils::TryParse(Game::config->GetValue("chat_server_port"), ourPort);
-	const auto externalIPString = Game::config->GetValue("external_ip");
-	if (!externalIPString.empty()) ourIP = externalIPString;
+	if (Game::config->GetValue("max_clients") != "") maxClients = std::stoi(Game::config->GetValue("max_clients"));
+	if (Game::config->GetValue("port") != "") ourPort = std::atoi(Game::config->GetValue("port").c_str());
 
-	Game::server = new dServer(ourIP, ourPort, 0, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::Chat, Game::config, &Game::lastSignal);
+	Game::server = new dServer(Game::config->GetValue("external_ip"), ourPort, 0, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::Chat, Game::config, &Game::shouldShutdown);
 
-	bool dontGenerateDCF = false;
-	GeneralUtils::TryParse(Game::config->GetValue("dont_generate_dcf"), dontGenerateDCF);
-	Game::chatFilter = new dChatFilter(Game::assetManager->GetResPath().string() + "/chatplus_en_us", dontGenerateDCF);
-	
-	Game::randomEngine = std::mt19937(time(0));
-
-	Game::playerContainer.Initialize();
+	Game::chatFilter = new dChatFilter(Game::assetManager->GetResPath().string() + "/chatplus_en_us", bool(std::stoi(Game::config->GetValue("dont_generate_dcf"))));
 
 	//Run it until server gets a kill message from Master:
 	auto t = std::chrono::high_resolution_clock::now();
@@ -126,8 +124,7 @@ int main(int argc, char** argv) {
 	uint32_t framesSinceMasterDisconnect = 0;
 	uint32_t framesSinceLastSQLPing = 0;
 
-	Game::logger->Flush(); // once immediately before main loop
-	while (!Game::ShouldShutdown()) {
+	while (!Game::shouldShutdown) {
 		//Check if we're still connected to master:
 		if (!Game::server->GetIsConnectedToMaster()) {
 			framesSinceMasterDisconnect++;
@@ -158,13 +155,16 @@ int main(int argc, char** argv) {
 			//Find out the master's IP for absolutely no reason:
 			std::string masterIP;
 			uint32_t masterPort;
-
-			auto masterInfo = Database::Get()->GetMasterInfo();
-			if (masterInfo) {
-				masterIP = masterInfo->ip;
-				masterPort = masterInfo->port;
+			sql::PreparedStatement* stmt = Database::CreatePreppedStmt("SELECT ip, port FROM servers WHERE name='master';");
+			auto res = stmt->executeQuery();
+			while (res->next()) {
+				masterIP = res->getString(1).c_str();
+				masterPort = res->getInt(2);
 			}
 
+			delete res;
+			delete stmt;
+
 			framesSinceLastSQLPing = 0;
 		} else framesSinceLastSQLPing++;
 
@@ -182,7 +182,7 @@ int main(int argc, char** argv) {
 	return EXIT_SUCCESS;
 }
 
-Logger* SetupLogger() {
+dLogger* SetupLogger() {
 	std::string logPath = (BinaryPathFinder::GetBinaryDir() / ("logs/ChatServer_" + std::to_string(time(nullptr)) + ".log")).string();
 	bool logToConsole = false;
 	bool logDebugStatements = false;
@@ -191,16 +191,16 @@ Logger* SetupLogger() {
 	logDebugStatements = true;
 #endif
 
-	return new Logger(logPath, logToConsole, logDebugStatements);
+	return new dLogger(logPath, logToConsole, logDebugStatements);
 }
 
 void HandlePacket(Packet* packet) {
 	if (packet->data[0] == ID_DISCONNECTION_NOTIFICATION || packet->data[0] == ID_CONNECTION_LOST) {
-		LOG("A server has disconnected, erasing their connected players from the list.");
+		Game::logger->Log("ChatServer", "A server has disconnected, erasing their connected players from the list.");
 	}
 
 	if (packet->data[0] == ID_NEW_INCOMING_CONNECTION) {
-		LOG("A server is connecting, awaiting user list.");
+		Game::logger->Log("ChatServer", "A server is connecting, awaiting user list.");
 	}
 
 	if (packet->length < 4) return; // Nothing left to process.  Need 4 bytes to continue.
@@ -208,19 +208,19 @@ void HandlePacket(Packet* packet) {
 	if (static_cast<eConnectionType>(packet->data[1]) == eConnectionType::CHAT_INTERNAL) {
 		switch (static_cast<eChatInternalMessageType>(packet->data[3])) {
 		case eChatInternalMessageType::PLAYER_ADDED_NOTIFICATION:
-			Game::playerContainer.InsertPlayer(packet);
+			playerContainer.InsertPlayer(packet);
 			break;
 
 		case eChatInternalMessageType::PLAYER_REMOVED_NOTIFICATION:
-			Game::playerContainer.RemovePlayer(packet);
+			playerContainer.RemovePlayer(packet);
 			break;
 
 		case eChatInternalMessageType::MUTE_UPDATE:
-			Game::playerContainer.MuteUpdate(packet);
+			playerContainer.MuteUpdate(packet);
 			break;
 
 		case eChatInternalMessageType::CREATE_TEAM:
-			Game::playerContainer.CreateTeamServer(packet);
+			playerContainer.CreateTeamServer(packet);
 			break;
 
 		case eChatInternalMessageType::ANNOUNCEMENT: {
@@ -231,7 +231,7 @@ void HandlePacket(Packet* packet) {
 		}
 
 		default:
-			LOG("Unknown CHAT_INTERNAL id: %i", int(packet->data[3]));
+			Game::logger->Log("ChatServer", "Unknown CHAT_INTERNAL id: %i", int(packet->data[3]));
 		}
 	}
 
@@ -242,15 +242,7 @@ void HandlePacket(Packet* packet) {
 			break;
 
 		case eChatMessageType::GET_IGNORE_LIST:
-			ChatIgnoreList::GetIgnoreList(packet);
-			break;
-
-		case eChatMessageType::ADD_IGNORE:
-			ChatIgnoreList::AddIgnore(packet);
-			break;
-
-		case eChatMessageType::REMOVE_IGNORE:
-			ChatIgnoreList::RemoveIgnore(packet);
+			Game::logger->Log("ChatServer", "Asked for ignore list, but is unimplemented right now.");
 			break;
 
 		case eChatMessageType::TEAM_GET_STATUS:
@@ -308,19 +300,19 @@ void HandlePacket(Packet* packet) {
 			break;
 
 		default:
-			LOG("Unknown CHAT id: %i", int(packet->data[3]));
+			Game::logger->Log("ChatServer", "Unknown CHAT id: %i", int(packet->data[3]));
 		}
 	}
 
 	if (static_cast<eConnectionType>(packet->data[1]) == eConnectionType::WORLD) {
 		switch (static_cast<eWorldMessageType>(packet->data[3])) {
 		case eWorldMessageType::ROUTE_PACKET: {
-			LOG("Routing packet from world");
+			Game::logger->Log("ChatServer", "Routing packet from world");
 			break;
 		}
 
 		default:
-			LOG("Unknown World id: %i", int(packet->data[3]));
+			Game::logger->Log("ChatServer", "Unknown World id: %i", int(packet->data[3]));
 		}
 	}
 }

dChatServer/PlayerContainer.cpp

@@ -3,27 +3,19 @@
 #include <iostream>
 #include <algorithm>
 #include "Game.h"
-#include "Logger.h"
+#include "dLogger.h"
 #include "ChatPacketHandler.h"
 #include "GeneralUtils.h"
-#include "BitStreamUtils.h"
+#include "PacketUtils.h"
 #include "Database.h"
 #include "eConnectionType.h"
 #include "eChatInternalMessageType.h"
-#include "ChatPackets.h"
-#include "dConfig.h"
 
-void PlayerContainer::Initialize() {
-	GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("max_number_of_best_friends"), m_MaxNumberOfBestFriends);
-	GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("max_number_of_friends"), m_MaxNumberOfFriends);
+PlayerContainer::PlayerContainer() {
 }
 
 PlayerContainer::~PlayerContainer() {
-	m_Players.clear();
-}
-
-TeamData::TeamData() {
-	lootFlag = Game::config->GetValue("default_team_loot") == "0" ? 0 : 1;
+	mPlayers.clear();
 }
 
 void PlayerContainer::InsertPlayer(Packet* packet) {
@@ -43,12 +35,19 @@ void PlayerContainer::InsertPlayer(Packet* packet) {
 	inStream.Read(data->muteExpire);
 	data->sysAddr = packet->systemAddress;
 
-	m_Names[data->playerID] = GeneralUtils::UTF8ToUTF16(data->playerName);
+	mNames[data->playerID] = GeneralUtils::UTF8ToUTF16(data->playerName);
 
-	m_Players.insert(std::make_pair(data->playerID, data));
-	LOG("Added user: %s (%llu), zone: %i", data->playerName.c_str(), data->playerID, data->zoneID.GetMapID());
+	mPlayers.insert(std::make_pair(data->playerID, data));
+	Game::logger->Log("PlayerContainer", "Added user: %s (%llu), zone: %i", data->playerName.c_str(), data->playerID, data->zoneID.GetMapID());
 
-	Database::Get()->UpdateActivityLog(data->playerID, eActivityType::PlayerLoggedIn, data->zoneID.GetMapID());
+	auto* insertLog = Database::CreatePreppedStmt("INSERT INTO activity_log (character_id, activity, time, map_id) VALUES (?, ?, ?, ?);");
+
+	insertLog->setInt(1, data->playerID);
+	insertLog->setInt(2, 0);
+	insertLog->setUInt64(3, time(nullptr));
+	insertLog->setInt(4, data->zoneID.GetMapID());
+
+	insertLog->executeUpdate();
 }
 
 void PlayerContainer::RemovePlayer(Packet* packet) {
@@ -82,10 +81,17 @@ void PlayerContainer::RemovePlayer(Packet* packet) {
 		}
 	}
 
-	LOG("Removed user: %llu", playerID);
-	m_Players.erase(playerID);
+	Game::logger->Log("PlayerContainer", "Removed user: %llu", playerID);
+	mPlayers.erase(playerID);
 
-	Database::Get()->UpdateActivityLog(playerID, eActivityType::PlayerLoggedOut, player->zoneID.GetMapID());
+	auto* insertLog = Database::CreatePreppedStmt("INSERT INTO activity_log (character_id, activity, time, map_id) VALUES (?, ?, ?, ?);");
+
+	insertLog->setInt(1, playerID);
+	insertLog->setInt(2, 1);
+	insertLog->setUInt64(3, time(nullptr));
+	insertLog->setInt(4, player->zoneID.GetMapID());
+
+	insertLog->executeUpdate();
 }
 
 void PlayerContainer::MuteUpdate(Packet* packet) {
@@ -98,7 +104,7 @@ void PlayerContainer::MuteUpdate(Packet* packet) {
 	auto* player = this->GetPlayerData(playerID);
 
 	if (player == nullptr) {
-		LOG("Failed to find user: %llu", playerID);
+		Game::logger->Log("PlayerContainer", "Failed to find user: %llu", playerID);
 
 		return;
 	}
@@ -140,7 +146,7 @@ void PlayerContainer::CreateTeamServer(Packet* packet) {
 
 void PlayerContainer::BroadcastMuteUpdate(LWOOBJID player, time_t time) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::MUTE_UPDATE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::MUTE_UPDATE);
 
 	bitStream.Write(player);
 	bitStream.Write(time);
@@ -179,7 +185,7 @@ TeamData* PlayerContainer::CreateLocalTeam(std::vector<LWOOBJID> members) {
 TeamData* PlayerContainer::CreateTeam(LWOOBJID leader, bool local) {
 	auto* team = new TeamData();
 
-	team->teamID = ++m_TeamIDCounter;
+	team->teamID = ++mTeamIDCounter;
 	team->leaderID = leader;
 	team->local = local;
 
@@ -201,14 +207,6 @@ TeamData* PlayerContainer::GetTeam(LWOOBJID playerID) {
 }
 
 void PlayerContainer::AddMember(TeamData* team, LWOOBJID playerID) {
-	if (team->memberIDs.size() >= 4){
-		LOG("Tried to add player to team that already had 4 players");
-		auto* player = GetPlayerData(playerID);
-		if (!player) return;
-		ChatPackets::SendSystemMessage(player->sysAddr, u"The teams is full! You have not been added to a team!");
-		return;
-	}
-
 	const auto index = std::find(team->memberIDs.begin(), team->memberIDs.end(), playerID);
 
 	if (index != team->memberIDs.end()) return;
@@ -347,14 +345,14 @@ void PlayerContainer::TeamStatusUpdate(TeamData* team) {
 
 void PlayerContainer::UpdateTeamsOnWorld(TeamData* team, bool deleteTeam) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::TEAM_UPDATE);
+	PacketUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::TEAM_UPDATE);
 
 	bitStream.Write(team->teamID);
 	bitStream.Write(deleteTeam);
 
 	if (!deleteTeam) {
 		bitStream.Write(team->lootFlag);
-		bitStream.Write<char>(team->memberIDs.size());
+		bitStream.Write(static_cast<char>(team->memberIDs.size()));
 		for (const auto memberID : team->memberIDs) {
 			bitStream.Write(memberID);
 		}
@@ -364,15 +362,15 @@ void PlayerContainer::UpdateTeamsOnWorld(TeamData* team, bool deleteTeam) {
 }
 
 std::u16string PlayerContainer::GetName(LWOOBJID playerID) {
-	const auto& pair = m_Names.find(playerID);
+	const auto& pair = mNames.find(playerID);
 
-	if (pair == m_Names.end()) return u"";
+	if (pair == mNames.end()) return u"";
 
 	return pair->second;
 }
 
 LWOOBJID PlayerContainer::GetId(const std::u16string& playerName) {
-	for (const auto& pair : m_Names) {
+	for (const auto& pair : mNames) {
 		if (pair.second == playerName) {
 			return pair.first;
 		}

dChatServer/PlayerContainer.h

@@ -7,32 +7,17 @@
 #include "dServer.h"
 #include <unordered_map>
 
-struct IgnoreData {
-	inline bool operator==(const std::string& other) const noexcept {
-		return playerName == other;
-	}
-
-	inline bool operator==(const LWOOBJID& other) const noexcept {
-		return playerId == other;
-	}
-
-	LWOOBJID playerId;
-	std::string playerName;
-};
-
 struct PlayerData {
 	LWOOBJID playerID;
 	std::string playerName;
 	SystemAddress sysAddr;
 	LWOZONEID zoneID;
 	std::vector<FriendData> friends;
-	std::vector<IgnoreData> ignoredPlayers;
 	time_t muteExpire;
 	uint8_t countOfBestFriends = 0;
 };
 
 struct TeamData {
-	TeamData();
 	LWOOBJID teamID = LWOOBJID_EMPTY; // Internal use
 	LWOOBJID leaderID = LWOOBJID_EMPTY;
 	std::vector<LWOOBJID> memberIDs{};
@@ -43,9 +28,9 @@ struct TeamData {
 
 class PlayerContainer {
 public:
+	PlayerContainer();
 	~PlayerContainer();
 
-	void Initialize();
 	void InsertPlayer(Packet* packet);
 	void RemovePlayer(Packet* packet);
 	void MuteUpdate(Packet* packet);
@@ -53,13 +38,13 @@ public:
 	void BroadcastMuteUpdate(LWOOBJID player, time_t time);
 
 	PlayerData* GetPlayerData(const LWOOBJID& playerID) {
-		auto it = m_Players.find(playerID);
-		if (it != m_Players.end()) return it->second;
+		auto it = mPlayers.find(playerID);
+		if (it != mPlayers.end()) return it->second;
 		return nullptr;
 	}
 
 	PlayerData* GetPlayerData(const std::string& playerName) {
-		for (auto player : m_Players) {
+		for (auto player : mPlayers) {
 			if (player.second) {
 				std::string pn = player.second->playerName.c_str();
 				if (pn == playerName) return player.second;
@@ -81,17 +66,13 @@ public:
 	std::u16string GetName(LWOOBJID playerID);
 	LWOOBJID GetId(const std::u16string& playerName);
 	bool GetIsMuted(PlayerData* data);
-	uint32_t GetMaxNumberOfBestFriends() { return m_MaxNumberOfBestFriends; }
-	uint32_t GetMaxNumberOfFriends() { return m_MaxNumberOfFriends; }
 
-	std::map<LWOOBJID, PlayerData*>& GetAllPlayerData() { return m_Players; }
+	std::map<LWOOBJID, PlayerData*>& GetAllPlayerData() { return mPlayers; }
 
 private:
-	LWOOBJID m_TeamIDCounter = 0;
-	std::map<LWOOBJID, PlayerData*> m_Players;
+	LWOOBJID mTeamIDCounter = 0;
+	std::map<LWOOBJID, PlayerData*> mPlayers;
 	std::vector<TeamData*> mTeams;
-	std::unordered_map<LWOOBJID, std::u16string> m_Names;
-	uint32_t m_MaxNumberOfBestFriends = 5;
-	uint32_t m_MaxNumberOfFriends = 50;
+	std::unordered_map<LWOOBJID, std::u16string> mNames;
 };
 

dCommon/Amf3.h

@@ -2,7 +2,7 @@
 #define __AMF3__H__
 
 #include "dCommonVars.h"
-#include "Logger.h"
+#include "dLogger.h"
 #include "Game.h"
 
 #include <unordered_map>

dCommon/AmfSerialize.cpp

@@ -1,7 +1,7 @@
 #include "AmfSerialize.h"
 
 #include "Game.h"
-#include "Logger.h"
+#include "dLogger.h"
 
 // Writes an AMFValue pointer to a RakNet::BitStream
 template<>
@@ -29,7 +29,7 @@ void RakNet::BitStream::Write<AMFBaseValue&>(AMFBaseValue& value) {
 		break;
 	}
 	default: {
-		LOG("Encountered unwritable AMFType %i!", type);
+		Game::logger->Log("AmfSerialize", "Encountered unwritable AMFType %i!", type);
 	}
 	case eAmf::Undefined:
 	case eAmf::Null:
@@ -54,17 +54,17 @@ void RakNet::BitStream::Write<AMFBaseValue&>(AMFBaseValue& value) {
  * RakNet writes in the correct byte order - do not reverse this.
  */
 void WriteUInt29(RakNet::BitStream* bs, uint32_t v) {
-	unsigned char b4 = static_cast<unsigned char>(v);
+	unsigned char b4 = (unsigned char)v;
 	if (v < 0x00200000) {
 		b4 = b4 & 0x7F;
 		if (v > 0x7F) {
 			unsigned char b3;
 			v = v >> 7;
-			b3 = static_cast<unsigned char>(v) | 0x80;
+			b3 = ((unsigned char)(v)) | 0x80;
 			if (v > 0x7F) {
 				unsigned char b2;
 				v = v >> 7;
-				b2 = static_cast<unsigned char>(v) | 0x80;
+				b2 = ((unsigned char)(v)) | 0x80;
 				bs->Write(b2);
 			}
 
@@ -76,11 +76,11 @@ void WriteUInt29(RakNet::BitStream* bs, uint32_t v) {
 		unsigned char b3;
 
 		v = v >> 8;
-		b3 = static_cast<unsigned char>(v) | 0x80;
+		b3 = ((unsigned char)(v)) | 0x80;
 		v = v >> 7;
-		b2 = static_cast<unsigned char>(v) | 0x80;
+		b2 = ((unsigned char)(v)) | 0x80;
 		v = v >> 7;
-		b1 = static_cast<unsigned char>(v) | 0x80;
+		b1 = ((unsigned char)(v)) | 0x80;
 
 		bs->Write(b1);
 		bs->Write(b2);
@@ -105,8 +105,8 @@ void WriteFlagNumber(RakNet::BitStream* bs, uint32_t v) {
  * RakNet writes in the correct byte order - do not reverse this.
  */
 void WriteAMFString(RakNet::BitStream* bs, const std::string& str) {
-	WriteFlagNumber(bs, static_cast<uint32_t>(str.size()));
-	bs->Write(str.c_str(), static_cast<uint32_t>(str.size()));
+	WriteFlagNumber(bs, (uint32_t)str.size());
+	bs->Write(str.c_str(), (uint32_t)str.size());
 }
 
 /**

dCommon/AmfSerialize.h

@@ -4,7 +4,7 @@
 #include "Amf3.h"
 
 // RakNet
-#include "BitStream.h"
+#include <BitStream.h>
 
 /*!
  \file AmfSerialize.h

dCommon/BinaryIO.cpp

@@ -1,6 +1,14 @@
 #include "BinaryIO.h"
 #include <string>
 
+void BinaryIO::WriteString(const std::string& stringToWrite, std::ofstream& outstream) {
+	//BinaryWrite(outstream, uint32_t(stringToWrite.length()));
+
+	for (size_t i = 0; i < size_t(stringToWrite.length()); ++i) {
+		BinaryIO::BinaryWrite(outstream, stringToWrite[i]);
+	}
+}
+
 //For reading null-terminated strings
 std::string BinaryIO::ReadString(std::istream& instream) {
 	std::string toReturn;
@@ -15,3 +23,36 @@ std::string BinaryIO::ReadString(std::istream& instream) {
 
 	return toReturn;
 }
+
+//For reading strings of a specific size
+std::string BinaryIO::ReadString(std::istream& instream, size_t size) {
+	std::string toReturn;
+	char buffer;
+
+	for (size_t i = 0; i < size; ++i) {
+		BinaryIO::BinaryRead(instream, buffer);
+		toReturn += buffer;
+	}
+
+	return toReturn;
+}
+
+std::string BinaryIO::ReadWString(std::istream& instream) {
+	size_t size;
+	BinaryRead(instream, size);
+	//toReturn.resize(size);
+	std::string test;
+	unsigned char buf;
+
+	for (size_t i = 0; i < size; ++i) {
+		//instream.ignore(1);
+		BinaryRead(instream, buf);
+		test += buf;
+	}
+
+	//printf("%s\n", test.c_str());
+
+	//instream.read((char*)&toReturn[0], size * 2);
+	//std::string str(toReturn.begin(), toReturn.end());
+	return test;
+}

dCommon/BinaryIO.h

@@ -1,17 +1,8 @@
 #pragma once
-
-#ifndef __BINARYIO__H__
-#define __BINARYIO__H__
-
 #include <iostream>
 #include <fstream>
-#include <string>
-
-#include "Game.h"
-#include "Logger.h"
 
 namespace BinaryIO {
-
 	template<typename T>
 	std::ostream& BinaryWrite(std::ostream& stream, const T& value) {
 		return stream.write(reinterpret_cast<const char*>(&value), sizeof(T));
@@ -24,51 +15,13 @@ namespace BinaryIO {
 		return stream.read(reinterpret_cast<char*>(&value), sizeof(T));
 	}
 
-	enum class ReadType : int8_t {
-		WideString = 0,
-		String = 1,
-	};
-
-	template<typename SizeType>
-	inline void ReadString(std::istream& stream, std::u16string& value) {
-		static_assert(std::is_integral<SizeType>::value, "SizeType must be an integral type.");
-
-		SizeType size;
-		BinaryRead(stream, size);
-
-		if (!stream.good()) throw std::runtime_error("Failed to read from istream.");
-		value.resize(size);
-		stream.read(reinterpret_cast<char*>(value.data()), size * sizeof(uint16_t));
-	}
-
-	template<typename SizeType>
-	inline void ReadString(std::istream& stream, std::string& value, ReadType readType) {
-		static_assert(std::is_integral<SizeType>::value, "SizeType must be an integral type.");
-
-		SizeType size;
-		BinaryRead(stream, size);
-
-		if (!stream.good()) throw std::runtime_error("Failed to read from istream.");
-		value.resize(size);
-		if (readType == ReadType::WideString) {
-			uint16_t wideChar;
-
-			// Faster to do this than to read a u16string and convert it to a string since we only go through allocator once
-			for (SizeType i = 0; i < size; ++i) {
-				BinaryRead(stream, wideChar);
-				value[i] = static_cast<char>(wideChar);
-			}
-		} else {
-			stream.read(value.data(), size);
-		}
-	}
-
+	void WriteString(const std::string& stringToWrite, std::ofstream& outstream);
 	std::string ReadString(std::istream& instream);
+	std::string ReadString(std::istream& instream, size_t size);
+	std::string ReadWString(std::istream& instream);
 
 	inline bool DoesFileExist(const std::string& name) {
 		std::ifstream f(name.c_str());
 		return f.good();
 	}
 }
-
-#endif  //!__BINARYIO__H__

dCommon/BrickByBrickFix.cpp

@@ -9,12 +9,13 @@
 #include "Database.h"
 #include "Game.h"
 #include "ZCompression.h"
-#include "Logger.h"
+#include "dLogger.h"
 
 //! Forward declarations
 
+std::unique_ptr<sql::ResultSet> GetModelsFromDatabase();
 void WriteSd0Magic(char* input, uint32_t chunkSize);
-bool CheckSd0Magic(std::istream& streamToCheck);
+bool CheckSd0Magic(sql::Blob* streamToCheck);
 
 /**
  * @brief Truncates all models with broken data from the database.
@@ -23,24 +24,28 @@ bool CheckSd0Magic(std::istream& streamToCheck);
  */
 uint32_t BrickByBrickFix::TruncateBrokenBrickByBrickXml() {
 	uint32_t modelsTruncated{};
-	auto modelsToTruncate = Database::Get()->GetAllUgcModels();
-	bool previousCommitValue = Database::Get()->GetAutoCommit();
-	Database::Get()->SetAutoCommit(false);
-	for (auto& model : modelsToTruncate) {
+	auto modelsToTruncate = GetModelsFromDatabase();
+	bool previousCommitValue = Database::GetAutoCommit();
+	Database::SetAutoCommit(false);
+	while (modelsToTruncate->next()) {
+		std::unique_ptr<sql::PreparedStatement> ugcModelToDelete(Database::CreatePreppedStmt("DELETE FROM ugc WHERE ugc.id = ?;"));
+		std::unique_ptr<sql::PreparedStatement> pcModelToDelete(Database::CreatePreppedStmt("DELETE FROM properties_contents WHERE ugc_id = ?;"));
 		std::string completeUncompressedModel{};
 		uint32_t chunkCount{};
+		uint64_t modelId = modelsToTruncate->getInt(1);
+		std::unique_ptr<sql::Blob> modelAsSd0(modelsToTruncate->getBlob(2));
 		// Check that header is sd0 by checking for the sd0 magic.
-		if (CheckSd0Magic(model.lxfmlData)) {
+		if (CheckSd0Magic(modelAsSd0.get())) {
 			while (true) {
 				uint32_t chunkSize{};
-				model.lxfmlData.read(reinterpret_cast<char*>(&chunkSize), sizeof(uint32_t)); // Extract chunk size from istream
+				modelAsSd0->read(reinterpret_cast<char*>(&chunkSize), sizeof(uint32_t)); // Extract chunk size from istream
 
 				// Check if good here since if at the end of an sd0 file, this will have eof flagged.
-				if (!model.lxfmlData.good()) break;
+				if (!modelAsSd0->good()) break;
 
 				std::unique_ptr<uint8_t[]> compressedChunk(new uint8_t[chunkSize]);
 				for (uint32_t i = 0; i < chunkSize; i++) {
-					compressedChunk[i] = model.lxfmlData.get();
+					compressedChunk[i] = modelAsSd0->get();
 				}
 
 				// Ignore the valgrind warning about uninitialized values.  These are discarded later when we know the actual uncompressed size.
@@ -51,17 +56,17 @@ uint32_t BrickByBrickFix::TruncateBrokenBrickByBrickXml() {
 
 				if (actualUncompressedSize != -1) {
 					uint32_t previousSize = completeUncompressedModel.size();
-					completeUncompressedModel.append(reinterpret_cast<char*>(uncompressedChunk.get()));
+					completeUncompressedModel.append((char*)uncompressedChunk.get());
 					completeUncompressedModel.resize(previousSize + actualUncompressedSize);
 				} else {
-					LOG("Failed to inflate chunk %i for model %llu.  Error: %i", chunkCount, model.id, err);
+					Game::logger->Log("BrickByBrickFix", "Failed to inflate chunk %i for model %llu.  Error: %i", chunkCount, modelId, err);
 					break;
 				}
 				chunkCount++;
 			}
 			std::unique_ptr<tinyxml2::XMLDocument> document = std::make_unique<tinyxml2::XMLDocument>();
 			if (!document) {
-				LOG("Failed to initialize tinyxml document.  Aborting.");
+				Game::logger->Log("BrickByBrickFix", "Failed to initialize tinyxml document.  Aborting.");
 				return 0;
 			}
 
@@ -70,20 +75,28 @@ uint32_t BrickByBrickFix::TruncateBrokenBrickByBrickXml() {
 					"</LXFML>",
 					completeUncompressedModel.length() >= 15 ? completeUncompressedModel.length() - 15 : 0) == std::string::npos
 					) {
-					LOG("Brick-by-brick model %llu will be deleted!", model.id);
-					Database::Get()->DeleteUgcModelData(model.id);
+					Game::logger->Log("BrickByBrickFix",
+						"Brick-by-brick model %llu will be deleted!", modelId);
+					ugcModelToDelete->setInt64(1, modelsToTruncate->getInt64(1));
+					pcModelToDelete->setInt64(1, modelsToTruncate->getInt64(1));
+					ugcModelToDelete->execute();
+					pcModelToDelete->execute();
 					modelsTruncated++;
 				}
 			}
 		} else {
-			LOG("Brick-by-brick model %llu will be deleted!", model.id);
-			Database::Get()->DeleteUgcModelData(model.id);
+			Game::logger->Log("BrickByBrickFix",
+				"Brick-by-brick model %llu will be deleted!", modelId);
+			ugcModelToDelete->setInt64(1, modelsToTruncate->getInt64(1));
+			pcModelToDelete->setInt64(1, modelsToTruncate->getInt64(1));
+			ugcModelToDelete->execute();
+			pcModelToDelete->execute();
 			modelsTruncated++;
 		}
 	}
 
-	Database::Get()->Commit();
-	Database::Get()->SetAutoCommit(previousCommitValue);
+	Database::Commit();
+	Database::SetAutoCommit(previousCommitValue);
 	return modelsTruncated;
 }
 
@@ -95,17 +108,21 @@ uint32_t BrickByBrickFix::TruncateBrokenBrickByBrickXml() {
  */
 uint32_t BrickByBrickFix::UpdateBrickByBrickModelsToSd0() {
 	uint32_t updatedModels = 0;
-	auto modelsToUpdate = Database::Get()->GetAllUgcModels();
-	auto previousAutoCommitState = Database::Get()->GetAutoCommit();
-	Database::Get()->SetAutoCommit(false);
-	for (auto& model : modelsToUpdate) {
+	auto modelsToUpdate = GetModelsFromDatabase();
+	auto previousAutoCommitState = Database::GetAutoCommit();
+	Database::SetAutoCommit(false);
+	std::unique_ptr<sql::PreparedStatement> insertionStatement(Database::CreatePreppedStmt("UPDATE ugc SET lxfml = ? WHERE id = ?;"));
+	while (modelsToUpdate->next()) {
+		int64_t modelId = modelsToUpdate->getInt64(1);
+		std::unique_ptr<sql::Blob> oldLxfml(modelsToUpdate->getBlob(2));
 		// Check if the stored blob starts with zlib magic (0x78 0xDA - best compression of zlib)
 		// If it does, convert it to sd0.
-		if (model.lxfmlData.get() == 0x78 && model.lxfmlData.get() == 0xDA) {
+		if (oldLxfml->get() == 0x78 && oldLxfml->get() == 0xDA) {
+
 			// Get and save size of zlib compressed chunk.
-			model.lxfmlData.seekg(0, std::ios::end);
-			uint32_t oldLxfmlSize = static_cast<uint32_t>(model.lxfmlData.tellg());
-			model.lxfmlData.seekg(0);
+			oldLxfml->seekg(0, std::ios::end);
+			uint32_t oldLxfmlSize = static_cast<uint32_t>(oldLxfml->tellg());
+			oldLxfml->seekg(0);
 
 			// Allocate 9 extra bytes.  5 for sd0 magic, 4 for the only zlib compressed size.
 			uint32_t oldLxfmlSizeWithHeader = oldLxfmlSize + 9;
@@ -113,27 +130,36 @@ uint32_t BrickByBrickFix::UpdateBrickByBrickModelsToSd0() {
 
 			WriteSd0Magic(sd0ConvertedModel.get(), oldLxfmlSize);
 			for (uint32_t i = 9; i < oldLxfmlSizeWithHeader; i++) {
-				sd0ConvertedModel.get()[i] = model.lxfmlData.get();
+				sd0ConvertedModel.get()[i] = oldLxfml->get();
 			}
 
 			std::string outputString(sd0ConvertedModel.get(), oldLxfmlSizeWithHeader);
 			std::istringstream outputStringStream(outputString);
 
+			insertionStatement->setBlob(1, static_cast<std::istream*>(&outputStringStream));
+			insertionStatement->setInt64(2, modelId);
 			try {
-				Database::Get()->UpdateUgcModelData(model.id, outputStringStream);
-				LOG("Updated model %i to sd0", model.id);
+				insertionStatement->executeUpdate();
+				Game::logger->Log("BrickByBrickFix", "Updated model %i to sd0", modelId);
 				updatedModels++;
 			} catch (sql::SQLException exception) {
-				LOG("Failed to update model %i.  This model should be inspected manually to see why."
-					"The database error is %s", model.id, exception.what());
+				Game::logger->Log(
+					"BrickByBrickFix",
+					"Failed to update model %i.  This model should be inspected manually to see why."
+					"The database error is %s", modelId, exception.what());
 			}
 		}
 	}
-	Database::Get()->Commit();
-	Database::Get()->SetAutoCommit(previousAutoCommitState);
+	Database::Commit();
+	Database::SetAutoCommit(previousAutoCommitState);
 	return updatedModels;
 }
 
+std::unique_ptr<sql::ResultSet> GetModelsFromDatabase() {
+	std::unique_ptr<sql::PreparedStatement> modelsRawDataQuery(Database::CreatePreppedStmt("SELECT id, lxfml FROM ugc;"));
+	return std::unique_ptr<sql::ResultSet>(modelsRawDataQuery->executeQuery());
+}
+
 /**
  * @brief Writes sd0 magic at the front of a char*
  *
@@ -149,6 +175,6 @@ void WriteSd0Magic(char* input, uint32_t chunkSize) {
 	*reinterpret_cast<uint32_t*>(input + 5) = chunkSize; // Write the integer to the character array
 }
 
-bool CheckSd0Magic(std::istream& streamToCheck) {
-	return streamToCheck.get() == 's' && streamToCheck.get() == 'd' && streamToCheck.get() == '0' && streamToCheck.get() == 0x01 && streamToCheck.get() == 0xFF;
+bool CheckSd0Magic(sql::Blob* streamToCheck) {
+	return streamToCheck->get() == 's' && streamToCheck->get() == 'd' && streamToCheck->get() == '0' && streamToCheck->get() == 0x01 && streamToCheck->get() == 0xFF;
 }

dCommon/CMakeLists.txt

@@ -4,8 +4,7 @@ set(DCOMMON_SOURCES
 		"BinaryIO.cpp"
 		"dConfig.cpp"
 		"Diagnostics.cpp"
-		"Logger.cpp"
-		"Game.cpp"
+		"dLogger.cpp"
 		"GeneralUtils.cpp"
 		"LDFFormat.cpp"
 		"MD5.cpp"
@@ -13,7 +12,7 @@ set(DCOMMON_SOURCES
 		"NiPoint3.cpp"
 		"NiQuaternion.cpp"
 		"SHA512.cpp"
-		"Demangler.cpp"
+		"Type.cpp"
 		"ZCompression.cpp"
 		"BrickByBrickFix.cpp"
 		"BinaryPathFinder.cpp"

dCommon/Demangler.cpp

@@ -1,29 +0,0 @@
-#include "Demangler.h"
-#ifdef __GNUG__
-#include <cstdlib>
-#include <cxxabi.h>
-#include <memory>
-#include <typeinfo>
-
-std::string Demangler::Demangle(const char* name) {
-	// some arbitrary value to eliminate the compiler warning
-	// -4 is not a valid return value for __cxa_demangle so we'll use that.
-	int status = -4;
-
-	// __cxa_demangle requires that we free the returned char*
-	std::unique_ptr<char, void (*)(void*)> res{
-		abi::__cxa_demangle(name, NULL, NULL, &status),
-		std::free
-	};
-
-	return (status == 0) ? res.get() : "";
-}
-
-#else // __GNUG__
-
-// does nothing if not g++
-std::string Demangler::Demangle(const char* name) {
-	return name;
-}
-
-#endif // __GNUG__

dCommon/Demangler.h

@@ -1,9 +0,0 @@
-#pragma once
-
-#include <string>
-
-namespace Demangler {
-	// Given a char* containing a mangled name, return a std::string containing the demangled name.
-	// If the function fails for any reason, it returns an empty string.
-	std::string Demangle(const char* name);
-}

dCommon/Diagnostics.cpp

@@ -1,6 +1,6 @@
 #include "Diagnostics.h"
 #include "Game.h"
-#include "Logger.h"
+#include "dLogger.h"
 
 // If we're on Win32, we'll include our minidump writer
 #ifdef _WIN32
@@ -9,7 +9,7 @@
 #include <Dbghelp.h>
 
 #include "Game.h"
-#include "Logger.h"
+#include "dLogger.h"
 
 void make_minidump(EXCEPTION_POINTERS* e) {
 	auto hDbgHelp = LoadLibraryA("dbghelp");
@@ -28,7 +28,7 @@ void make_minidump(EXCEPTION_POINTERS* e) {
 			"_%4d%02d%02d_%02d%02d%02d.dmp",
 			t.wYear, t.wMonth, t.wDay, t.wHour, t.wMinute, t.wSecond);
 	}
-	LOG("Creating crash dump %s", name);
+	Game::logger->Log("Diagnostics", "Creating crash dump %s", name);
 	auto hFile = CreateFileA(name, GENERIC_WRITE, FILE_SHARE_READ, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
 	if (hFile == INVALID_HANDLE_VALUE)
 		return;
@@ -71,7 +71,7 @@ LONG CALLBACK unhandled_handler(EXCEPTION_POINTERS* e) {
 #include <cstring>
 #include <exception>
 
-#if defined(INCLUDE_BACKTRACE)
+#if defined(__include_backtrace__)
 #include <backtrace.h>
 
 #include <backtrace-supported.h>
@@ -83,7 +83,7 @@ struct bt_ctx {
 
 static inline void Bt(struct backtrace_state* state) {
 	std::string fileName = Diagnostics::GetOutDirectory() + "crash_" + Diagnostics::GetProcessName() + "_" + std::to_string(getpid()) + ".log";
-	LOG("backtrace is enabled, crash dump located at %s", fileName.c_str());
+	Game::logger->Log("Diagnostics", "backtrace is enabled, crash dump located at %s", fileName.c_str());
 	FILE* file = fopen(fileName.c_str(), "w+");
 	if (file != nullptr) {
 		backtrace_print(state, 2, file);
@@ -107,7 +107,7 @@ static void ErrorCallback(void* data, const char* msg, int errnum) {
 }
 #endif
 
-#include "Demangler.h"
+#include "Type.h"
 
 void GenerateDump() {
 	std::string cmd = "sudo gcore " + std::to_string(getpid());
@@ -115,66 +115,58 @@ void GenerateDump() {
 }
 
 void CatchUnhandled(int sig) {
-	std::exception_ptr eptr = std::current_exception();
-	try {
-		if (eptr) std::rethrow_exception(eptr);
-	} catch(const std::exception& e) {
-		LOG("Caught exception: '%s'", e.what());
-	}
-
-#ifndef INCLUDE_BACKTRACE
+#ifndef __include_backtrace__
 
 	std::string fileName = Diagnostics::GetOutDirectory() + "crash_" + Diagnostics::GetProcessName() + "_" + std::to_string(getpid()) + ".log";
-	LOG("Encountered signal %i, creating crash dump %s", sig, fileName.c_str());
+	Game::logger->Log("Diagnostics", "Encountered signal %i, creating crash dump %s", sig, fileName.c_str());
 	if (Diagnostics::GetProduceMemoryDump()) {
 		GenerateDump();
 	}
-	constexpr uint8_t MaxStackTrace = 32;
-	void* array[MaxStackTrace];
+
+	void* array[10];
 	size_t size;
 
 	// get void*'s for all entries on the stack
-	size = backtrace(array, MaxStackTrace);
+	size = backtrace(array, 10);
 
-#  if defined(__GNUG__)
+#if defined(__GNUG__) and defined(__dynamic)
 
 	// Loop through the returned addresses, and get the symbols to be demangled
 	char** strings = backtrace_symbols(array, size);
 
-	FILE* file = fopen(fileName.c_str(), "w+");
-	if (file != NULL) {
-		fprintf(file, "Error: signal %d:\n", sig);
-	}
 	// Print the stack trace
 	for (size_t i = 0; i < size; i++) {
-		// Take a string like './WorldServer(_ZN19SlashCommandHandler17HandleChatCommandERKSbIDsSt11char_traitsIDsESaIDsEEP6EntityRK13SystemAddress+0x6187) [0x55869c44ecf7]'
-		// and extract '_ZN19SlashCommandHandler17HandleChatCommandERKSbIDsSt11char_traitsIDsESaIDsEEP6EntityRK13SystemAddress' from it to be demangled into a proper name
+		// Take a string like './WorldServer(_ZN19SlashCommandHandler17HandleChatCommandERKSbIDsSt11char_traitsIDsESaIDsEEP6EntityRK13SystemAddress+0x6187) [0x55869c44ecf7]' and extract the function name
 		std::string functionName = strings[i];
 		std::string::size_type start = functionName.find('(');
 		std::string::size_type end = functionName.find('+');
 		if (start != std::string::npos && end != std::string::npos) {
 			std::string demangled = functionName.substr(start + 1, end - start - 1);
 
-			demangled = Demangler::Demangle(demangled.c_str());
+			demangled = demangle(functionName.c_str());
 
-			// If the demangled string is not empty, then we can replace the mangled string with the demangled one
-			if (!demangled.empty()) {
-				demangled.push_back('(');
-				demangled += functionName.substr(end);
-				functionName = demangled;
+			if (demangled.empty()) {
+				Game::logger->Log("Diagnostics", "[%02zu] %s", i, demangled.c_str());
+			} else {
+				Game::logger->Log("Diagnostics", "[%02zu] %s", i, functionName.c_str());
 			}
-		}
-
-		LOG("[%02zu] %s", i, functionName.c_str());
-		if (file != NULL) {
-			fprintf(file, "[%02zu] %s\n", i, functionName.c_str());
+		} else {
+			Game::logger->Log("Diagnostics", "[%02zu] %s", i, functionName.c_str());
 		}
 	}
-#  else // defined(__GNUG__)
+#else
 	backtrace_symbols_fd(array, size, STDOUT_FILENO);
-#  endif // defined(__GNUG__)
+#endif
 
-#else // INCLUDE_BACKTRACE
+	FILE* file = fopen(fileName.c_str(), "w+");
+	if (file != NULL) {
+		// print out all the frames to stderr
+		fprintf(file, "Error: signal %d:\n", sig);
+		backtrace_symbols_fd(array, size, fileno(file));
+		fclose(file);
+	}
+
+#else
 
 	struct backtrace_state* state = backtrace_create_state(
 		Diagnostics::GetProcessFileName().c_str(),
@@ -185,7 +177,7 @@ void CatchUnhandled(int sig) {
 	struct bt_ctx ctx = { state, 0 };
 	Bt(state);
 
-#endif // INCLUDE_BACKTRACE
+#endif
 
 	exit(EXIT_FAILURE);
 }
@@ -204,10 +196,10 @@ void MakeBacktrace() {
 	sigact.sa_sigaction = CritErrHdlr;
 	sigact.sa_flags = SA_RESTART | SA_SIGINFO;
 
-	if (sigaction(SIGSEGV, &sigact, nullptr) != 0 ||
-		sigaction(SIGFPE, &sigact, nullptr) != 0 ||
-		sigaction(SIGABRT, &sigact, nullptr) != 0 ||
-		sigaction(SIGILL, &sigact, nullptr) != 0) {
+	if (sigaction(SIGSEGV, &sigact, (struct sigaction*)nullptr) != 0 ||
+		sigaction(SIGFPE, &sigact, (struct sigaction*)nullptr) != 0 ||
+		sigaction(SIGABRT, &sigact, (struct sigaction*)nullptr) != 0 ||
+		sigaction(SIGILL, &sigact, (struct sigaction*)nullptr) != 0) {
 		fprintf(stderr, "error setting signal handler for %d (%s)\n",
 			SIGSEGV,
 			strsignal(SIGSEGV));

dCommon/FdbToSqlite.cpp

@@ -9,7 +9,7 @@
 #include "CDClientDatabase.h"
 #include "GeneralUtils.h"
 #include "Game.h"
-#include "Logger.h"
+#include "dLogger.h"
 #include "AssetManager.h"
 
 #include "eSqliteDataType.h"
@@ -28,21 +28,23 @@ FdbToSqlite::Convert::Convert(std::string binaryOutPath) {
 	this->m_BinaryOutPath = binaryOutPath;
 }
 
-bool FdbToSqlite::Convert::ConvertDatabase(AssetStream& buffer) {
+bool FdbToSqlite::Convert::ConvertDatabase(AssetMemoryBuffer& buffer) {
 	if (m_ConversionStarted) return false;
 
+	std::istream cdClientBuffer(&buffer);
+
 	this->m_ConversionStarted = true;
 	try {
 		CDClientDatabase::Connect(m_BinaryOutPath + "/CDServer.sqlite");
 
 		CDClientDatabase::ExecuteQuery("BEGIN TRANSACTION;");
 
-		int32_t numberOfTables = ReadInt32(buffer);
-		ReadTables(numberOfTables, buffer);
+		int32_t numberOfTables = ReadInt32(cdClientBuffer);
+		ReadTables(numberOfTables, cdClientBuffer);
 
 		CDClientDatabase::ExecuteQuery("COMMIT;");
 	} catch (CppSQLite3Exception& e) {
-		LOG("Encountered error %s converting FDB to SQLite", e.errorMessage());
+		Game::logger->Log("FdbToSqlite", "Encountered error %s converting FDB to SQLite", e.errorMessage());
 		return false;
 	}
 

dCommon/FdbToSqlite.h

@@ -7,7 +7,7 @@
 #include <iosfwd>
 #include <map>
 
-#include "AssetManager.h"
+class AssetMemoryBuffer;
 
 enum class eSqliteDataType : int32_t;
 
@@ -27,7 +27,7 @@ namespace FdbToSqlite {
 		 * 
 		 * @return true if the database was converted properly, false otherwise. 
 		 */
-		bool ConvertDatabase(AssetStream& buffer);
+		bool ConvertDatabase(AssetMemoryBuffer& buffer);
 
 		/**
 		 * @brief Reads a 32 bit int from the fdb file.

dCommon/Game.cpp

@@ -1,7 +0,0 @@
-#include "Game.h"
-
-namespace Game {
-	void OnSignal(int signal) {
-		lastSignal = signal;
-	}
-}

dCommon/Game.h

@@ -1,11 +1,9 @@
 #pragma once
 
-#include <string>
 #include <random>
-#include <csignal>
 
 class dServer;
-class Logger;
+class dLogger;
 class InstanceManager;
 class dChatFilter;
 class dConfig;
@@ -13,12 +11,9 @@ class RakPeerInterface;
 class AssetManager;
 struct SystemAddress;
 class EntityManager;
-class dZoneManager;
-class PlayerContainer;
 
 namespace Game {
-	using signal_t = volatile std::sig_atomic_t;
-	extern Logger* logger;
+	extern dLogger* logger;
 	extern dServer* server;
 	extern InstanceManager* im;
 	extern dChatFilter* chatFilter;
@@ -27,14 +22,6 @@ namespace Game {
 	extern RakPeerInterface* chatServer;
 	extern AssetManager* assetManager;
 	extern SystemAddress chatSysAddr;
-	extern signal_t lastSignal;
+	extern bool shouldShutdown;
 	extern EntityManager* entityManager;
-	extern dZoneManager* zoneManager;
-	extern PlayerContainer playerContainer;
-	extern std::string projectVersion;
-
-	inline bool ShouldShutdown() {
-		return lastSignal != 0;
-	}
-	void OnSignal(int signal);
 }

dCommon/GeneralUtils.cpp

@@ -53,7 +53,7 @@ bool _IsSuffixChar(uint8_t c) {
 bool GeneralUtils::_NextUTF8Char(std::string_view& slice, uint32_t& out) {
 	size_t rem = slice.length();
 	if (slice.empty()) return false;
-	const uint8_t* bytes = reinterpret_cast<const uint8_t*>(&slice.front());
+	const uint8_t* bytes = (const uint8_t*)&slice.front();
 	if (rem > 0) {
 		uint8_t first = bytes[0];
 		if (first < 0x80) { // 1 byte character

dCommon/GeneralUtils.h

@@ -9,11 +9,11 @@
 #include <functional>
 #include <type_traits>
 #include <stdexcept>
-#include "BitStream.h"
+#include <BitStream.h>
 #include "NiPoint3.h"
 
 #include "Game.h"
-#include "Logger.h"
+#include "dLogger.h"
 
 enum eInventoryType : uint32_t;
 enum class eObjectBits : size_t;
@@ -111,6 +111,29 @@ namespace GeneralUtils {
 	 */
 	bool CheckBit(int64_t value, uint32_t index);
 
+	// MARK: Random Number Generation
+
+	//! Generates a random number
+	/*!
+	  \param min The minimum the generate from
+	  \param max The maximum to generate to
+	 */
+	template <typename T>
+	inline T GenerateRandomNumber(std::size_t min, std::size_t max) {
+		// Make sure it is a numeric type
+		static_assert(std::is_arithmetic<T>::value, "Not an arithmetic type");
+
+		if constexpr (std::is_integral_v<T>) {  // constexpr only necessary on first statement
+			std::uniform_int_distribution<T> distribution(min, max);
+			return distribution(Game::randomEngine);
+		} else if (std::is_floating_point_v<T>) {
+			std::uniform_real_distribution<T> distribution(min, max);
+			return distribution(Game::randomEngine);
+		}
+
+		return T();
+	}
+
 	bool ReplaceInString(std::string& str, const std::string& from, const std::string& to);
 
 	std::u16string ReadWString(RakNet::BitStream* inStream);
@@ -126,11 +149,6 @@ namespace GeneralUtils {
 	template <typename T>
 	T Parse(const char* value);
 
-	template <>
-	inline bool Parse(const char* value) {
-		return std::stoi(value);
-	}
-
 	template <>
 	inline int32_t Parse(const char* value) {
 		return std::stoi(value);
@@ -151,11 +169,6 @@ namespace GeneralUtils {
 		return std::stod(value);
 	}
 
-	template <>
-	inline uint16_t Parse(const char* value) {
-		return std::stoul(value);
-	}
-
 	template <>
 	inline uint32_t Parse(const char* value) {
 		return std::stoul(value);
@@ -210,54 +223,4 @@ namespace GeneralUtils {
 		std::hash<T> h;
 		s ^= h(v) + 0x9e3779b9 + (s << 6) + (s >> 2);
 	}
-
-	// MARK: Random Number Generation
-
-	//! Generates a random number
-	/*!
-	  \param min The minimum the generate from
-	  \param max The maximum to generate to
-	 */
-	template <typename T>
-	inline T GenerateRandomNumber(std::size_t min, std::size_t max) {
-		// Make sure it is a numeric type
-		static_assert(std::is_arithmetic<T>::value, "Not an arithmetic type");
-
-		if constexpr (std::is_integral_v<T>) {  // constexpr only necessary on first statement
-			std::uniform_int_distribution<T> distribution(min, max);
-			return distribution(Game::randomEngine);
-		} else if (std::is_floating_point_v<T>) {
-			std::uniform_real_distribution<T> distribution(min, max);
-			return distribution(Game::randomEngine);
-		}
-
-		return T();
-	}
-
-	/**
-	 * Casts the value of an enum entry to its underlying type
-	 * @param entry Enum entry to cast
-	 * @returns The enum entry's value in its underlying type
-	*/
-	template <typename eType>
-	inline constexpr typename std::underlying_type_t<eType> CastUnderlyingType(const eType entry) {
-		static_assert(std::is_enum_v<eType>, "Not an enum");
-
-		return static_cast<typename std::underlying_type_t<eType>>(entry);
-	}
-
-	// on Windows we need to undef these or else they conflict with our numeric limits calls
-	// DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS
-	#ifdef _WIN32
-	#undef min
-	#undef max
-	#endif
-
-	template <typename T>
-	inline T GenerateRandomNumber() {
-		// Make sure it is a numeric type
-		static_assert(std::is_arithmetic<T>::value, "Not an arithmetic type");
-
-		return GenerateRandomNumber<T>(std::numeric_limits<T>::min(), std::numeric_limits<T>::max());
-	}
 }

dCommon/LDFFormat.cpp

@@ -4,7 +4,7 @@
 #include "GeneralUtils.h"
 
 #include "Game.h"
-#include "Logger.h"
+#include "dLogger.h"
 
 // C++
 #include <string_view>
@@ -48,7 +48,7 @@ LDFBaseData* LDFBaseData::DataFromString(const std::string_view& format) {
 	try {
 		type = static_cast<eLDFType>(strtol(ldfTypeAndValue.first.data(), &storage, 10));
 	} catch (std::exception) {
-		LOG("Attempted to process invalid ldf type (%s) from string (%s)", ldfTypeAndValue.first.data(), format.data());
+		Game::logger->Log("LDFFormat", "Attempted to process invalid ldf type (%s) from string (%s)", ldfTypeAndValue.first.data(), format.data());
 		return nullptr;
 	}
 
@@ -61,33 +61,35 @@ LDFBaseData* LDFBaseData::DataFromString(const std::string_view& format) {
 	}
 
 	case LDF_TYPE_S32: {
-		int32_t data;
-		if (!GeneralUtils::TryParse(ldfTypeAndValue.second.data(), data)) {
-			LOG("Warning: Attempted to process invalid int32 value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+		try {
+			int32_t data = static_cast<int32_t>(strtoul(ldfTypeAndValue.second.data(), &storage, 10));
+			returnValue = new LDFData<int32_t>(key, data);
+		} catch (std::exception) {
+			Game::logger->Log("LDFFormat", "Warning: Attempted to process invalid int32 value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
 			return nullptr;
 		}
-		returnValue = new LDFData<int32_t>(key, data);
-
 		break;
 	}
 
 	case LDF_TYPE_FLOAT: {
-		float data;
-		if (!GeneralUtils::TryParse(ldfTypeAndValue.second.data(), data)) {
-			LOG("Warning: Attempted to process invalid float value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+		try {
+			float data = strtof(ldfTypeAndValue.second.data(), &storage);
+			returnValue = new LDFData<float>(key, data);
+		} catch (std::exception) {
+			Game::logger->Log("LDFFormat", "Warning: Attempted to process invalid float value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
 			return nullptr;
 		}
-		returnValue = new LDFData<float>(key, data);
 		break;
 	}
 
 	case LDF_TYPE_DOUBLE: {
-		double data;
-		if (!GeneralUtils::TryParse(ldfTypeAndValue.second.data(), data)) {
-			LOG("Warning: Attempted to process invalid double value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+		try {
+			double data = strtod(ldfTypeAndValue.second.data(), &storage);
+			returnValue = new LDFData<double>(key, data);
+		} catch (std::exception) {
+			Game::logger->Log("LDFFormat", "Warning: Attempted to process invalid double value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
 			return nullptr;
 		}
-		returnValue = new LDFData<double>(key, data);
 		break;
 	}
 
@@ -100,8 +102,10 @@ LDFBaseData* LDFBaseData::DataFromString(const std::string_view& format) {
 		} else if (ldfTypeAndValue.second == "false") {
 			data = 0;
 		} else {
-			if (!GeneralUtils::TryParse(ldfTypeAndValue.second.data(), data)) {
-				LOG("Warning: Attempted to process invalid uint32 value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+			try {
+				data = static_cast<uint32_t>(strtoul(ldfTypeAndValue.second.data(), &storage, 10));
+			} catch (std::exception) {
+				Game::logger->Log("LDFFormat", "Warning: Attempted to process invalid uint32 value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
 				return nullptr;
 			}
 		}
@@ -118,8 +122,10 @@ LDFBaseData* LDFBaseData::DataFromString(const std::string_view& format) {
 		} else if (ldfTypeAndValue.second == "false") {
 			data = false;
 		} else {
-			if (!GeneralUtils::TryParse(ldfTypeAndValue.second.data(), data)) {
-				LOG("Warning: Attempted to process invalid bool value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+			try {
+				data = static_cast<bool>(strtol(ldfTypeAndValue.second.data(), &storage, 10));
+			} catch (std::exception) {
+				Game::logger->Log("LDFFormat", "Warning: Attempted to process invalid bool value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
 				return nullptr;
 			}
 		}
@@ -129,22 +135,24 @@ LDFBaseData* LDFBaseData::DataFromString(const std::string_view& format) {
 	}
 
 	case LDF_TYPE_U64: {
-		uint64_t data;
-		if (!GeneralUtils::TryParse(ldfTypeAndValue.second.data(), data)) {
-			LOG("Warning: Attempted to process invalid uint64 value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+		try {
+			uint64_t data = static_cast<uint64_t>(strtoull(ldfTypeAndValue.second.data(), &storage, 10));
+			returnValue = new LDFData<uint64_t>(key, data);
+		} catch (std::exception) {
+			Game::logger->Log("LDFFormat", "Warning: Attempted to process invalid uint64 value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
 			return nullptr;
 		}
-		returnValue = new LDFData<uint64_t>(key, data);
 		break;
 	}
 
 	case LDF_TYPE_OBJID: {
-		LWOOBJID data;
-		if (!GeneralUtils::TryParse(ldfTypeAndValue.second.data(), data)) {
-			LOG("Warning: Attempted to process invalid LWOOBJID value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+		try {
+			LWOOBJID data = static_cast<LWOOBJID>(strtoll(ldfTypeAndValue.second.data(), &storage, 10));
+			returnValue = new LDFData<LWOOBJID>(key, data);
+		} catch (std::exception) {
+			Game::logger->Log("LDFFormat", "Warning: Attempted to process invalid LWOOBJID value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
 			return nullptr;
 		}
-		returnValue = new LDFData<LWOOBJID>(key, data);
 		break;
 	}
 
@@ -155,12 +163,12 @@ LDFBaseData* LDFBaseData::DataFromString(const std::string_view& format) {
 	}
 
 	case LDF_TYPE_UNKNOWN: {
-		LOG("Warning: Attempted to process invalid unknown value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+		Game::logger->Log("LDFFormat", "Warning: Attempted to process invalid unknown value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
 		break;
 	}
 
 	default: {
-		LOG("Warning: Attempted to process invalid LDF type (%d) from string (%s)", type, format.data());
+		Game::logger->Log("LDFFormat", "Warning: Attempted to process invalid LDF type (%d) from string (%s)", type, format.data());
 		break;
 	}
 	}

dCommon/LDFFormat.h

@@ -63,15 +63,15 @@ private:
 
 	//! Writes the key to the packet
 	void WriteKey(RakNet::BitStream* packet) {
-		packet->Write<uint8_t>(this->key.length() * sizeof(uint16_t));
+		packet->Write(static_cast<uint8_t>(this->key.length() * sizeof(uint16_t)));
 		for (uint32_t i = 0; i < this->key.length(); ++i) {
-			packet->Write<uint16_t>(this->key[i]);
+			packet->Write(static_cast<uint16_t>(this->key[i]));
 		}
 	}
 
 	//! Writes the value to the packet
 	void WriteValue(RakNet::BitStream* packet) {
-		packet->Write<uint8_t>(this->GetValueType());
+		packet->Write(static_cast<uint8_t>(this->GetValueType()));
 		packet->Write(this->value);
 	}
 
@@ -179,30 +179,30 @@ template<> inline eLDFType LDFData<std::string>::GetValueType(void) { return LDF
 // The specialized version for std::u16string (UTF-16)
 template<>
 inline void LDFData<std::u16string>::WriteValue(RakNet::BitStream* packet) {
-	packet->Write<uint8_t>(this->GetValueType());
+	packet->Write(static_cast<uint8_t>(this->GetValueType()));
 
-	packet->Write<uint32_t>(this->value.length());
+	packet->Write(static_cast<uint32_t>(this->value.length()));
 	for (uint32_t i = 0; i < this->value.length(); ++i) {
-		packet->Write<uint16_t>(this->value[i]);
+		packet->Write(static_cast<uint16_t>(this->value[i]));
 	}
 }
 
 // The specialized version for bool
 template<>
 inline void LDFData<bool>::WriteValue(RakNet::BitStream* packet) {
-	packet->Write<uint8_t>(this->GetValueType());
+	packet->Write(static_cast<uint8_t>(this->GetValueType()));
 
-	packet->Write<uint8_t>(this->value);
+	packet->Write(static_cast<uint8_t>(this->value));
 }
 
 // The specialized version for std::string (UTF-8)
 template<>
 inline void LDFData<std::string>::WriteValue(RakNet::BitStream* packet) {
-	packet->Write<uint8_t>(this->GetValueType());
+	packet->Write(static_cast<uint8_t>(this->GetValueType()));
 
-	packet->Write<uint32_t>(this->value.length());
+	packet->Write(static_cast<uint32_t>(this->value.length()));
 	for (uint32_t i = 0; i < this->value.length(); ++i) {
-		packet->Write<uint8_t>(this->value[i]);
+		packet->Write(static_cast<uint8_t>(this->value[i]));
 	}
 }
 

dCommon/Logger.cpp

@@ -1,98 +0,0 @@
-#include "Logger.h"
-
-#include <algorithm>
-#include <ctime>
-#include <filesystem>
-#include <stdarg.h>
-
-Writer::~Writer() {
-	// Flush before we close
-	Flush();
-	// Dont try to close stdcout...
-	if (!m_Outfile || m_IsConsoleWriter) return;
-
-	fclose(m_Outfile);
-	m_Outfile = NULL;
-}
-
-void Writer::Log(const char* time, const char* message) {
-	if (!m_Outfile || !m_Enabled) return;
-
-	fputs(time, m_Outfile);
-	fputs(message, m_Outfile);
-}
-
-void Writer::Flush() {
-	if (!m_Outfile) return;
-	fflush(m_Outfile);
-}
-
-FileWriter::FileWriter(const char* outpath) {
-	m_Outfile = fopen(outpath, "wt");
-	if (!m_Outfile) printf("Couldn't open %s for writing!\n", outpath);
-	m_Outpath = outpath;
-	m_IsConsoleWriter = false;
-}
-
-ConsoleWriter::ConsoleWriter(bool enabled) {
-	m_Enabled = enabled;
-	m_Outfile = stdout;
-	m_IsConsoleWriter = true;
-}
-
-Logger::Logger(const std::string& outpath, bool logToConsole, bool logDebugStatements) {
-	m_logDebugStatements = logDebugStatements;
-	std::filesystem::path outpathPath(outpath);
-	if (!std::filesystem::exists(outpathPath.parent_path())) std::filesystem::create_directories(outpathPath.parent_path());
-	m_Writers.push_back(std::make_unique<FileWriter>(outpath));
-	m_Writers.push_back(std::make_unique<ConsoleWriter>(logToConsole));
-}
-
-void Logger::vLog(const char* format, va_list args) {
-	time_t t = time(NULL);
-	struct tm* time = localtime(&t);
-	char timeStr[70];
-	strftime(timeStr, sizeof(timeStr), "[%d-%m-%y %H:%M:%S ", time);
-	char message[2048];
-	vsnprintf(message, 2048, format, args);
-	for (const auto& writer : m_Writers) {
-		writer->Log(timeStr, message);
-	}
-}
-
-void Logger::Log(const char* className, const char* format, ...) {
-	va_list args;
-	std::string log = std::string(className) + "] " + std::string(format) + "\n";
-	va_start(args, format);
-	vLog(log.c_str(), args);
-	va_end(args);
-}
-
-void Logger::LogDebug(const char* className, const char* format, ...) {
-	if (!m_logDebugStatements) return;
-	va_list args;
-	std::string log = std::string(className) + "] " + std::string(format) + "\n";
-	va_start(args, format);
-	vLog(log.c_str(), args);
-	va_end(args);
-}
-
-void Logger::Flush() {
-	for (const auto& writer : m_Writers) {
-		writer->Flush();
-	}
-}
-
-void Logger::SetLogToConsole(bool logToConsole) {
-	for (const auto& writer : m_Writers) {
-		if (writer->IsConsoleWriter()) writer->SetEnabled(logToConsole);
-	}
-}
-
-bool Logger::GetLogToConsole() const {
-	bool toReturn = false;
-	for (const auto& writer : m_Writers) {
-		if (writer->IsConsoleWriter()) toReturn |= writer->GetEnabled();
-	}
-	return toReturn;
-}

dCommon/Logger.h

@@ -1,89 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#define STRINGIFY_IMPL(x) #x
-
-#define STRINGIFY(x) STRINGIFY_IMPL(x)
-
-#define GET_FILE_NAME(x, y) GetFileNameFromAbsolutePath(__FILE__ x y)
-
-#define FILENAME_AND_LINE GET_FILE_NAME(":", STRINGIFY(__LINE__))
-
-// Calculate the filename at compile time from the path.
-// We just do this by scanning the path for the last '/' or '\' character and returning the string after it.
-constexpr const char* GetFileNameFromAbsolutePath(const char* path) {
-    const char* file = path;
-    while (*path) {
-		char nextChar = *path++;
-        if (nextChar == '/' || nextChar == '\\') {
-            file = path;
-        }
-    }
-    return file;
-}
-
-// These have to have a constexpr variable to store the filename_and_line result in a local variable otherwise
-// they will not be valid constexpr and will be evaluated at runtime instead of compile time!
-// The full string is still stored in the binary, however the offset of the filename in the absolute paths
-// is used in the instruction instead of the start of the absolute path.
-#define LOG(message, ...) do { auto str = FILENAME_AND_LINE; Game::logger->Log(str, message, ##__VA_ARGS__); } while(0)
-#define LOG_DEBUG(message, ...) do { auto str = FILENAME_AND_LINE; Game::logger->LogDebug(str, message, ##__VA_ARGS__); } while(0)
-
-// Writer class for writing data to files.
-class Writer {
-public:
-	Writer(bool enabled = true) : m_Enabled(enabled) {};
-	virtual ~Writer();
-
-	virtual void Log(const char* time, const char* message);
-	virtual void Flush();
-
-	void SetEnabled(bool disabled) { m_Enabled = disabled; }
-	bool GetEnabled() const { return m_Enabled; }
-
-	bool IsConsoleWriter() { return m_IsConsoleWriter; }
-public:
-	bool m_Enabled = true;
-	bool m_IsConsoleWriter = false;
-	FILE* m_Outfile;
-};
-
-// FileWriter class for writing data to a file on a disk.
-class FileWriter : public Writer {
-public:
-	FileWriter(const char* outpath);
-	FileWriter(const std::string& outpath) : FileWriter(outpath.c_str()) {};
-private:
-	std::string m_Outpath;
-};
-
-// ConsoleWriter class for writing data to the console.
-class ConsoleWriter : public Writer {
-public:
-	ConsoleWriter(bool enabled);
-};
-
-class Logger {
-public:
-	Logger() = delete;
-	Logger(const std::string& outpath, bool logToConsole, bool logDebugStatements);
-
-	void Log(const char* filenameAndLine, const char* format, ...);
-	void LogDebug(const char* filenameAndLine, const char* format, ...);
-
-	void Flush();
-
-	bool GetLogToConsole() const;
-	void SetLogToConsole(bool logToConsole);
-
-	void SetLogDebugStatements(bool logDebugStatements) { m_logDebugStatements = logDebugStatements; }
-
-private:
-	void vLog(const char* format, va_list args);
-
-	bool m_logDebugStatements;
-	std::vector<std::unique_ptr<Writer>> m_Writers;
-};

dCommon/Metrics.cpp

@@ -107,7 +107,7 @@ void Metrics::EndMeasurement(MetricVariable variable) {
 }
 
 float Metrics::ToMiliseconds(int64_t nanoseconds) {
-	return static_cast<float>(nanoseconds) / 1e6;
+	return (float)nanoseconds / 1e6;
 }
 
 std::string Metrics::MetricVariableToString(MetricVariable variable) {
@@ -193,34 +193,34 @@ size_t Metrics::GetPeakRSS() {
 	/* Windows -------------------------------------------------- */
 	PROCESS_MEMORY_COUNTERS info;
 	GetProcessMemoryInfo(GetCurrentProcess(), &info, sizeof(info));
-	return static_cast<size_t>(info.PeakWorkingSetSize);
+	return (size_t)info.PeakWorkingSetSize;
 
 #elif (defined(_AIX) || defined(__TOS__AIX__)) || (defined(__sun__) || defined(__sun) || defined(sun) && (defined(__SVR4) || defined(__svr4__)))
 	/* AIX and Solaris ------------------------------------------ */
 	struct psinfo psinfo;
 	int fd = -1;
 	if ((fd = open("/proc/self/psinfo", O_RDONLY)) == -1)
-		return static_cast<size_t>(0L);      /* Can't open? */
+		return (size_t)0L;      /* Can't open? */
 	if (read(fd, &psinfo, sizeof(psinfo)) != sizeof(psinfo)) {
 		close(fd);
-		return static_cast<size_t>(0L);      /* Can't read? */
+		return (size_t)0L;      /* Can't read? */
 	}
 	close(fd);
-	return static_cast<size_t>(psinfo.pr_rssize * 1024L);
+	return (size_t)(psinfo.pr_rssize * 1024L);
 
 #elif defined(__unix__) || defined(__unix) || defined(unix) || (defined(__APPLE__) && defined(__MACH__))
 	/* BSD, Linux, and OSX -------------------------------------- */
 	struct rusage rusage;
 	getrusage(RUSAGE_SELF, &rusage);
 #if defined(__APPLE__) && defined(__MACH__)
-	return static_cast<size_t>(rusage.ru_maxrss);
+	return (size_t)rusage.ru_maxrss;
 #else
-	return static_cast<size_t>(rusage.ru_maxrss * 1024L);
+	return (size_t)(rusage.ru_maxrss * 1024L);
 #endif
 
 #else
 	/* Unknown OS ----------------------------------------------- */
-	return static_cast<size_t>(0L);          /* Unsupported. */
+	return (size_t)0L;          /* Unsupported. */
 #endif
 
 }
@@ -234,33 +234,33 @@ size_t Metrics::GetCurrentRSS() {
 	/* Windows -------------------------------------------------- */
 	PROCESS_MEMORY_COUNTERS info;
 	GetProcessMemoryInfo(GetCurrentProcess(), &info, sizeof(info));
-	return static_cast<size_t>(info.WorkingSetSize);
+	return (size_t)info.WorkingSetSize;
 
 #elif defined(__APPLE__) && defined(__MACH__)
 	/* OSX ------------------------------------------------------ */
 	struct mach_task_basic_info info;
 	mach_msg_type_number_t infoCount = MACH_TASK_BASIC_INFO_COUNT;
 	if (task_info(mach_task_self(), MACH_TASK_BASIC_INFO,
-		reinterpret_cast<task_info_t>(&info), &infoCount) != KERN_SUCCESS)
-		return static_cast<size_t>(0L);      /* Can't access? */
-	return static_cast<size_t>(info.resident_size);
+		(task_info_t)&info, &infoCount) != KERN_SUCCESS)
+		return (size_t)0L;      /* Can't access? */
+	return (size_t)info.resident_size;
 
 #elif defined(__linux__) || defined(__linux) || defined(linux) || defined(__gnu_linux__)
 	/* Linux ---------------------------------------------------- */
 	long rss = 0L;
 	FILE* fp = NULL;
 	if ((fp = fopen("/proc/self/statm", "r")) == NULL)
-		return static_cast<size_t>(0L);      /* Can't open? */
+		return (size_t)0L;      /* Can't open? */
 	if (fscanf(fp, "%*s%ld", &rss) != 1) {
 		fclose(fp);
-		return static_cast<size_t>(0L);      /* Can't read? */
+		return (size_t)0L;      /* Can't read? */
 	}
 	fclose(fp);
-	return static_cast<size_t>(rss) * static_cast<size_t>(sysconf(_SC_PAGESIZE));
+	return (size_t)rss * (size_t)sysconf(_SC_PAGESIZE);
 
 #else
 	/* AIX, BSD, Solaris, and Unknown OS ------------------------ */
-	return static_cast<size_t>(0L);          /* Unsupported. */
+	return (size_t)0L;          /* Unsupported. */
 #endif
 
 }

dCommon/NiPoint3.cpp

@@ -114,13 +114,13 @@ bool NiPoint3::operator!=(const NiPoint3& point) const {
 //! Operator for subscripting
 float& NiPoint3::operator[](int i) {
 	float* base = &x;
-	return base[i];
+	return (float&)base[i];
 }
 
 //! Operator for subscripting
 const float& NiPoint3::operator[](int i) const {
 	const float* base = &x;
-	return base[i];
+	return (float&)base[i];
 }
 
 //! Operator for addition of vectors
@@ -129,19 +129,10 @@ NiPoint3 NiPoint3::operator+(const NiPoint3& point) const {
 }
 
 //! Operator for addition of vectors
-NiPoint3& NiPoint3::operator+=(const NiPoint3& point) {
-	this->x += point.x;
-	this->y += point.y;
-	this->z += point.z;
-	return *this;
+NiPoint3 NiPoint3::operator+=(const NiPoint3& point) const {
+	return NiPoint3(this->x + point.x, this->y + point.y, this->z + point.z);
 }
 
-NiPoint3& NiPoint3::operator*=(const float scalar) {
-	this->x *= scalar;
-	this->y *= scalar;
-	this->z *= scalar;
-	return *this;
-}
 
 //! Operator for subtraction of vectors
 NiPoint3 NiPoint3::operator-(const NiPoint3& point) const {
@@ -181,7 +172,7 @@ bool NiPoint3::IsWithinAxisAlignedBox(const NiPoint3& minPoint, const NiPoint3&
 	if (this->y < minPoint.y) return false;
 	if (this->y > maxPoint.y) return false;
 
-	return (this->z < maxPoint.z && this->z > minPoint.z);
+	return (this->z < maxPoint.z&& this->z > minPoint.z);
 }
 
 //! Checks to see if the point (or vector) is within a sphere
@@ -232,21 +223,10 @@ NiPoint3 NiPoint3::MoveTowards(const NiPoint3& current, const NiPoint3& target,
 	float dx = target.x - current.x;
 	float dy = target.y - current.y;
 	float dz = target.z - current.z;
-
-	float lengthSquared = static_cast<float>(
-		static_cast<double>(dx) * static_cast<double>(dx) +
-		static_cast<double>(dy) * static_cast<double>(dy) +
-		static_cast<double>(dz) * static_cast<double>(dz)
-		);
-
-	if (static_cast<double>(lengthSquared) == 0.0
-		|| static_cast<double>(maxDistanceDelta) >= 0.0
-		&& static_cast<double>(lengthSquared)
-		<= static_cast<double>(maxDistanceDelta) * static_cast<double>(maxDistanceDelta)) {
+	float lengthSquared = (float)((double)dx * (double)dx + (double)dy * (double)dy + (double)dz * (double)dz);
+	if ((double)lengthSquared == 0.0 || (double)maxDistanceDelta >= 0.0 && (double)lengthSquared <= (double)maxDistanceDelta * (double)maxDistanceDelta)
 		return target;
-	}
-
-	float length = std::sqrt(lengthSquared);
+	float length = (float)std::sqrt((double)lengthSquared);
 	return NiPoint3(current.x + dx / length * maxDistanceDelta, current.y + dy / length * maxDistanceDelta, current.z + dz / length * maxDistanceDelta);
 }
 

dCommon/NiPoint3.h

@@ -136,9 +136,7 @@ public:
 	NiPoint3 operator+(const NiPoint3& point) const;
 
 	//! Operator for addition of vectors
-	NiPoint3& operator+=(const NiPoint3& point);
-
-	NiPoint3& operator*=(const float scalar);
+	NiPoint3 operator+=(const NiPoint3& point) const;
 
 	//! Operator for subtraction of vectors
 	NiPoint3 operator-(const NiPoint3& point) const;

dCommon/SHA512.cpp

@@ -1,5 +1,3 @@
-// Source: http://www.zedwood.com/article/cpp-sha512-function
-
 #include "SHA512.h"
 
 #include <cstring>

dCommon/Type.cpp

@@ -0,0 +1,27 @@
+#include "Type.h"
+#ifdef __GNUG__
+#include <cstdlib>
+#include <memory>
+#include <cxxabi.h>
+
+std::string demangle(const char* name) {
+
+	int status = -4; // some arbitrary value to eliminate the compiler warning
+
+	// enable c++11 by passing the flag -std=c++11 to g++
+	std::unique_ptr<char, void(*)(void*)> res{
+		abi::__cxa_demangle(name, NULL, NULL, &status),
+		std::free
+	};
+
+	return (status == 0) ? res.get() : name;
+}
+
+#else
+
+// does nothing if not g++
+std::string demangle(const char* name) {
+	return name;
+}
+
+#endif

dCommon/Type.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include <string>
+#include <typeinfo>
+
+std::string demangle(const char* name);
+
+template <class T>
+std::string type(const T& t) {
+
+	return demangle(typeid(t).name());
+}

dCommon/ZCompression.cpp

@@ -1,6 +1,6 @@
 #include "ZCompression.h"
 
-#include "zlib.h"
+#include <zlib.h>
 
 namespace ZCompression {
 	int32_t GetMaxCompressedLength(int32_t nLenSrc) {

dCommon/dClient/AssetManager.cpp

@@ -2,9 +2,9 @@
 
 #include "AssetManager.h"
 #include "Game.h"
-#include "Logger.h"
+#include "dLogger.h"
 
-#include "zlib.h"
+#include <zlib.h>
 
 AssetManager::AssetManager(const std::filesystem::path& path) {
 	if (!std::filesystem::is_directory(path)) {
@@ -81,8 +81,8 @@ bool AssetManager::HasFile(const char* name) {
 	std::replace(fixedName.begin(), fixedName.end(), '/', '\\');
 	if (fixedName.rfind("client\\res\\", 0) != 0) fixedName = "client\\res\\" + fixedName;
 
-	uint32_t crc = crc32b(0xFFFFFFFF, reinterpret_cast<uint8_t*>(const_cast<char*>(fixedName.c_str())), fixedName.size());
-	crc = crc32b(crc, reinterpret_cast<Bytef*>(const_cast<char*>("\0\0\0\0")), 4);
+	uint32_t crc = crc32b(0xFFFFFFFF, (uint8_t*)fixedName.c_str(), fixedName.size());
+	crc = crc32b(crc, (Bytef*)"\0\0\0\0", 4);
 
 	for (const auto& item : this->m_PackIndex->GetPackFileIndices()) {
 		if (item.m_Crc == crc) {
@@ -113,7 +113,7 @@ bool AssetManager::GetFile(const char* name, char** data, uint32_t* len) {
 #endif
 		fseek(file, 0, SEEK_END);
 		*len = ftell(file);
-		*data = static_cast<char*>(malloc(*len));
+		*data = (char*)malloc(*len);
 		fseek(file, 0, SEEK_SET);
 		int32_t readInData = fread(*data, sizeof(uint8_t), *len, file);
 		fclose(file);
@@ -129,8 +129,8 @@ bool AssetManager::GetFile(const char* name, char** data, uint32_t* len) {
 		fixedName = "client\\res\\" + fixedName;
 	}
 	int32_t packIndex = -1;
-	uint32_t crc = crc32b(0xFFFFFFFF, reinterpret_cast<uint8_t*>(const_cast<char*>(fixedName.c_str())), fixedName.size());
-	crc = crc32b(crc, reinterpret_cast<Bytef*>(const_cast<char*>("\0\0\0\0")), 4);
+	uint32_t crc = crc32b(0xFFFFFFFF, (uint8_t*)fixedName.c_str(), fixedName.size());
+	crc = crc32b(crc, (Bytef*)"\0\0\0\0", 4);
 
 	for (const auto& item : this->m_PackIndex->GetPackFileIndices()) {
 		if (item.m_Crc == crc) {
@@ -152,12 +152,13 @@ bool AssetManager::GetFile(const char* name, char** data, uint32_t* len) {
 	return success;
 }
 
-AssetStream AssetManager::GetFile(const char* name) {
-	char* buf; uint32_t len;
+AssetMemoryBuffer AssetManager::GetFileAsBuffer(const char* name) {
+	char* buf;
+	uint32_t len;
 
 	bool success = this->GetFile(name, &buf, &len);
 
-	return AssetStream(buf, len, success);
+	return AssetMemoryBuffer(buf, len, success);
 }
 
 uint32_t AssetManager::crc32b(uint32_t base, uint8_t* message, size_t l) {
@@ -167,7 +168,7 @@ uint32_t AssetManager::crc32b(uint32_t base, uint8_t* message, size_t l) {
 	crc = base;
 	for (i = 0; i < l; i++) {
 		// xor next byte to upper bits of crc
-		crc ^= (static_cast<unsigned int>(message[i]) << 24);
+		crc ^= (((unsigned int)message[i]) << 24);
 		for (j = 0; j < 8; j++) { // Do eight times.
 			msb = crc >> 31;
 			crc <<= 1;

dCommon/dClient/AssetManager.h

@@ -25,10 +25,6 @@ struct AssetMemoryBuffer : std::streambuf {
 		this->setg(base, base, base + n);
 	}
 
-	~AssetMemoryBuffer() {
-		if (m_Success) free(m_Base);
-	}
-
 	pos_type seekpos(pos_type sp, std::ios_base::openmode which) override {
 		return seekoff(sp - pos_type(off_type(0)), std::ios_base::beg, which);
 	}
@@ -44,17 +40,9 @@ struct AssetMemoryBuffer : std::streambuf {
 			setg(eback(), eback() + off, egptr());
 		return gptr() - eback();
 	}
-};
 
-struct AssetStream : std::istream {
-	AssetStream(char* base, std::ptrdiff_t n, bool success) : std::istream(new AssetMemoryBuffer(base, n, success)) {}
-
-	~AssetStream() {
-		delete rdbuf();
-	}
-
-	operator bool() {
-		return reinterpret_cast<AssetMemoryBuffer*>(rdbuf())->m_Success;
+	void close() {
+		delete m_Base;
 	}
 };
 
@@ -68,7 +56,7 @@ public:
 
 	bool HasFile(const char* name);
 	bool GetFile(const char* name, char** data, uint32_t* len);
-	AssetStream GetFile(const char* name);
+	AssetMemoryBuffer GetFileAsBuffer(const char* name);
 
 private:
 	void LoadPackIndex();

dCommon/dClient/Pack.cpp

@@ -76,7 +76,7 @@ bool Pack::ReadFileFromPack(uint32_t crc, char** data, uint32_t* len) {
 	fseek(file, pos, SEEK_SET);
 
 	if (!isCompressed) {
-		char* tempData = static_cast<char*>(malloc(pkRecord.m_UncompressedSize));
+		char* tempData = (char*)malloc(pkRecord.m_UncompressedSize);
 		int32_t readInData = fread(tempData, sizeof(uint8_t), pkRecord.m_UncompressedSize, file);
 
 		*data = tempData;
@@ -90,7 +90,7 @@ bool Pack::ReadFileFromPack(uint32_t crc, char** data, uint32_t* len) {
 
 	fseek(file, pos, SEEK_SET);
 
-	char* decompressedData = static_cast<char*>(malloc(pkRecord.m_UncompressedSize));
+	char* decompressedData = (char*)malloc(pkRecord.m_UncompressedSize);
 	uint32_t currentReadPos = 0;
 
 	while (true) {
@@ -100,12 +100,12 @@ bool Pack::ReadFileFromPack(uint32_t crc, char** data, uint32_t* len) {
 		int32_t readInData = fread(&size, sizeof(uint32_t), 1, file);
 		pos += 4; // Move pointer position 4 to the right
 
-		char* chunk = static_cast<char*>(malloc(size));
+		char* chunk = (char*)malloc(size);
 		int32_t readInData2 = fread(chunk, sizeof(int8_t), size, file);
 		pos += size; // Move pointer position the amount of bytes read to the right
 
 		int32_t err;
-		currentReadPos += ZCompression::Decompress(reinterpret_cast<uint8_t*>(chunk), size, reinterpret_cast<uint8_t*>(decompressedData + currentReadPos), ZCompression::MAX_SD0_CHUNK_SIZE, err);
+		currentReadPos += ZCompression::Decompress((uint8_t*)chunk, size, reinterpret_cast<uint8_t*>(decompressedData + currentReadPos), ZCompression::MAX_SD0_CHUNK_SIZE, err);
 
 		free(chunk);
 	}

dCommon/dClient/Pack.h

@@ -3,7 +3,6 @@
 #include <vector>
 #include <string>
 #include <filesystem>
-#include <fstream>
 
 #pragma pack(push, 1)
 struct PackRecord {

dCommon/dClient/PackIndex.cpp

@@ -1,17 +1,28 @@
 #include "PackIndex.h"
 #include "BinaryIO.h"
 #include "Game.h"
-#include "Logger.h"
+#include "dLogger.h"
 
 PackIndex::PackIndex(const std::filesystem::path& filePath) {
 	m_FileStream = std::ifstream(filePath / "versions" / "primary.pki", std::ios::in | std::ios::binary);
 
 	BinaryIO::BinaryRead<uint32_t>(m_FileStream, m_Version);
 	BinaryIO::BinaryRead<uint32_t>(m_FileStream, m_PackPathCount);
-	
-	m_PackPaths.resize(m_PackPathCount);
-	for (auto& item : m_PackPaths) {
-		BinaryIO::ReadString<uint32_t>(m_FileStream, item, BinaryIO::ReadType::String);
+
+	for (int i = 0; i < m_PackPathCount; i++) {
+		uint32_t stringLen = 0;
+		BinaryIO::BinaryRead<uint32_t>(m_FileStream, stringLen);
+
+		std::string path;
+
+		for (int j = 0; j < stringLen; j++) {
+			char inChar;
+			BinaryIO::BinaryRead<char>(m_FileStream, inChar);
+
+			path += inChar;
+		}
+
+		m_PackPaths.push_back(path);
 	}
 
 	BinaryIO::BinaryRead<uint32_t>(m_FileStream, m_PackFileIndexCount);
@@ -23,7 +34,7 @@ PackIndex::PackIndex(const std::filesystem::path& filePath) {
 		m_PackFileIndices.push_back(packFileIndex);
 	}
 
-	LOG("Loaded pack catalog with %i pack files and %i files", m_PackPaths.size(), m_PackFileIndices.size());
+	Game::logger->Log("PackIndex", "Loaded pack catalog with %i pack files and %i files", m_PackPaths.size(), m_PackFileIndices.size());
 
 	for (auto& item : m_PackPaths) {
 		std::replace(item.begin(), item.end(), '\\', '/');

dCommon/dConfig.cpp

@@ -10,23 +10,8 @@ dConfig::dConfig(const std::string& filepath) {
 	LoadConfig();
 }
 
-std::filesystem::path GetConfigDir() {
-	std::filesystem::path config_dir = BinaryPathFinder::GetBinaryDir();
-	if (const char* env_p = std::getenv("DLU_CONFIG_DIR")) {
-		config_dir /= env_p;
-	}
-	return config_dir;
-}
-
-const bool dConfig::Exists(const std::string& filepath) {
-	std::filesystem::path config_dir = GetConfigDir();
-	return std::filesystem::exists(config_dir / filepath);
-}
-
 void dConfig::LoadConfig() {
-	std::filesystem::path config_dir = GetConfigDir();
-
-	std::ifstream in(config_dir / m_ConfigFilePath);
+	std::ifstream in(BinaryPathFinder::GetBinaryDir() / m_ConfigFilePath);
 	if (!in.good()) return;
 
 	std::string line{};
@@ -34,7 +19,7 @@ void dConfig::LoadConfig() {
 		if (!line.empty() && line.front() != '#') ProcessLine(line);
 	}
 
-	std::ifstream sharedConfig(config_dir / "sharedconfig.ini", std::ios::in);
+	std::ifstream sharedConfig(BinaryPathFinder::GetBinaryDir() / "sharedconfig.ini", std::ios::in);
 	if (!sharedConfig.good()) return;
 
 	line.clear();
@@ -49,20 +34,17 @@ void dConfig::ReloadConfig() {
 }
 
 const std::string& dConfig::GetValue(std::string key) {
-	std::string upper_key(key);
-	std::transform(upper_key.begin(), upper_key.end(), upper_key.begin(), ::toupper);
-	if (const char* env_p = std::getenv(upper_key.c_str())) {
-		this->m_ConfigValues[key] = env_p;
-	}
 	return this->m_ConfigValues[key];
 }
 
 void dConfig::ProcessLine(const std::string& line) {
-	auto splitLoc = line.find('=');
-	auto key = line.substr(0, splitLoc);
-	auto value = line.substr(splitLoc + 1);
+	auto splitLine = GeneralUtils::SplitString(line, '=');
+
+	if (splitLine.size() != 2) return;
 
 	//Make sure that on Linux, we remove special characters:
+	auto& key = splitLine.at(0);
+	auto& value = splitLine.at(1);
 	if (!value.empty() && value.at(value.size() - 1) == '\r') value.erase(value.size() - 1);
 
 	if (this->m_ConfigValues.find(key) != this->m_ConfigValues.end()) return;

dCommon/dConfig.h

@@ -7,11 +7,6 @@ class dConfig {
 public:
 	dConfig(const std::string& filepath);
 
-	/**
-	 * Checks whether the specified filepath exists
-	 */
-	static const bool Exists(const std::string& filepath);
-
 	/**
 	 * Gets the specified key from the config.  Returns an empty string if the value is not found.
 	 *

dCommon/dEnums/StringifiedEnum.h

@@ -1,29 +0,0 @@
-#ifndef __STRINGIFIEDENUM_H__
-#define __STRINGIFIEDENUM_H__
-
-#include <string>
-#include "magic_enum.hpp"
-
-namespace StringifiedEnum {
-	template<typename T>
-	const std::string_view ToString(const T e) {
-		static_assert(std::is_enum_v<T>, "Not an enum"); // Check type
-
-		constexpr auto sv = &magic_enum::enum_entries<T>();
-
-		const auto it = std::lower_bound(
-			sv->begin(), sv->end(), e,
-			[&](const std::pair<T, std::string_view>& lhs, const T rhs) { return lhs.first < rhs; }
-		);
-
-		std::string_view output;
-		if (it != sv->end() && it->first == e) {
-			output = it->second;
-		} else {
-			output = "UNKNOWN";
-		}
-		return output;
-	}
-}
-
-#endif // !__STRINGIFIEDENUM_H__

dCommon/dEnums/dCommonVars.h

@@ -9,7 +9,6 @@
 #include "BitStream.h"
 #include "eConnectionType.h"
 #include "eClientMessageType.h"
-#include "BitStreamUtils.h"
 
 #pragma warning (disable:4251) //Disables SQL warnings
 
@@ -33,7 +32,7 @@ constexpr uint32_t lowFrameDelta = FRAMES_TO_MS(lowFramerate);
 #define CBITSTREAM RakNet::BitStream bitStream;
 #define CINSTREAM RakNet::BitStream inStream(packet->data, packet->length, false);
 #define CINSTREAM_SKIP_HEADER CINSTREAM if (inStream.GetNumberOfUnreadBits() >= BYTES_TO_BITS(HEADER_SIZE)) inStream.IgnoreBytes(HEADER_SIZE); else inStream.IgnoreBits(inStream.GetNumberOfUnreadBits());
-#define CMSGHEADER BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::GAME_MSG);
+#define CMSGHEADER PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::GAME_MSG);
 #define SEND_PACKET Game::server->Send(&bitStream, sysAddr, false);
 #define SEND_PACKET_BROADCAST Game::server->Send(&bitStream, UNASSIGNED_SYSTEM_ADDRESS, true);
 
@@ -148,11 +147,11 @@ public:
 		if (size > maxSize) size = maxSize;
 
 		for (uint32_t i = 0; i < size; ++i) {
-			bitStream.Write<uint16_t>(friendName[i]);
+			bitStream.Write(static_cast<uint16_t>(friendName[i]));
 		}
 
 		for (uint32_t j = 0; j < remSize; ++j) {
-			bitStream.Write<uint16_t>(0);
+			bitStream.Write(static_cast<uint16_t>(0));
 		}
 
 		bitStream.Write<uint32_t>(0); //???

dCommon/dEnums/ePermissionMap.h

@@ -27,6 +27,20 @@ enum class ePermissionMap : uint64_t {
 	 * The character has restricted chat access, bit 6.
 	 */
 	RestrictedChatAccess = 0x1 << 6,
+
+	//
+	// Combined permissions
+	//
+
+	/**
+	 * The character is marked as 'old', restricted from trade and mail.
+	 */
+	Old = RestrictedTradeAccess | RestrictedMailAccess,
+
+	/**
+	* The character is soft banned, restricted from trade, mail, and chat.
+	*/
+	SoftBanned = RestrictedTradeAccess | RestrictedMailAccess | RestrictedChatAccess,
 };
 
 #endif  //!__EPERMISSIONMAP__H__

dCommon/dEnums/ePlayerFlag.h

@@ -166,8 +166,7 @@ enum ePlayerFlag : int32_t {
 	NJ_LIGHTNING_SPINJITZU = 2031,
 	NJ_ICE_SPINJITZU = 2032,
 	NJ_FIRE_SPINJITZU = 2033,
-	NJ_WU_SHOW_DAILY_CHEST = 2099,
-	DLU_SKIP_CINEMATICS = 1'000'000,
+	NJ_WU_SHOW_DAILY_CHEST = 2099
 };
 
 #endif  //!__EPLAYERFLAG__H__

dCommon/dEnums/eQuickBuildState.h

@@ -1,15 +0,0 @@
-#ifndef __EQUICKBUILDSTATE__H__
-#define __EQUICKBUILDSTATE__H__
-
-#include <cstdint>
-
-enum class eQuickBuildState : uint32_t {
-	OPEN,
-	COMPLETED = 2,
-	RESETTING = 4,
-	BUILDING,
-	INCOMPLETE
-};
-
-
-#endif  //!__EQUICKBUILDSTATE__H__

dCommon/dEnums/eRebuildState.h

@@ -0,0 +1,15 @@
+#ifndef __EREBUILDSTATE__H__
+#define __EREBUILDSTATE__H__
+
+#include <cstdint>
+
+enum class eRebuildState : uint32_t {
+	OPEN,
+	COMPLETED = 2,
+	RESETTING = 4,
+	BUILDING,
+	INCOMPLETE
+};
+
+
+#endif  //!__EREBUILDSTATE__H__

dCommon/dEnums/eReplicaComponentType.h

@@ -34,7 +34,7 @@ enum class eReplicaComponentType : uint32_t {
 	PLATFORM_BOUNDARY,
 	MODULE,
 	ARCADE,
-	HAVOK_VEHICLE_PHYSICS,
+	VEHICLE_PHYSICS, // Havok demo based
 	MOVEMENT_AI,
 	EXHIBIT,
 	OVERHEAD_ICON,
@@ -50,11 +50,11 @@ enum class eReplicaComponentType : uint32_t {
 	PROPERTY_ENTRANCE,
 	FX,
 	PROPERTY_MANAGEMENT,
-	VEHICLE_PHYSICS,
+	VEHICLE_PHYSICS_NEW, // internal physics based on havok
 	PHYSICS_SYSTEM,
 	QUICK_BUILD,
 	SWITCH,
-	MINI_GAME_CONTROL,
+	ZONE_CONTROL, // Minigame
 	CHANGLING,
 	CHOICE_BUILD,
 	PACKAGE,
@@ -101,7 +101,7 @@ enum class eReplicaComponentType : uint32_t {
 	TRADE,
 	USER_CONTROL,
 	IGNORE_LIST,
-	MULTI_ZONE_ENTRANCE,
+	ROCKET_LAUNCH_LUP,
 	BUFF_REAL, // the real buff component, should just be name BUFF
 	INTERACTION_MANAGER,
 	DONATION_VENDOR,

dCommon/dEnums/eWorldMessageType.h

@@ -3,8 +3,6 @@
 
 #include <cstdint>
 
-#include "magic_enum.hpp"
-
 enum class eWorldMessageType : uint32_t {
 	VALIDATION = 1,  // 				Session info
 	CHARACTER_LIST_REQUEST,
@@ -38,14 +36,7 @@ enum class eWorldMessageType : uint32_t {
 	HANDLE_FUNNESS,
 	FAKE_PRG_CSR_MESSAGE,
 	REQUEST_FREE_TRIAL_REFRESH,
-	GM_SET_FREE_TRIAL_STATUS,
-	UI_HELP_TOP_5 = 91
-};
-
-template <>
-struct magic_enum::customize::enum_range<eWorldMessageType> {
-	static constexpr int min = 0;
-	static constexpr int max = 91;
+	GM_SET_FREE_TRIAL_STATUS
 };
 
 #endif  //!__EWORLDMESSAGETYPE__H__

dCommon/dLogger.cpp

@@ -0,0 +1,110 @@
+#include "dLogger.h"
+
+dLogger::dLogger(const std::string& outpath, bool logToConsole, bool logDebugStatements) {
+	m_logToConsole = logToConsole;
+	m_logDebugStatements = logDebugStatements;
+	m_outpath = outpath;
+
+#ifdef _WIN32
+	mFile = std::ofstream(m_outpath);
+	if (!mFile) { printf("Couldn't open %s for writing!\n", outpath.c_str()); }
+#else
+	fp = fopen(outpath.c_str(), "wt");
+	if (fp == NULL) { printf("Couldn't open %s for writing!\n", outpath.c_str()); }
+#endif
+}
+
+dLogger::~dLogger() {
+#ifdef _WIN32
+	mFile.close();
+#else
+	if (fp != nullptr) {
+		fclose(fp);
+		fp = nullptr;
+	}
+#endif
+}
+
+void dLogger::vLog(const char* format, va_list args) {
+#ifdef _WIN32
+	time_t t = time(NULL);
+	struct tm time;
+	localtime_s(&time, &t);
+	char timeStr[70];
+	strftime(timeStr, sizeof(timeStr), "%d-%m-%y %H:%M:%S", &time);
+	char message[2048];
+	vsnprintf(message, 2048, format, args);
+
+	if (m_logToConsole) std::cout << "[" << timeStr << "] " << message;
+	mFile << "[" << timeStr << "] " << message;
+#else
+	time_t t = time(NULL);
+	struct tm* time = localtime(&t);
+	char timeStr[70];
+	strftime(timeStr, sizeof(timeStr), "%d-%m-%y %H:%M:%S", time);
+	char message[2048];
+	vsnprintf(message, 2048, format, args);
+
+	if (m_logToConsole) {
+		fputs("[", stdout);
+		fputs(timeStr, stdout);
+		fputs("] ", stdout);
+		fputs(message, stdout);
+	}
+
+	if (fp != nullptr) {
+		fputs("[", fp);
+		fputs(timeStr, fp);
+		fputs("] ", fp);
+		fputs(message, fp);
+	} else {
+		printf("Logger not initialized!\n");
+	}
+#endif
+}
+
+void dLogger::LogBasic(const char* format, ...) {
+	va_list args;
+	va_start(args, format);
+	vLog(format, args);
+	va_end(args);
+}
+
+void dLogger::LogBasic(const std::string& message) {
+	LogBasic(message.c_str());
+}
+
+void dLogger::Log(const char* className, const char* format, ...) {
+	va_list args;
+	std::string log = "[" + std::string(className) + "] " + std::string(format) + "\n";
+	va_start(args, format);
+	vLog(log.c_str(), args);
+	va_end(args);
+}
+
+void dLogger::Log(const std::string& className, const std::string& message) {
+	Log(className.c_str(), message.c_str());
+}
+
+void dLogger::LogDebug(const char* className, const char* format, ...) {
+	if (!m_logDebugStatements) return;
+	va_list args;
+	std::string log = "[" + std::string(className) + "] " + std::string(format) + "\n";
+	va_start(args, format);
+	vLog(log.c_str(), args);
+	va_end(args);
+}
+
+void dLogger::LogDebug(const std::string& className, const std::string& message) {
+	LogDebug(className.c_str(), message.c_str());
+}
+
+void dLogger::Flush() {
+#ifdef _WIN32
+	mFile.flush();
+#else
+	if (fp != nullptr) {
+		std::fflush(fp);
+	}
+#endif
+}

dCommon/dLogger.h

@@ -0,0 +1,38 @@
+#pragma once
+#include <ctime>
+#include <cstdarg>
+#include <string>
+#include <fstream>
+#include <iostream>
+
+class dLogger {
+public:
+	dLogger(const std::string& outpath, bool logToConsole, bool logDebugStatements);
+	~dLogger();
+
+	void SetLogToConsole(bool logToConsole) { m_logToConsole = logToConsole; }
+	void SetLogDebugStatements(bool logDebugStatements) { m_logDebugStatements = logDebugStatements; }
+	void vLog(const char* format, va_list args);
+
+	void LogBasic(const std::string& message);
+	void LogBasic(const char* format, ...);
+	void Log(const char* className, const char* format, ...);
+	void Log(const std::string& className, const std::string& message);
+	void LogDebug(const std::string& className, const std::string& message);
+	void LogDebug(const char* className, const char* format, ...);
+
+	void Flush();
+
+	const bool GetIsLoggingToConsole() const { return m_logToConsole; }
+
+private:
+	bool m_logDebugStatements;
+	bool m_logToConsole;
+	std::string m_outpath;
+	std::ofstream mFile;
+
+#ifndef _WIN32
+	//Glorious linux can run with SPEED:
+	FILE* fp = nullptr;
+#endif
+};

dDatabase/CDClientDatabase.h

@@ -13,7 +13,15 @@
 #include <sstream>
 #include <iostream>
 
-//! The CDClient Database namespace
+ // Enable this to cache all entries in each table for fast access, comes with more memory cost
+ //#define CDCLIENT_CACHE_ALL
+
+/*!
+  \file CDClientDatabase.hpp
+  \brief An interface between the CDClient.sqlite file and the server
+ */
+
+ //! The CDClient Database namespace
 namespace CDClientDatabase {
 
 	//! Opens a connection with the CDClient

dDatabase/CDClientDatabase/CDClientManager.cpp

@@ -1,94 +0,0 @@
-#include "CDClientManager.h"
-#include "CDActivityRewardsTable.h"
-#include "CDAnimationsTable.h"
-#include "CDBehaviorParameterTable.h"
-#include "CDBehaviorTemplateTable.h"
-#include "CDComponentsRegistryTable.h"
-#include "CDCurrencyTableTable.h"
-#include "CDDestructibleComponentTable.h"
-#include "CDEmoteTable.h"
-#include "CDInventoryComponentTable.h"
-#include "CDItemComponentTable.h"
-#include "CDItemSetsTable.h"
-#include "CDItemSetSkillsTable.h"
-#include "CDLevelProgressionLookupTable.h"
-#include "CDLootMatrixTable.h"
-#include "CDLootTableTable.h"
-#include "CDMissionNPCComponentTable.h"
-#include "CDMissionTasksTable.h"
-#include "CDMissionsTable.h"
-#include "CDObjectSkillsTable.h"
-#include "CDObjectsTable.h"
-#include "CDPhysicsComponentTable.h"
-#include "CDRebuildComponentTable.h"
-#include "CDScriptComponentTable.h"
-#include "CDSkillBehaviorTable.h"
-#include "CDZoneTableTable.h"
-#include "CDVendorComponentTable.h"
-#include "CDActivitiesTable.h"
-#include "CDPackageComponentTable.h"
-#include "CDProximityMonitorComponentTable.h"
-#include "CDMovementAIComponentTable.h"
-#include "CDBrickIDTableTable.h"
-#include "CDRarityTableTable.h"
-#include "CDMissionEmailTable.h"
-#include "CDRewardsTable.h"
-#include "CDPropertyEntranceComponentTable.h"
-#include "CDPropertyTemplateTable.h"
-#include "CDFeatureGatingTable.h"
-#include "CDRailActivatorComponent.h"
-#include "CDRewardCodesTable.h"
-
-#ifndef CDCLIENT_CACHE_ALL
-// Uncomment this to cache the full cdclient database into memory. This will make the server load faster, but will use more memory.
-// A vanilla CDClient takes about 46MB of memory + the regular world data.
-// #  define CDCLIENT_CACHE_ALL
-#endif // CDCLIENT_CACHE_ALL
-
-#ifdef CDCLIENT_CACHE_ALL
-	#define CDCLIENT_DONT_CACHE_TABLE(x) x
-#else
-	#define CDCLIENT_DONT_CACHE_TABLE(x)
-#endif
-
-CDClientManager::CDClientManager() {
-	CDActivityRewardsTable::Instance().LoadValuesFromDatabase();
-	CDActivitiesTable::Instance().LoadValuesFromDatabase();
-	CDCLIENT_DONT_CACHE_TABLE(CDAnimationsTable::Instance().LoadValuesFromDatabase());
-	CDBehaviorParameterTable::Instance().LoadValuesFromDatabase();
-	CDBehaviorTemplateTable::Instance().LoadValuesFromDatabase();
-	CDBrickIDTableTable::Instance().LoadValuesFromDatabase();
-	CDCLIENT_DONT_CACHE_TABLE(CDComponentsRegistryTable::Instance().LoadValuesFromDatabase());
-	CDCurrencyTableTable::Instance().LoadValuesFromDatabase();
-	CDDestructibleComponentTable::Instance().LoadValuesFromDatabase();
-	CDEmoteTableTable::Instance().LoadValuesFromDatabase();
-	CDFeatureGatingTable::Instance().LoadValuesFromDatabase();
-	CDInventoryComponentTable::Instance().LoadValuesFromDatabase();
-	CDCLIENT_DONT_CACHE_TABLE(CDItemComponentTable::Instance().LoadValuesFromDatabase());
-	CDItemSetSkillsTable::Instance().LoadValuesFromDatabase();
-	CDItemSetsTable::Instance().LoadValuesFromDatabase();
-	CDLevelProgressionLookupTable::Instance().LoadValuesFromDatabase();
-	CDCLIENT_DONT_CACHE_TABLE(CDLootMatrixTable::Instance().LoadValuesFromDatabase());
-	CDCLIENT_DONT_CACHE_TABLE(CDLootTableTable::Instance().LoadValuesFromDatabase());
-	CDMissionEmailTable::Instance().LoadValuesFromDatabase();
-	CDMissionNPCComponentTable::Instance().LoadValuesFromDatabase();
-	CDMissionTasksTable::Instance().LoadValuesFromDatabase();
-	CDMissionsTable::Instance().LoadValuesFromDatabase();
-	CDMovementAIComponentTable::Instance().LoadValuesFromDatabase();
-	CDObjectSkillsTable::Instance().LoadValuesFromDatabase();
-	CDCLIENT_DONT_CACHE_TABLE(CDObjectsTable::Instance().LoadValuesFromDatabase());
-	CDPhysicsComponentTable::Instance().LoadValuesFromDatabase();
-	CDPackageComponentTable::Instance().LoadValuesFromDatabase();
-	CDProximityMonitorComponentTable::Instance().LoadValuesFromDatabase();
-	CDPropertyEntranceComponentTable::Instance().LoadValuesFromDatabase();
-	CDPropertyTemplateTable::Instance().LoadValuesFromDatabase();
-	CDRailActivatorComponentTable::Instance().LoadValuesFromDatabase();
-	CDRarityTableTable::Instance().LoadValuesFromDatabase();
-	CDRebuildComponentTable::Instance().LoadValuesFromDatabase();
-	CDRewardCodesTable::Instance().LoadValuesFromDatabase();
-	CDRewardsTable::Instance().LoadValuesFromDatabase();
-	CDScriptComponentTable::Instance().LoadValuesFromDatabase();
-	CDSkillBehaviorTable::Instance().LoadValuesFromDatabase();
-	CDVendorComponentTable::Instance().LoadValuesFromDatabase();
-	CDZoneTableTable::Instance().LoadValuesFromDatabase();
-}

dDatabase/CDClientDatabase/CDClientManager.h

@@ -1,26 +0,0 @@
-#pragma once
-
-#include "CDTable.h"
-
-#include "Singleton.h"
-
-#define UNUSED_TABLE(v)
-
-/**
- * Initialize the CDClient tables so they are all loaded into memory.
- */
-class CDClientManager : public Singleton<CDClientManager> {
-public:
-	CDClientManager();
-
-	/**
-	 * Fetch a table from CDClient
-	 * 
-	 * @tparam Table type to fetch
-	 * @return A pointer to the requested table.
-	 */
-	template<typename T>
-	T* GetTable() {
-		return &T::Instance();
-	}
-};

dDatabase/CDClientDatabase/CDClientTables/CDAnimationsTable.cpp

@@ -1,112 +0,0 @@
-#include "CDAnimationsTable.h"
-#include "GeneralUtils.h"
-#include "Game.h"
-
-
-void CDAnimationsTable::LoadValuesFromDatabase() {
-	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM Animations");
-	while (!tableData.eof()) {
-		std::string animation_type = tableData.getStringField("animation_type", "");
-		DluAssert(!animation_type.empty());
-		AnimationGroupID animationGroupID = tableData.getIntField("animationGroupID", -1);
-		DluAssert(animationGroupID != -1);
-
-		CDAnimation entry;
-		entry.animation_name = tableData.getStringField("animation_name", "");
-		entry.chance_to_play = tableData.getFloatField("chance_to_play", 1.0f);
-		UNUSED_COLUMN(entry.min_loops = tableData.getIntField("min_loops", 0);)
-		UNUSED_COLUMN(entry.max_loops = tableData.getIntField("max_loops", 0);)
-		entry.animation_length = tableData.getFloatField("animation_length", 0.0f);
-		UNUSED_COLUMN(entry.hideEquip = tableData.getIntField("hideEquip", 0) == 1;)
-		UNUSED_COLUMN(entry.ignoreUpperBody = tableData.getIntField("ignoreUpperBody", 0) == 1;)
-		UNUSED_COLUMN(entry.restartable = tableData.getIntField("restartable", 0) == 1;)
-		UNUSED_COLUMN(entry.face_animation_name = tableData.getStringField("face_animation_name", "");)
-		UNUSED_COLUMN(entry.priority = tableData.getFloatField("priority", 0.0f);)
-		UNUSED_COLUMN(entry.blendTime = tableData.getFloatField("blendTime", 0.0f);)
-
-		this->animations[CDAnimationKey(animation_type, animationGroupID)].push_back(entry);
-		tableData.nextRow();
-	}
-
-	tableData.finalize();
-}
-
-bool CDAnimationsTable::CacheData(CppSQLite3Statement& queryToCache) {
-	auto tableData = queryToCache.execQuery();
-	// If we received a bad lookup, cache it anyways so we do not run the query again.
-	if (tableData.eof()) return false;
-
-	do {
-		std::string animation_type = tableData.getStringField("animation_type", "");
-		DluAssert(!animation_type.empty());
-		AnimationGroupID animationGroupID = tableData.getIntField("animationGroupID", -1);
-		DluAssert(animationGroupID != -1);
-
-		CDAnimation entry;
-		entry.animation_name = tableData.getStringField("animation_name", "");
-		entry.chance_to_play = tableData.getFloatField("chance_to_play", 1.0f);
-		UNUSED_COLUMN(entry.min_loops = tableData.getIntField("min_loops", 0);)
-		UNUSED_COLUMN(entry.max_loops = tableData.getIntField("max_loops", 0);)
-		entry.animation_length = tableData.getFloatField("animation_length", 0.0f);
-		UNUSED_COLUMN(entry.hideEquip = tableData.getIntField("hideEquip", 0) == 1;)
-		UNUSED_COLUMN(entry.ignoreUpperBody = tableData.getIntField("ignoreUpperBody", 0) == 1;)
-		UNUSED_COLUMN(entry.restartable = tableData.getIntField("restartable", 0) == 1;)
-		UNUSED_COLUMN(entry.face_animation_name = tableData.getStringField("face_animation_name", "");)
-		UNUSED_COLUMN(entry.priority = tableData.getFloatField("priority", 0.0f);)
-		UNUSED_COLUMN(entry.blendTime = tableData.getFloatField("blendTime", 0.0f);)
-
-		this->animations[CDAnimationKey(animation_type, animationGroupID)].push_back(entry);
-		tableData.nextRow();
-	} while (!tableData.eof());
-
-	tableData.finalize();
-
-	return true;
-}
-
-void CDAnimationsTable::CacheAnimations(const CDAnimationKey animationKey) {
-	auto query = CDClientDatabase::CreatePreppedStmt("SELECT * FROM Animations WHERE animationGroupID = ? and animation_type = ?");
-	query.bind(1, static_cast<int32_t>(animationKey.second));
-	query.bind(2, animationKey.first.c_str());
-	// If we received a bad lookup, cache it anyways so we do not run the query again.
-	if (!CacheData(query)) {
-		this->animations[animationKey];
-	}
-}
-
-void CDAnimationsTable::CacheAnimationGroup(AnimationGroupID animationGroupID) {
-	auto animationEntryCached = this->animations.find(CDAnimationKey("", animationGroupID));
-	if (animationEntryCached != this->animations.end()) {
-		return;
-	}
-
-	auto query = CDClientDatabase::CreatePreppedStmt("SELECT * FROM Animations WHERE animationGroupID = ?");
-	query.bind(1, static_cast<int32_t>(animationGroupID));
-
-	// Cache the query so we don't run the query again.
-	CacheData(query);
-	this->animations[CDAnimationKey("", animationGroupID)];
-}
-
-CDAnimationLookupResult CDAnimationsTable::GetAnimation(const AnimationID& animationType, const std::string& previousAnimationName, const AnimationGroupID animationGroupID) {
-	CDAnimationKey animationKey(animationType, animationGroupID);
-	auto animationEntryCached = this->animations.find(animationKey);
-	if (animationEntryCached == this->animations.end()) {
-		this->CacheAnimations(animationKey);
-	}
-
-	auto animationEntry = this->animations.find(animationKey);
-	// If we have only one animation, return it regardless of the chance to play.
-	if (animationEntry->second.size() == 1) {
-		return CDAnimationLookupResult(animationEntry->second.front());
-	}
-	auto randomAnimation = GeneralUtils::GenerateRandomNumber<float>(0, 1);
-
-	for (auto& animationEntry : animationEntry->second) {
-		randomAnimation -= animationEntry.chance_to_play;
-		// This is how the client gets the random animation.
-		if (animationEntry.animation_name != previousAnimationName && randomAnimation <= 0.0f) return CDAnimationLookupResult(animationEntry);
-	}
-
-	return CDAnimationLookupResult();
-}

dDatabase/CDClientDatabase/CDClientTables/CDBehaviorParameterTable.cpp

@@ -1,55 +0,0 @@
-#include "CDBehaviorParameterTable.h"
-#include "GeneralUtils.h"
-
-uint64_t GetKey(const uint32_t behaviorID, const uint32_t parameterID) {
-	uint64_t key = behaviorID;
-	key <<= 31U;
-	key |= parameterID;
-
-	return key;
-}
-
-void CDBehaviorParameterTable::LoadValuesFromDatabase() {
-	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM BehaviorParameter");
-	while (!tableData.eof()) {
-		uint32_t behaviorID = tableData.getIntField("behaviorID", -1);
-		auto candidateStringToAdd = std::string(tableData.getStringField("parameterID", ""));
-		auto parameter = m_ParametersList.find(candidateStringToAdd);
-		uint32_t parameterId;
-		if (parameter != m_ParametersList.end()) {
-			parameterId = parameter->second;
-		} else {
-			parameterId = m_ParametersList.insert(std::make_pair(candidateStringToAdd, m_ParametersList.size())).first->second;
-		}
-		uint64_t hash = GetKey(behaviorID, parameterId);
-		float value = tableData.getFloatField("value", -1.0f);
-
-		m_Entries.insert(std::make_pair(hash, value));
-
-		tableData.nextRow();
-	}
-	tableData.finalize();
-}
-
-float CDBehaviorParameterTable::GetValue(const uint32_t behaviorID, const std::string& name, const float defaultValue) {
-	auto parameterID = this->m_ParametersList.find(name);
-	if (parameterID == this->m_ParametersList.end()) return defaultValue;
-	auto hash = GetKey(behaviorID, parameterID->second);
-
-	// Search for specific parameter
-	auto it = m_Entries.find(hash);
-	return it != m_Entries.end() ? it->second : defaultValue;
-}
-
-std::map<std::string, float> CDBehaviorParameterTable::GetParametersByBehaviorID(uint32_t behaviorID) {
-	uint64_t hashBase = behaviorID;
-	std::map<std::string, float> returnInfo;
-	for (auto& [parameterString, parameterId] : m_ParametersList) {
-		uint64_t hash = GetKey(hashBase, parameterId);
-		auto infoCandidate = m_Entries.find(hash);
-		if (infoCandidate != m_Entries.end()) {
-			returnInfo.insert(std::make_pair(parameterString, infoCandidate->second));
-		}
-	}
-	return returnInfo;
-}

dDatabase/CDClientDatabase/CDClientTables/CDBehaviorParameterTable.h

@@ -1,20 +0,0 @@
-#pragma once
-
-// Custom Classes
-#include "CDTable.h"
-#include <unordered_map>
-#include <unordered_set>
-
-class CDBehaviorParameterTable : public CDTable<CDBehaviorParameterTable> {
-private:
-	typedef uint64_t BehaviorParameterHash;
-	typedef float BehaviorParameterValue;
-	std::unordered_map<BehaviorParameterHash, BehaviorParameterValue> m_Entries;
-	std::unordered_map<std::string, uint32_t> m_ParametersList;
-public:
-	void LoadValuesFromDatabase();
-
-	float GetValue(const uint32_t behaviorID, const std::string& name, const float defaultValue = 0);
-
-	std::map<std::string, float> GetParametersByBehaviorID(uint32_t behaviorID);
-};

dDatabase/CDClientDatabase/CDClientTables/CDBehaviorTemplateTable.h

@@ -1,30 +0,0 @@
-#pragma once
-
-// Custom Classes
-#include "CDTable.h"
-#include <unordered_map>
-#include <unordered_set>
-
-struct CDBehaviorTemplate {
-	unsigned int behaviorID;                                         //!< The Behavior ID
-	unsigned int templateID;                                         //!< The Template ID (LOT)
-	unsigned int effectID;                                           //!< The Effect ID attached
-	std::unordered_set<std::string>::iterator effectHandle;          //!< The effect handle
-};
-
-
-class CDBehaviorTemplateTable : public CDTable<CDBehaviorTemplateTable> {
-private:
-	std::vector<CDBehaviorTemplate> entries;
-	std::unordered_map<uint32_t, CDBehaviorTemplate> entriesMappedByBehaviorID;
-	std::unordered_set<std::string> m_EffectHandles;
-public:
-	void LoadValuesFromDatabase();
-
-	// Queries the table with a custom "where" clause
-	std::vector<CDBehaviorTemplate> Query(std::function<bool(CDBehaviorTemplate)> predicate);
-
-	const std::vector<CDBehaviorTemplate>& GetEntries(void) const;
-
-	const CDBehaviorTemplate GetByBehaviorID(uint32_t behaviorID);
-};

dDatabase/CDClientDatabase/CDClientTables/CDComponentsRegistryTable.cpp

@@ -1,51 +0,0 @@
-#include "CDComponentsRegistryTable.h"
-#include "eReplicaComponentType.h"
-
-void CDComponentsRegistryTable::LoadValuesFromDatabase() {
-	// Now get the data
-	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM ComponentsRegistry");
-	while (!tableData.eof()) {
-		CDComponentsRegistry entry;
-		entry.id = tableData.getIntField("id", -1);
-		entry.component_type = static_cast<eReplicaComponentType>(tableData.getIntField("component_type", 0));
-		entry.component_id = tableData.getIntField("component_id", -1);
-
-		this->mappedEntries.insert_or_assign(static_cast<uint64_t>(entry.component_type) << 32 | static_cast<uint64_t>(entry.id), entry.component_id);
-		this->mappedEntries.insert_or_assign(entry.id, 0);
-
-		tableData.nextRow();
-	}
-
-	tableData.finalize();
-}
-
-int32_t CDComponentsRegistryTable::GetByIDAndType(uint32_t id, eReplicaComponentType componentType, int32_t defaultValue) {
-	auto exists = mappedEntries.find(id);
-	if (exists != mappedEntries.end()) {
-		auto iter = mappedEntries.find(static_cast<uint64_t>(componentType) << 32 | static_cast<uint64_t>(id));
-		return iter == mappedEntries.end() ? defaultValue : iter->second;
-	}
-
-	// Now get the data. Get all components of this entity so we dont do a query for each component
-	auto query = CDClientDatabase::CreatePreppedStmt("SELECT * FROM ComponentsRegistry WHERE id = ?;");
-	query.bind(1, static_cast<int32_t>(id));
-
-	auto tableData = query.execQuery();
-
-	while (!tableData.eof()) {
-		CDComponentsRegistry entry;
-		entry.id = tableData.getIntField("id", -1);
-		entry.component_type = static_cast<eReplicaComponentType>(tableData.getIntField("component_type", 0));
-		entry.component_id = tableData.getIntField("component_id", -1);
-
-		this->mappedEntries.insert_or_assign(static_cast<uint64_t>(entry.component_type) << 32 | static_cast<uint64_t>(entry.id), entry.component_id);
-
-		tableData.nextRow();
-	}
-
-	mappedEntries.insert_or_assign(id, 0);
-
-	auto iter = this->mappedEntries.find(static_cast<uint64_t>(componentType) << 32 | static_cast<uint64_t>(id));
-
-	return iter == this->mappedEntries.end() ? defaultValue : iter->second;
-}

dDatabase/CDClientDatabase/CDClientTables/CDFeatureGatingTable.h

@@ -1,33 +0,0 @@
-#pragma once
-
-// Custom Classes
-#include "CDTable.h"
-
-struct CDFeatureGating {
-	std::string featureName;
-	int32_t major;
-	int32_t current;
-	int32_t minor;
-	std::string description;
-
-	bool operator>=(const CDFeatureGating& b) const {
-		return 	(this->major > b.major) ||
-				(this->major == b.major && this->current > b.current) ||
-				(this->major == b.major && this->current == b.current && this->minor >= b.minor);
-	}
-};
-
-class CDFeatureGatingTable : public CDTable<CDFeatureGatingTable> {
-private:
-	std::vector<CDFeatureGating> entries;
-
-public:
-	void LoadValuesFromDatabase();
-
-	// Queries the table with a custom "where" clause
-	std::vector<CDFeatureGating> Query(std::function<bool(CDFeatureGating)> predicate);
-
-	bool FeatureUnlocked(const CDFeatureGating& feature) const;
-
-	const std::vector<CDFeatureGating>& GetEntries(void) const;
-};

dDatabase/CDClientDatabase/CDClientTables/CDLootMatrixTable.cpp

@@ -1,58 +0,0 @@
-#include "CDLootMatrixTable.h"
-
-CDLootMatrix CDLootMatrixTable::ReadRow(CppSQLite3Query& tableData) const {
-	CDLootMatrix entry{};
-	if (tableData.eof()) return entry;
-	entry.LootTableIndex = tableData.getIntField("LootTableIndex", -1);
-	entry.RarityTableIndex = tableData.getIntField("RarityTableIndex", -1);
-	entry.percent = tableData.getFloatField("percent", -1.0f);
-	entry.minToDrop = tableData.getIntField("minToDrop", -1);
-	entry.maxToDrop = tableData.getIntField("maxToDrop", -1);
-	entry.flagID = tableData.getIntField("flagID", -1);
-	UNUSED(entry.gate_version = tableData.getStringField("gate_version", ""));
-	return entry;
-}
-
-void CDLootMatrixTable::LoadValuesFromDatabase() {
-
-	// First, get the size of the table
-	unsigned int size = 0;
-	auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM LootMatrix");
-	while (!tableSize.eof()) {
-		size = tableSize.getIntField(0, 0);
-
-		tableSize.nextRow();
-	}
-
-	// Reserve the size
-	this->entries.reserve(size);
-
-	// Now get the data
-	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM LootMatrix");
-	while (!tableData.eof()) {
-		CDLootMatrix entry;
-		uint32_t lootMatrixIndex = tableData.getIntField("LootMatrixIndex", -1);
-
-		this->entries[lootMatrixIndex].push_back(ReadRow(tableData));
-		tableData.nextRow();
-	}
-}
-
-const LootMatrixEntries& CDLootMatrixTable::GetMatrix(uint32_t matrixId) {
-	auto itr = this->entries.find(matrixId);
-	if (itr != this->entries.end()) {
-		return itr->second;
-	}
-
-	auto query = CDClientDatabase::CreatePreppedStmt("SELECT * FROM LootMatrix where LootMatrixIndex = ?;");
-	query.bind(1, static_cast<int32_t>(matrixId));
-
-	auto tableData = query.execQuery();
-	while (!tableData.eof()) {
-		this->entries[matrixId].push_back(ReadRow(tableData));
-		tableData.nextRow();
-	}
-
-	return this->entries[matrixId];
-}
-

dDatabase/CDClientDatabase/CDClientTables/CDLootTableTable.cpp

@@ -1,86 +0,0 @@
-#include "CDLootTableTable.h"
-#include "CDClientManager.h"
-#include "CDComponentsRegistryTable.h"
-#include "CDItemComponentTable.h"
-#include "eReplicaComponentType.h"
-
-// Sort the tables by their rarity so the highest rarity items are first.
-void SortTable(LootTableEntries& table) {
-	auto* componentsRegistryTable = CDClientManager::Instance().GetTable<CDComponentsRegistryTable>();
-	auto* itemComponentTable = CDClientManager::Instance().GetTable<CDItemComponentTable>();
-	// We modify the table in place so the outer loop keeps track of what is sorted
-	// and the inner loop finds the highest rarity item and swaps it with the current position
-	// of the outer loop.
-	for (auto oldItrOuter = table.begin(); oldItrOuter != table.end(); oldItrOuter++) {
-		auto lootToInsert = oldItrOuter;
-		// Its fine if this starts at 0, even if this doesnt match lootToInsert as the actual highest will
-		// either be found and overwrite these values, or the original is somehow zero and is still the highest rarity.
-		uint32_t highestLootRarity = 0;
-		for (auto oldItrInner = oldItrOuter; oldItrInner != table.end(); oldItrInner++) {
-			uint32_t itemComponentId = componentsRegistryTable->GetByIDAndType(oldItrInner->itemid, eReplicaComponentType::ITEM);
-			uint32_t rarity = itemComponentTable->GetItemComponentByID(itemComponentId).rarity;
-			if (rarity > highestLootRarity) {
-				highestLootRarity = rarity;
-				lootToInsert = oldItrInner;
-			}
-		}
-		std::swap(*oldItrOuter, *lootToInsert);
-	}
-}
-
-CDLootTable CDLootTableTable::ReadRow(CppSQLite3Query& tableData) const {
-	CDLootTable entry{};
-	if (tableData.eof()) return entry;
-	entry.itemid = tableData.getIntField("itemid", -1);
-	entry.MissionDrop = tableData.getIntField("MissionDrop", -1) == 1 ? true : false;
-	entry.sortPriority = tableData.getIntField("sortPriority", -1);
-	return entry;
-}
-
-void CDLootTableTable::LoadValuesFromDatabase() {
-
-	// First, get the size of the table
-	unsigned int size = 0;
-	auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM LootTable");
-	while (!tableSize.eof()) {
-		size = tableSize.getIntField(0, 0);
-
-		tableSize.nextRow();
-	}
-
-	// Reserve the size
-	this->entries.reserve(size);
-
-	// Now get the data
-	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM LootTable");
-	while (!tableData.eof()) {
-		CDLootTable entry;
-		uint32_t lootTableIndex = tableData.getIntField("LootTableIndex", -1);
-
-		this->entries[lootTableIndex].push_back(ReadRow(tableData));
-		tableData.nextRow();
-	}
-	for (auto& [id, table] : this->entries) {
-		SortTable(table);
-	}
-}
-
-const LootTableEntries& CDLootTableTable::GetTable(uint32_t tableId) {
-	auto itr = this->entries.find(tableId);
-	if (itr != this->entries.end()) {
-		return itr->second;
-	}
-
-	auto query = CDClientDatabase::CreatePreppedStmt("SELECT * FROM LootTable WHERE LootTableIndex = ?;");
-	query.bind(1, static_cast<int32_t>(tableId));
-	auto tableData = query.execQuery();
-
-	while (!tableData.eof()) {
-		CDLootTable entry;
-		this->entries[tableId].push_back(ReadRow(tableData));
-		tableData.nextRow();
-	}
-	SortTable(this->entries[tableId]);
-
-	return this->entries[tableId];
-}

dDatabase/CDClientDatabase/CDClientTables/CDPhysicsComponentTable.cpp

@@ -1,35 +0,0 @@
-#include "CDPhysicsComponentTable.h"
-
-void CDPhysicsComponentTable::LoadValuesFromDatabase() {
-	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM PhysicsComponent");
-	while (!tableData.eof()) {
-		CDPhysicsComponent entry;
-		entry.id = tableData.getIntField("id", -1);
-		entry.bStatic = tableData.getIntField("static", -1) != 0;
-		entry.physicsAsset = tableData.getStringField("physics_asset", "");
-		UNUSED(entry->jump = tableData.getIntField("jump", -1) != 0);
-		UNUSED(entry->doublejump = tableData.getIntField("doublejump", -1) != 0);
-		entry.speed = tableData.getFloatField("speed", -1);
-		UNUSED(entry->rotSpeed = tableData.getFloatField("rotSpeed", -1));
-		entry.playerHeight = tableData.getFloatField("playerHeight");
-		entry.playerRadius = tableData.getFloatField("playerRadius");
-		entry.pcShapeType = tableData.getIntField("pcShapeType");
-		entry.collisionGroup = tableData.getIntField("collisionGroup");
-		UNUSED(entry->airSpeed = tableData.getFloatField("airSpeed"));
-		UNUSED(entry->boundaryAsset = tableData.getStringField("boundaryAsset"));
-		UNUSED(entry->jumpAirSpeed = tableData.getFloatField("jumpAirSpeed"));
-		UNUSED(entry->friction = tableData.getFloatField("friction"));
-		UNUSED(entry->gravityVolumeAsset = tableData.getStringField("gravityVolumeAsset"));
-
-		m_entries.insert(std::make_pair(entry.id, entry));
-		tableData.nextRow();
-	}
-
-	tableData.finalize();
-}
-
-CDPhysicsComponent* CDPhysicsComponentTable::GetByID(unsigned int componentID) {
-	auto itr = m_entries.find(componentID);
-	return itr != m_entries.end() ? &itr->second : nullptr;
-}
-

dDatabase/CDClientDatabase/CDClientTables/CDRarityTableTable.cpp

@@ -1,34 +0,0 @@
-#include "CDRarityTableTable.h"
-
-void CDRarityTableTable::LoadValuesFromDatabase() {
-
-	// First, get the size of the table
-	unsigned int size = 0;
-	auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM RarityTable");
-	while (!tableSize.eof()) {
-		size = tableSize.getIntField(0, 0);
-
-		tableSize.nextRow();
-	}
-
-	tableSize.finalize();
-
-	// Reserve the size
-	this->entries.reserve(size);
-
-	// Now get the data
-	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM RarityTable order by randmax desc;");
-	while (!tableData.eof()) {
-		uint32_t rarityTableIndex = tableData.getIntField("RarityTableIndex", -1);
-
-		CDRarityTable entry;
-		entry.randmax = tableData.getFloatField("randmax", -1);
-		entry.rarity = tableData.getIntField("rarity", -1);
-		entries[rarityTableIndex].push_back(entry);
-		tableData.nextRow();
-	}
-}
-
-const std::vector<CDRarityTable>& CDRarityTableTable::GetRarityTable(uint32_t id) {
-	return entries[id];
-}

dDatabase/CDClientDatabase/CDClientTables/CDRarityTableTable.h

@@ -1,23 +0,0 @@
-#pragma once
-
-// Custom Classes
-#include "CDTable.h"
-
-struct CDRarityTable {
-	float randmax;
-	unsigned int rarity;
-};
-
-typedef std::vector<CDRarityTable> RarityTable;
-
-class CDRarityTableTable : public CDTable<CDRarityTableTable> {
-private:
-	typedef uint32_t RarityTableIndex;
-	std::unordered_map<RarityTableIndex, std::vector<CDRarityTable>> entries;
-
-public:
-	void LoadValuesFromDatabase();
-
-	const std::vector<CDRarityTable>& GetRarityTable(uint32_t predicate);
-};
-

dDatabase/CDClientDatabase/CDClientTables/CDRewardCodesTable.cpp

@@ -1,47 +0,0 @@
-#include "CDRewardCodesTable.h"
-
-void CDRewardCodesTable::LoadValuesFromDatabase() {
-
-	// First, get the size of the table
-	unsigned int size = 0;
-	auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM RewardCodes");
-	while (!tableSize.eof()) {
-		size = tableSize.getIntField(0, 0);
-
-		tableSize.nextRow();
-	}
-
-	tableSize.finalize();
-
-	// Reserve the size
-	this->entries.reserve(size);
-
-	// Now get the data
-	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM RewardCodes");
-	while (!tableData.eof()) {
-		CDRewardCode entry;
-		entry.id = tableData.getIntField("id", -1);
-		entry.code = tableData.getStringField("code", "");
-		entry.attachmentLOT = tableData.getIntField("attachmentLOT", -1);
-		UNUSED_COLUMN(entry.locStatus = tableData.getIntField("locStatus", -1));
-		UNUSED_COLUMN(entry.gate_version = tableData.getStringField("gate_version", ""));
-
-		this->entries.push_back(entry);
-		tableData.nextRow();
-	}
-}
-
-LOT CDRewardCodesTable::GetAttachmentLOT(uint32_t rewardCodeId) const {
-	for (auto const &entry : this->entries){
-		if (rewardCodeId == entry.id) return entry.attachmentLOT;
-	}
-	return LOT_NULL;
-}
-
-uint32_t CDRewardCodesTable::GetCodeID(std::string code) const {
-	for (auto const &entry : this->entries){
-		if (code == entry.code) return entry.id;
-	}
-	return -1;
-}
-

dDatabase/CDClientDatabase/CDClientTables/CDRewardCodesTable.h

@@ -1,25 +0,0 @@
-#pragma once
-
-// Custom Classes
-#include "CDTable.h"
-
-
-struct CDRewardCode {
-	uint32_t id;
-	std::string code;
-	LOT attachmentLOT;
-	UNUSED(uint32_t locStatus);
-	UNUSED(std::string gate_version);
-};
-
-
-class CDRewardCodesTable : public CDTable<CDRewardCodesTable> {
-private:
-	std::vector<CDRewardCode> entries;
-
-public:
-	void LoadValuesFromDatabase();
-	const std::vector<CDRewardCode>& GetEntries() const;
-	LOT GetAttachmentLOT(uint32_t rewardCodeId) const;
-	uint32_t GetCodeID(std::string code) const;
-};

dDatabase/CDClientDatabase/CDClientTables/CDRewardsTable.cpp

@@ -1,29 +0,0 @@
-#include "CDRewardsTable.h"
-
-void CDRewardsTable::LoadValuesFromDatabase() {
-	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM Rewards");
-	while (!tableData.eof()) {
-		CDRewards entry;
-		entry.id = tableData.getIntField("id", -1);
-		entry.levelID = tableData.getIntField("LevelID", -1);
-		entry.missionID = tableData.getIntField("MissionID", -1);
-		entry.rewardType = tableData.getIntField("RewardType", -1);
-		entry.value = tableData.getIntField("value", -1);
-		entry.count = tableData.getIntField("count", -1);
-
-		m_entries.insert(std::make_pair(entry.id, entry));
-		tableData.nextRow();
-	}
-
-	tableData.finalize();
-}
-
-std::vector<CDRewards> CDRewardsTable::GetByLevelID(uint32_t levelID) {
-	std::vector<CDRewards> result{};
-	for (const auto& e : m_entries) {
-		if (e.second.levelID == levelID) result.push_back(e.second);
-	}
-
-	return result;
-}
-

dDatabase/CDClientDatabase/CMakeLists.txt

@@ -1,12 +0,0 @@
-set(DDATABASE_CDCLIENTDATABASE_SOURCES
-	"CDClientDatabase.cpp"
-	"CDClientManager.cpp"
-)
-
-add_subdirectory(CDClientTables)
-
-foreach(file ${DDATABASE_CDCLIENTDATABASE_CDCLIENTTABLES_SOURCES})
-	set(DDATABASE_CDCLIENTDATABASE_SOURCES ${DDATABASE_CDCLIENTDATABASE_SOURCES} "CDClientTables/${file}")
-endforeach()
-
-set(DDATABASE_CDCLIENTDATABASE_SOURCES ${DDATABASE_CDCLIENTDATABASE_SOURCES} PARENT_SCOPE)

dDatabase/CMakeLists.txt

@@ -1,20 +1,12 @@
-set(DDATABASE_SOURCES)
+set(DDATABASE_SOURCES "CDClientDatabase.cpp"
+		"Database.cpp"
+		"MigrationRunner.cpp")
 
-add_subdirectory(CDClientDatabase)
+add_subdirectory(Tables)
 
-foreach(file ${DDATABASE_CDCLIENTDATABASE_SOURCES})
-	set(DDATABASE_SOURCES ${DDATABASE_SOURCES} "CDClientDatabase/${file}")
-endforeach()
-
-add_subdirectory(GameDatabase)
-
-foreach(file ${DDATABASE_GAMEDATABASE_SOURCES})
-	set(DDATABASE_SOURCES ${DDATABASE_SOURCES} "GameDatabase/${file}")
+foreach(file ${DDATABASE_TABLES_SOURCES})
+	set(DDATABASE_SOURCES ${DDATABASE_SOURCES} "Tables/${file}")
 endforeach()
 
 add_library(dDatabase STATIC ${DDATABASE_SOURCES})
 target_link_libraries(dDatabase sqlite3 mariadbConnCpp)
-
-if (${CDCLIENT_CACHE_ALL})
-	add_compile_definitions(dDatabase CDCLIENT_CACHE_ALL=${CDCLIENT_CACHE_ALL})
-endif()

dDatabase/Database.cpp

@@ -0,0 +1,118 @@
+#include "Database.h"
+#include "Game.h"
+#include "dConfig.h"
+#include "dLogger.h"
+using namespace std;
+
+#pragma warning (disable:4251) //Disables SQL warnings
+
+sql::Driver* Database::driver;
+sql::Connection* Database::con;
+sql::Properties Database::props;
+std::string Database::database;
+
+void Database::Connect(const string& host, const string& database, const string& username, const string& password) {
+
+	//To bypass debug issues:
+	const char* szDatabase = database.c_str();
+	const char* szUsername = username.c_str();
+	const char* szPassword = password.c_str();
+
+	driver = sql::mariadb::get_driver_instance();
+
+	sql::Properties properties;
+	// The mariadb connector is *supposed* to handle unix:// and pipe:// prefixes to hostName, but there are bugs where
+	// 1) it tries to parse a database from the connection string (like in tcp://localhost:3001/darkflame) based on the
+	//    presence of a /
+	// 2) even avoiding that, the connector still assumes you're connecting with a tcp socket
+	// So, what we do in the presence of a unix socket or pipe is to set the hostname to the protocol and localhost,
+	// which avoids parsing errors while still ensuring the correct connection type is used, and then setting the appropriate
+	// property manually (which the URL parsing fails to do)
+	const std::string UNIX_PROTO = "unix://";
+	const std::string PIPE_PROTO = "pipe://";
+    if (host.find(UNIX_PROTO) == 0) {
+		properties["hostName"] = "unix://localhost";
+		properties["localSocket"] = host.substr(UNIX_PROTO.length()).c_str();
+    } else if (host.find(PIPE_PROTO) == 0) {
+		properties["hostName"] = "pipe://localhost";
+		properties["pipe"] = host.substr(PIPE_PROTO.length()).c_str();
+    } else {
+		properties["hostName"] = host.c_str();
+    }
+	properties["user"] = szUsername;
+	properties["password"] = szPassword;
+	properties["autoReconnect"] = "true";
+
+	Database::props = properties;
+	Database::database = database;
+
+	Database::Connect();
+}
+
+void Database::Connect() {
+	// `connect(const Properties& props)` segfaults in windows debug, but
+	// `connect(const SQLString& host, const SQLString& user, const SQLString& pwd)` doesn't handle pipes/unix sockets correctly
+	if (Database::props.find("localSocket") != Database::props.end() || Database::props.find("pipe") != Database::props.end()) {
+		con = driver->connect(Database::props);
+	} else {
+		con = driver->connect(Database::props["hostName"].c_str(), Database::props["user"].c_str(), Database::props["password"].c_str());
+	}
+	con->setSchema(Database::database.c_str());
+}
+
+void Database::Destroy(std::string source, bool log) {
+	if (!con) return;
+
+	if (log) {
+		if (source != "") Game::logger->Log("Database", "Destroying MySQL connection from %s!", source.c_str());
+		else Game::logger->Log("Database", "Destroying MySQL connection!");
+	}
+
+	con->close();
+	delete con;
+} //Destroy
+
+sql::Statement* Database::CreateStmt() {
+	sql::Statement* toReturn = con->createStatement();
+	return toReturn;
+} //CreateStmt
+
+sql::PreparedStatement* Database::CreatePreppedStmt(const std::string& query) {
+	const char* test = query.c_str();
+	size_t size = query.length();
+	sql::SQLString str(test, size);
+
+	if (!con) {
+		Connect();
+		Game::logger->Log("Database", "Trying to reconnect to MySQL");
+	}
+
+	if (!con->isValid() || con->isClosed()) {
+		delete con;
+
+		con = nullptr;
+
+		Connect();
+		Game::logger->Log("Database", "Trying to reconnect to MySQL from invalid or closed connection");
+	}
+
+	auto* stmt = con->prepareStatement(str);
+
+	return stmt;
+} //CreatePreppedStmt
+
+void Database::Commit() {
+	Database::con->commit();
+}
+
+bool Database::GetAutoCommit() {
+	// TODO This should not just access a pointer.  A future PR should update this
+	// to check for null and throw an error if the connection is not valid.
+	return con->getAutoCommit();
+}
+
+void Database::SetAutoCommit(bool value) {
+	// TODO This should not just access a pointer.  A future PR should update this
+	// to check for null and throw an error if the connection is not valid.
+	Database::con->setAutoCommit(value);
+}

dDatabase/Database.h

@@ -0,0 +1,31 @@
+#pragma once
+
+#include <string>
+#include <conncpp.hpp>
+
+class MySqlException : public std::runtime_error {
+public:
+	MySqlException() : std::runtime_error("MySQL error!") {}
+	MySqlException(const std::string& msg) : std::runtime_error(msg.c_str()) {}
+};
+
+class Database {
+private:
+	static sql::Driver* driver;
+	static sql::Connection* con;
+	static sql::Properties props;
+	static std::string database;
+public:
+	static void Connect(const std::string& host, const std::string& database, const std::string& username, const std::string& password);
+	static void Connect();
+	static void Destroy(std::string source = "", bool log = true);
+
+	static sql::Statement* CreateStmt();
+	static sql::PreparedStatement* CreatePreppedStmt(const std::string& query);
+	static void Commit();
+	static bool GetAutoCommit();
+	static void SetAutoCommit(bool value);
+
+	static std::string GetDatabase() { return database; }
+	static sql::Properties GetProperties() { return props; }
+};

dDatabase/GameDatabase/CMakeLists.txt

@@ -1,12 +0,0 @@
-set(DDATABASE_GAMEDATABASE_SOURCES
-	"Database.cpp"
-	"MigrationRunner.cpp"
-)
-
-add_subdirectory(MySQL)
-
-foreach(file ${DDATABSE_DATABSES_MYSQL_SOURCES})
-	set(DDATABASE_GAMEDATABASE_SOURCES ${DDATABASE_GAMEDATABASE_SOURCES} "MySQL/${file}")
-endforeach()
-
-set(DDATABASE_GAMEDATABASE_SOURCES ${DDATABASE_GAMEDATABASE_SOURCES} PARENT_SCOPE)

dDatabase/GameDatabase/Database.cpp

@@ -1,40 +0,0 @@
-#include "Database.h"
-#include "Game.h"
-#include "dConfig.h"
-#include "Logger.h"
-#include "MySQLDatabase.h"
-#include "DluAssert.h"
-
-#pragma warning (disable:4251) //Disables SQL warnings
-
-namespace {
-	GameDatabase* database = nullptr;
-}
-
-void Database::Connect() {
-	if (database) {
-		LOG("Tried to connect to database when it's already connected!");
-		return;
-	}
-
-	database = new MySQLDatabase();
-	database->Connect();
-}
-
-GameDatabase* Database::Get() {
-	if (!database) {
-		LOG("Tried to get database when it's not connected!");
-		Connect();
-	}
-	return database;
-}
-
-void Database::Destroy(std::string source) {
-	if (database) {
-		database->Destroy(source);
-		delete database;
-		database = nullptr;
-	} else {
-		LOG("Trying to destroy database when it's not connected!");
-	}
-}

dDatabase/GameDatabase/Database.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#include <string>
-#include <conncpp.hpp>
-
-#include "GameDatabase.h"
-
-namespace Database {
-	void Connect();
-	GameDatabase* Get();
-	void Destroy(std::string source = "");
-};

dDatabase/GameDatabase/GameDatabase.h

@@ -1,57 +0,0 @@
-#ifndef __GAMEDATABASE__H__
-#define __GAMEDATABASE__H__
-
-#include <optional>
-
-#include "ILeaderboard.h"
-#include "IPlayerCheatDetections.h"
-#include "ICommandLog.h"
-#include "IMail.h"
-#include "IObjectIdTracker.h"
-#include "IPlayKeys.h"
-#include "IServers.h"
-#include "IBugReports.h"
-#include "IPropertyContents.h"
-#include "IProperty.h"
-#include "IPetNames.h"
-#include "ICharXml.h"
-#include "IMigrationHistory.h"
-#include "IUgc.h"
-#include "IFriends.h"
-#include "ICharInfo.h"
-#include "IAccounts.h"
-#include "IActivityLog.h"
-#include "IIgnoreList.h"
-#include "IAccountsRewardCodes.h"
-
-namespace sql {
-	class Statement;
-	class PreparedStatement;
-};
-
-#ifdef _DEBUG
-#  define DLU_SQL_TRY_CATCH_RETHROW(x) do { try { x; } catch (sql::SQLException& ex) { LOG("SQL Error: %s", ex.what()); throw; } } while(0)
-#else
-#  define DLU_SQL_TRY_CATCH_RETHROW(x) x
-#endif // _DEBUG
-
-class GameDatabase :
-	public IPlayKeys, public ILeaderboard, public IObjectIdTracker, public IServers,
-	public IMail, public ICommandLog, public IPlayerCheatDetections, public IBugReports,
-	public IPropertyContents, public IProperty, public IPetNames, public ICharXml,
-	public IMigrationHistory, public IUgc, public IFriends, public ICharInfo,
-	public IAccounts, public IActivityLog, public IAccountsRewardCodes, public IIgnoreList {
-public:
-	virtual ~GameDatabase() = default;
-	// TODO: These should be made private.
-	virtual void Connect() = 0;
-	virtual void Destroy(std::string source = "") = 0;
-	virtual void ExecuteCustomQuery(const std::string_view query) = 0;
-	virtual sql::PreparedStatement* CreatePreppedStmt(const std::string& query) = 0;
-	virtual void Commit() = 0;
-	virtual bool GetAutoCommit() = 0;
-	virtual void SetAutoCommit(bool value) = 0;
-	virtual void DeleteCharacter(const uint32_t characterId) = 0;
-};
-
-#endif  //!__GAMEDATABASE__H__

dDatabase/GameDatabase/ITables/IAccounts.h

@@ -1,37 +0,0 @@
-#ifndef __IACCOUNTS__H__
-#define __IACCOUNTS__H__
-
-#include <cstdint>
-#include <optional>
-#include <string_view>
-
-enum class eGameMasterLevel : uint8_t;
-
-class IAccounts {
-public:
-	struct Info {
-		std::string bcryptPassword;
-		uint32_t id{};
-		uint32_t playKeyId{};
-		bool banned{};
-		bool locked{};
-		eGameMasterLevel maxGmLevel{};
-	};
-
-	// Get the account info for the given username.
-	virtual std::optional<IAccounts::Info> GetAccountInfo(const std::string_view username) = 0;
-
-	// Update the account's unmute time.
-	virtual void UpdateAccountUnmuteTime(const uint32_t accountId, const uint64_t timeToUnmute) = 0;
-
-	// Update the account's ban status.
-	virtual void UpdateAccountBan(const uint32_t accountId, const bool banned) = 0;
-
-	// Update the account's password.
-	virtual void UpdateAccountPassword(const uint32_t accountId, const std::string_view bcryptpassword) = 0;
-
-	// Add a new account to the database.
-	virtual void InsertNewAccount(const std::string_view username, const std::string_view bcryptpassword) = 0;
-};
-
-#endif  //!__IACCOUNTS__H__

dDatabase/GameDatabase/ITables/IAccountsRewardCodes.h

@@ -1,13 +0,0 @@
-#ifndef __IACCOUNTSREWARDCODES__H__
-#define __IACCOUNTSREWARDCODES__H__
-
-#include <cstdint>
-#include <vector>
-
-class IAccountsRewardCodes {
-public:
-	virtual void InsertRewardCode(const uint32_t account_id, const uint32_t reward_code) = 0;
-	virtual std::vector<uint32_t> GetRewardCodesByAccountID(const uint32_t account_id) = 0;
-};
-
-#endif  //!__IACCOUNTSREWARDCODES__H__

dDatabase/GameDatabase/ITables/IActivityLog.h

@@ -1,19 +0,0 @@
-#ifndef __IACTIVITYLOG__H__
-#define __IACTIVITYLOG__H__
-
-#include <cstdint>
-
-#include "dCommonVars.h"
-
-enum class eActivityType : uint32_t {
-	PlayerLoggedIn,
-	PlayerLoggedOut,
-};
-
-class IActivityLog {
-public:
-	// Update the activity log for the given account.
-	virtual void UpdateActivityLog(const uint32_t characterId, const eActivityType activityType, const LWOMAPID mapId) = 0;
-};
-
-#endif  //!__IACTIVITYLOG__H__

dDatabase/GameDatabase/ITables/IBugReports.h

@@ -1,20 +0,0 @@
-#ifndef __IBUGREPORTS__H__
-#define __IBUGREPORTS__H__
-
-#include <cstdint>
-#include <string_view>
-
-class IBugReports {
-public:
-	struct Info {
-		std::string body;
-		std::string clientVersion;
-		std::string otherPlayer;
-		std::string selection;
-		uint32_t characterId{};
-	};
-
-	// Add a new bug report to the database.
-	virtual void InsertNewBugReport(const Info& info) = 0;
-};
-#endif  //!__IBUGREPORTS__H__

dDatabase/GameDatabase/ITables/ICharInfo.h

@@ -1,49 +0,0 @@
-#ifndef __ICHARINFO__H__
-#define __ICHARINFO__H__
-
-#include <cstdint>
-#include <optional>
-#include <string>
-#include <string_view>
-#include <vector>
-
-#include "ePermissionMap.h"
-
-class ICharInfo {
-public:
-	struct Info {
-		std::string name;
-		std::string pendingName;
-		uint32_t id{};
-		uint32_t accountId{};
-		bool needsRename{};
-		LWOCLONEID cloneId{};
-		ePermissionMap permissionMap{};
-	};
-
-	// Get the approved names of all characters.
-	virtual std::vector<std::string> GetApprovedCharacterNames() = 0;
-
-	// Get the character info for the given character id.
-	virtual std::optional<ICharInfo::Info> GetCharacterInfo(const uint32_t charId) = 0;
-
-	// Get the character info for the given character name.
-	virtual std::optional<ICharInfo::Info> GetCharacterInfo(const std::string_view name) = 0;
-	
-	// Get the character ids for the given account.
-	virtual std::vector<uint32_t> GetAccountCharacterIds(const uint32_t accountId) = 0;
-
-	// Insert a new character into the database.
-	virtual void InsertNewCharacter(const ICharInfo::Info info) = 0;
-
-	// Set the name of the given character.
-	virtual void SetCharacterName(const uint32_t characterId, const std::string_view name) = 0;
-
-	// Set the pending name of the given character.
-	virtual void SetPendingCharacterName(const uint32_t characterId, const std::string_view name) = 0;
-
-	// Updates the given character ids last login to be right now.
-	virtual void UpdateLastLoggedInCharacter(const uint32_t characterId) = 0;
-};
-
-#endif  //!__ICHARINFO__H__

dDatabase/GameDatabase/ITables/ICharXml.h

@@ -1,20 +0,0 @@
-#ifndef __ICHARXML__H__
-#define __ICHARXML__H__
-
-#include <cstdint>
-#include <string>
-#include <string_view>
-
-class ICharXml {
-public:
-	// Get the character xml for the given character id.
-	virtual std::string GetCharacterXml(const uint32_t charId) = 0;
-
-	// Update the character xml for the given character id.
-	virtual void UpdateCharacterXml(const uint32_t charId, const std::string_view lxfml) = 0;
-
-	// Insert the character xml for the given character id.
-	virtual void InsertCharacterXml(const uint32_t characterId, const std::string_view lxfml) = 0;
-};
-
-#endif  //!__ICHARXML__H__

dDatabase/GameDatabase/ITables/ICommandLog.h

@@ -1,14 +0,0 @@
-#ifndef __ICOMMANDLOG__H__
-#define __ICOMMANDLOG__H__
-
-#include <cstdint>
-#include <string_view>
-
-class ICommandLog {
-public:	
-
-	// Insert a new slash command log entry.
-	virtual void InsertSlashCommandUsage(const uint32_t characterId, const std::string_view command) = 0;
-};
-
-#endif  //!__ICOMMANDLOG__H__