Merge branch 'main' into physicsSimplification

tested that the ninjago platforms and fire still works, tested that point of interest work as well

Update PhantomPhysicsComponent.cpp

CMakeLists.txt

@@ -1,12 +1,9 @@
-cmake_minimum_required(VERSION 3.25)
+cmake_minimum_required(VERSION 3.18)
 project(Darkflame)
 include(CTest)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CXX_STANDARD_REQUIRED ON)
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON) 	# Export the compile commands for debugging
-set(CMAKE_POLICY_DEFAULT_CMP0063 NEW) 	# Set CMAKE visibility policy to NEW on project and subprojects
-set(CMAKE_VISIBILITY_INLINES_HIDDEN ON) # Set C and C++ symbol visibility to hide inlined functions
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 # Read variables from file
@@ -73,15 +70,13 @@ if(UNIX)
 	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
-	# Also disable non-portable MSVC volatile behavior
-	add_compile_options("/wd4267" "/utf-8" "/volatile:iso")
+	add_compile_options("/wd4267" "/utf-8")
 elseif(WIN32)
 	add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
 endif()
 
 # Our output dir
 set(CMAKE_BINARY_DIR ${PROJECT_BINARY_DIR})
-#set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) # unfortunately, forces all libraries to be built in series, which will slow down the build process
 
 # TODO make this not have to override the build type directories
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR})
@@ -95,9 +90,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
-find_package(MariaDB)
-find_package(JSON)
-
 # Create a /resServer directory
 make_directory(${CMAKE_BINARY_DIR}/resServer)
 
@@ -105,7 +97,7 @@ make_directory(${CMAKE_BINARY_DIR}/resServer)
 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" "blocklist.dcf")
+set(RESOURCE_FILES "sharedconfig.ini" "authconfig.ini" "chatconfig.ini" "worldconfig.ini" "masterconfig.ini" "blacklist.dcf")
 message(STATUS "Checking resource file integrity")
 
 include(Utils)
@@ -187,7 +179,7 @@ file(ARCHIVE_EXTRACT INPUT ${PROJECT_BINARY_DIR}/navmeshes.zip DESTINATION ${PRO
 file(REMOVE ${PROJECT_BINARY_DIR}/navmeshes.zip)
 
 # Copy vanity files on first build
-set(VANITY_FILES "CREDITS.md" "INFO.md" "TESTAMENT.md" "root.xml" "dev-tribute.xml" "atm.xml" "demo.xml")
+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)
@@ -210,47 +202,90 @@ foreach(file ${SQL_FILES})
 	configure_file(${CMAKE_SOURCE_DIR}/migrations/cdserver/${file} ${PROJECT_BINARY_DIR}/migrations/cdserver/${file})
 endforeach()
 
-# Add system specfic includes for Apple, Windows and Other Unix OS' (including Linux)
-if (APPLE)
-	include_directories("/usr/local/include/")
-endif()
-
-# Load all of our third party directories
-add_subdirectory(thirdparty SYSTEM)
-
 # Create our list of include directories
-include_directories(
+set(INCLUDED_DIRECTORIES
+	"dCommon"
+	"dCommon/dClient"
+	"dCommon/dEnums"
+
+	"dChatFilter"
+
+	"dGame"
+	"dGame/dBehaviors"
+	"dGame/dComponents"
+	"dGame/dGameMessages"
+	"dGame/dInventory"
+	"dGame/dMission"
+	"dGame/dEntity"
+	"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"
 
 	"dNet"
 
+	"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"
-
-	SYSTEM "thirdparty/magic_enum/include/magic_enum"
-	SYSTEM "thirdparty/raknet/Source"
-	SYSTEM "thirdparty/tinyxml2"
-	SYSTEM "thirdparty/recastnavigation"
-	SYSTEM "thirdparty/SQLite"
-	SYSTEM "thirdparty/cpplinq"
-	SYSTEM "thirdparty/cpp-httplib"
-	SYSTEM "thirdparty/MD5"
 )
 
 # Add system specfic includes for Apple, Windows and Other Unix OS' (including Linux)
-# TODO: Should probably not do this.
 if(APPLE)
 	include_directories("/usr/local/include/")
 endif()
 
-# Add linking directories:
-if (UNIX)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wold-style-cast -Werror") # Warning flags
+# 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")
 endif()
+
+include_directories("${PROJECT_SOURCE_DIR}/thirdparty/libbcrypt/include")
+
+# Add linking directories:
+link_directories(${PROJECT_BINARY_DIR})
+
+# Load all of our third party directories
+add_subdirectory(thirdparty)
+if (UNIX)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+endif()
+# Glob together all headers that need to be precompiled
+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}/thirdparty/SQLite/*.h
+)
+
 file(
 	GLOB HEADERS_DZONEMANAGER
 	LIST_DIRECTORIES false
@@ -285,7 +320,7 @@ add_subdirectory(dPhysics)
 add_subdirectory(dServer)
 
 # Create a list of common libraries shared between all binaries
-set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "MariaDB::ConnCpp" "magic_enum" "nlohmann_json::nlohmann_json")
+set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "mariadbConnCpp" "magic_enum")
 
 # Add platform specific common libraries
 if(UNIX)
@@ -307,6 +342,12 @@ target_precompile_headers(
 	${HEADERS_DZONEMANAGER}
 )
 
+# Need to specify to use the CXX compiler language here or else we get errors including <string>.
+target_precompile_headers(
+	dDatabase PRIVATE
+	"$<$<COMPILE_LANGUAGE:CXX>:${HEADERS_DDATABASE}>"
+)
+
 target_precompile_headers(
 	dCommon PRIVATE
 	${HEADERS_DCOMMON}

Dockerfile

@@ -23,7 +23,8 @@ RUN --mount=type=cache,id=build-apt-cache,target=/var/cache/apt \
     rm -rf /var/lib/apt/lists/*
 
 # Grab libraries and load them
-COPY --from=build /app/build/mariadbcpp/libmariadbcpp.so /usr/local/lib/
+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

README.md

@@ -51,7 +51,7 @@ git clone --recursive https://github.com/DarkflameUniverse/DarkflameServer
 
 ### Windows packages
 Ensure that you have either the [MSVC C++ compiler](https://visualstudio.microsoft.com/vs/features/cplusplus/) (recommended) or the [Clang compiler](https://github.com/llvm/llvm-project/releases/) installed.
-You'll also need to download and install [CMake](https://cmake.org/download/) (version <font size="4">**CMake version 3.25**</font> or later!).
+You'll also need to download and install [CMake](https://cmake.org/download/) (version <font size="4">**CMake version 3.18**</font> or later!).
 
 ### MacOS packages
 Ensure you have [brew](https://brew.sh) installed.
@@ -73,7 +73,7 @@ sudo apt install build-essential gcc zlib1g-dev libssl-dev openssl mariadb-serve
 ```
 
 #### Required CMake version
-This project uses <font size="4">**CMake version 3.25**</font> or higher and as such you will need to ensure you have this version installed.
+This project uses <font size="4">**CMake version 3.18**</font> or higher and as such you will need to ensure you have this version installed.
 You can check your CMake version by using the following command in a terminal.
 ```bash
 cmake --version

cmake/FindGoogleTest.cmake

@@ -1,17 +0,0 @@
-include(FetchContent)
-
-message(STATUS "Fetching gtest...")
-
-FetchContent_Declare(
-	googletest
-	GIT_REPOSITORY https://github.com/google/googletest.git
-	GIT_TAG release-1.12.1
-)
-
-# For Windows: Prevent overriding the parent project's compiler/linker settings
-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-
-FetchContent_MakeAvailable(GoogleTest)
-
-message(STATUS "gtest fetched and is now ready.")
-set(GoogleTest_FOUND TRUE)

cmake/FindJSON.cmake

@@ -1,20 +0,0 @@
-include(FetchContent)
-
-message(STATUS "Fetching json...")
-
-FetchContent_Declare(
-	json
-	GIT_REPOSITORY https://github.com/nlohmann/json
-	GIT_TAG v3.11.3
-)
-
-FetchContent_GetProperties(json)
-if(NOT json_POPULATED)
-	FetchContent_Populate(json)
-	add_subdirectory(${json_SOURCE_DIR} ${json_BINARY_DIR} EXCLUDE_FROM_ALL)
-endif()
-
-FetchContent_MakeAvailable(json)
-
-message(STATUS "json fetched and is now ready.")
-set(JSON_FOUND TRUE)

dAuthServer/AuthServer.cpp

@@ -82,11 +82,11 @@ int main(int argc, char** argv) {
 	Game::randomEngine = std::mt19937(time(0));
 
 	//It's safe to pass 'localhost' here, as the IP is only used as the external IP.
+	uint32_t maxClients = 999;
+	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";
-	const uint32_t maxClients = GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("max_clients")).value_or(999);
-
-	//LU client is hardcoded to use this for auth port, so I'm making it the default.
-	const uint32_t ourPort = GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("auth_server_port")).value_or(1001);
+	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;
 

dChatFilter/dChatFilter.cpp

@@ -27,8 +27,8 @@ dChatFilter::dChatFilter(const std::string& filepath, bool dontGenerateDCF) {
 		ExportWordlistToDCF(filepath + ".dcf", true);
 	}
 
-	if (BinaryIO::DoesFileExist("blocklist.dcf")) {
-		ReadWordlistDCF("blocklist.dcf", false);
+	if (BinaryIO::DoesFileExist("blacklist.dcf")) {
+		ReadWordlistDCF("blacklist.dcf", false);
 	}
 
 	//Read player names that are ok as well:
@@ -44,20 +44,20 @@ dChatFilter::~dChatFilter() {
 	m_DeniedWords.clear();
 }
 
-void dChatFilter::ReadWordlistPlaintext(const std::string& filepath, bool allowList) {
+void dChatFilter::ReadWordlistPlaintext(const std::string& filepath, bool whiteList) {
 	std::ifstream file(filepath);
 	if (file) {
 		std::string line;
 		while (std::getline(file, line)) {
 			line.erase(std::remove(line.begin(), line.end(), '\r'), line.end());
 			std::transform(line.begin(), line.end(), line.begin(), ::tolower); //Transform to lowercase
-			if (allowList) m_ApprovedWords.push_back(CalculateHash(line));
+			if (whiteList) m_ApprovedWords.push_back(CalculateHash(line));
 			else m_DeniedWords.push_back(CalculateHash(line));
 		}
 	}
 }
 
-bool dChatFilter::ReadWordlistDCF(const std::string& filepath, bool allowList) {
+bool dChatFilter::ReadWordlistDCF(const std::string& filepath, bool whiteList) {
 	std::ifstream file(filepath, std::ios::binary);
 	if (file) {
 		fileHeader hdr;
@@ -70,13 +70,13 @@ bool dChatFilter::ReadWordlistDCF(const std::string& filepath, bool allowList) {
 		if (hdr.formatVersion == formatVersion) {
 			size_t wordsToRead = 0;
 			BinaryIO::BinaryRead(file, wordsToRead);
-			if (allowList) m_ApprovedWords.reserve(wordsToRead);
+			if (whiteList) m_ApprovedWords.reserve(wordsToRead);
 			else m_DeniedWords.reserve(wordsToRead);
 
 			size_t word = 0;
 			for (size_t i = 0; i < wordsToRead; ++i) {
 				BinaryIO::BinaryRead(file, word);
-				if (allowList) m_ApprovedWords.push_back(word);
+				if (whiteList) m_ApprovedWords.push_back(word);
 				else m_DeniedWords.push_back(word);
 			}
 
@@ -90,14 +90,14 @@ bool dChatFilter::ReadWordlistDCF(const std::string& filepath, bool allowList) {
 	return false;
 }
 
-void dChatFilter::ExportWordlistToDCF(const std::string& filepath, bool allowList) {
+void dChatFilter::ExportWordlistToDCF(const std::string& filepath, bool whiteList) {
 	std::ofstream file(filepath, std::ios::binary | std::ios_base::out);
 	if (file) {
 		BinaryIO::BinaryWrite(file, uint32_t(dChatFilterDCF::header));
 		BinaryIO::BinaryWrite(file, uint32_t(dChatFilterDCF::formatVersion));
-		BinaryIO::BinaryWrite(file, size_t(allowList ? m_ApprovedWords.size() : m_DeniedWords.size()));
+		BinaryIO::BinaryWrite(file, size_t(whiteList ? m_ApprovedWords.size() : m_DeniedWords.size()));
 
-		for (size_t word : allowList ? m_ApprovedWords : m_DeniedWords) {
+		for (size_t word : whiteList ? m_ApprovedWords : m_DeniedWords) {
 			BinaryIO::BinaryWrite(file, word);
 		}
 
@@ -105,10 +105,10 @@ void dChatFilter::ExportWordlistToDCF(const std::string& filepath, bool allowLis
 	}
 }
 
-std::vector<std::pair<uint8_t, uint8_t>> dChatFilter::IsSentenceOkay(const std::string& message, eGameMasterLevel gmLevel, bool allowList) {
+std::vector<std::pair<uint8_t, uint8_t>> dChatFilter::IsSentenceOkay(const std::string& message, eGameMasterLevel gmLevel, bool whiteList) {
 	if (gmLevel > eGameMasterLevel::FORUM_MODERATOR) return { }; //If anything but a forum mod, return true.
 	if (message.empty()) return { };
-	if (!allowList && m_DeniedWords.empty()) return { { 0, message.length() } };
+	if (!whiteList && m_DeniedWords.empty()) return { { 0, message.length() } };
 
 	std::stringstream sMessage(message);
 	std::string segment;
@@ -126,16 +126,16 @@ std::vector<std::pair<uint8_t, uint8_t>> dChatFilter::IsSentenceOkay(const std::
 
 		size_t hash = CalculateHash(segment);
 
-		if (std::find(m_UserUnapprovedWordCache.begin(), m_UserUnapprovedWordCache.end(), hash) != m_UserUnapprovedWordCache.end() && allowList) {
+		if (std::find(m_UserUnapprovedWordCache.begin(), m_UserUnapprovedWordCache.end(), hash) != m_UserUnapprovedWordCache.end() && whiteList) {
 			listOfBadSegments.emplace_back(position, originalSegment.length());
 		}
 
-		if (std::find(m_ApprovedWords.begin(), m_ApprovedWords.end(), hash) == m_ApprovedWords.end() && allowList) {
+		if (std::find(m_ApprovedWords.begin(), m_ApprovedWords.end(), hash) == m_ApprovedWords.end() && whiteList) {
 			m_UserUnapprovedWordCache.push_back(hash);
 			listOfBadSegments.emplace_back(position, originalSegment.length());
 		}
 
-		if (std::find(m_DeniedWords.begin(), m_DeniedWords.end(), hash) != m_DeniedWords.end() && !allowList) {
+		if (std::find(m_DeniedWords.begin(), m_DeniedWords.end(), hash) != m_DeniedWords.end() && !whiteList) {
 			m_UserUnapprovedWordCache.push_back(hash);
 			listOfBadSegments.emplace_back(position, originalSegment.length());
 		}

dChatFilter/dChatFilter.h

@@ -21,10 +21,10 @@ public:
 	dChatFilter(const std::string& filepath, bool dontGenerateDCF);
 	~dChatFilter();
 
-	void ReadWordlistPlaintext(const std::string& filepath, bool allowList);
-	bool ReadWordlistDCF(const std::string& filepath, bool allowList);
-	void ExportWordlistToDCF(const std::string& filepath, bool allowList);
-	std::vector<std::pair<uint8_t, uint8_t>> IsSentenceOkay(const std::string& message, eGameMasterLevel gmLevel, bool allowList = true);
+	void ReadWordlistPlaintext(const std::string& filepath, bool whiteList);
+	bool ReadWordlistDCF(const std::string& filepath, bool whiteList);
+	void ExportWordlistToDCF(const std::string& filepath, bool whiteList);
+	std::vector<std::pair<uint8_t, uint8_t>> IsSentenceOkay(const std::string& message, eGameMasterLevel gmLevel, bool whiteList = true);
 
 private:
 	bool m_DontGenerateDCF;

dChatServer/CMakeLists.txt

@@ -1,16 +1,13 @@
 set(DCHATSERVER_SOURCES
-	"ChatWebApi.cpp"
 	"ChatIgnoreList.cpp"
 	"ChatPacketHandler.cpp"
 	"PlayerContainer.cpp"
 )
 
 add_executable(ChatServer "ChatServer.cpp")
-target_include_directories(ChatServer PRIVATE "${PROJECT_SOURCE_DIR}/dChatFilter")
-add_compile_definitions(ChatServer PRIVATE PROJECT_VERSION="\"${PROJECT_VERSION}\"")
-
 add_library(dChatServer ${DCHATSERVER_SOURCES})
-target_include_directories(dChatServer PRIVATE "${PROJECT_SOURCE_DIR}/dServer")
+target_include_directories(dChatServer PRIVATE ${PROJECT_SOURCE_DIR}/dServer)
+add_compile_definitions(ChatServer PRIVATE PROJECT_VERSION="\"${PROJECT_VERSION}\"")
 
 target_link_libraries(dChatServer ${COMMON_LIBRARIES} dChatFilter)
 target_link_libraries(ChatServer ${COMMON_LIBRARIES} dChatFilter dChatServer dServer)

dChatServer/ChatIgnoreList.cpp

@@ -1,6 +1,6 @@
 #include "ChatIgnoreList.h"
 #include "PlayerContainer.h"
-#include "eChatMessageType.h"
+#include "eChatInternalMessageType.h"
 #include "BitStreamUtils.h"
 #include "Game.h"
 #include "Logger.h"
@@ -13,7 +13,7 @@
 // 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,  eChatMessageType::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receivingPlayer);
 
 	//portion that will get routed:
@@ -59,7 +59,7 @@ void ChatIgnoreList::GetIgnoreList(Packet* packet) {
 		bitStream.Write(LUWString(ignoredPlayer.playerName, 36));
 	}
 
-	Game::server->Send(bitStream, packet->systemAddress, false);
+	Game::server->Send(&bitStream, packet->systemAddress, false);
 }
 
 void ChatIgnoreList::AddIgnore(Packet* packet) {
@@ -131,7 +131,7 @@ void ChatIgnoreList::AddIgnore(Packet* packet) {
 	bitStream.Write(playerNameSend);
 	bitStream.Write(ignoredPlayerId);
 
-	Game::server->Send(bitStream, packet->systemAddress, false);
+	Game::server->Send(&bitStream, packet->systemAddress, false);
 }
 
 void ChatIgnoreList::RemoveIgnore(Packet* packet) {
@@ -167,5 +167,5 @@ void ChatIgnoreList::RemoveIgnore(Packet* packet) {
 	LUWString playerNameSend(removedIgnoreStr, 33);
 	bitStream.Write(playerNameSend);
 
-	Game::server->Send(bitStream, packet->systemAddress, false);
+	Game::server->Send(&bitStream, packet->systemAddress, false);
 }

dChatServer/ChatPacketHandler.cpp

@@ -14,11 +14,11 @@
 #include "eObjectBits.h"
 #include "eConnectionType.h"
 #include "eChatMessageType.h"
+#include "eChatInternalMessageType.h"
 #include "eClientMessageType.h"
 #include "eGameMessageType.h"
 #include "StringifiedEnum.h"
 #include "eGameMasterLevel.h"
-#include "ChatPackets.h"
 
 void ChatPacketHandler::HandleFriendlistRequest(Packet* packet) {
 	//Get from the packet which player we want to do something with:
@@ -60,7 +60,7 @@ void ChatPacketHandler::HandleFriendlistRequest(Packet* packet) {
 
 	//Now, we need to send the friendlist to the server they came from:
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(playerID);
 
 	//portion that will get routed:
@@ -355,67 +355,6 @@ void ChatPacketHandler::HandleGMLevelUpdate(Packet* packet) {
 	inStream.Read(player.gmLevel);
 }
 
-
-void ChatPacketHandler::HandleWho(Packet* packet) {
-	CINSTREAM_SKIP_HEADER;
-	FindPlayerRequest request;
-	request.Deserialize(inStream);
-
-	const auto& sender = Game::playerContainer.GetPlayerData(request.requestor);
-	if (!sender) return;
-
-	const auto& player = Game::playerContainer.GetPlayerData(request.playerName.GetAsString());
-	bool online = player;
-
-	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
-	bitStream.Write(request.requestor);
-
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::WHO_RESPONSE);
-	bitStream.Write<uint8_t>(online);
-	bitStream.Write(player.zoneID.GetMapID());
-	bitStream.Write(player.zoneID.GetInstanceID());
-	bitStream.Write(player.zoneID.GetCloneID());
-	bitStream.Write(request.playerName);
-
-	SystemAddress sysAddr = sender.sysAddr;
-	SEND_PACKET;
-}
-
-void ChatPacketHandler::HandleShowAll(Packet* packet) {
-	CINSTREAM_SKIP_HEADER;
-	ShowAllRequest request;
-	request.Deserialize(inStream);
-
-	const auto& sender = Game::playerContainer.GetPlayerData(request.requestor);
-	if (!sender) return;
-
-	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
-	bitStream.Write(request.requestor);
-
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::SHOW_ALL_RESPONSE);
-	bitStream.Write<uint8_t>(!request.displayZoneData && !request.displayIndividualPlayers);
-	bitStream.Write(Game::playerContainer.GetPlayerCount());
-	bitStream.Write(Game::playerContainer.GetSimCount());
-	bitStream.Write<uint8_t>(request.displayIndividualPlayers);
-	bitStream.Write<uint8_t>(request.displayZoneData);
-	if (request.displayZoneData || request.displayIndividualPlayers){
-		for (auto& [playerID, playerData ]: Game::playerContainer.GetAllPlayers()){
-			if (!playerData) continue;
-			bitStream.Write<uint8_t>(0); // structure packing
-			if (request.displayIndividualPlayers) bitStream.Write(LUWString(playerData.playerName));
-			if (request.displayZoneData) {
-				bitStream.Write(playerData.zoneID.GetMapID());
-				bitStream.Write(playerData.zoneID.GetInstanceID());
-				bitStream.Write(playerData.zoneID.GetCloneID());
-			}
-		}
-	}
-	SystemAddress sysAddr = sender.sysAddr;
-	SEND_PACKET;
-}
-
 // the structure the client uses to send this packet is shared in many chat messages 
 // that are sent to the server. Because of this, there are large gaps of unused data in chat messages
 void ChatPacketHandler::HandleChatMessage(Packet* packet) {
@@ -515,7 +454,7 @@ void ChatPacketHandler::HandlePrivateChatMessage(Packet* packet) {
 
 void ChatPacketHandler::SendPrivateChatMessage(const PlayerData& sender, const PlayerData& receiver, const PlayerData& routeTo, const LUWString& message, const eChatChannel channel, const eChatMessageResponseCode responseCode) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(routeTo.playerID);
 
 	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::PRIVATE_CHAT_MESSAGE);
@@ -757,7 +696,7 @@ void ChatPacketHandler::HandleTeamStatusRequest(Packet* packet) {
 
 void ChatPacketHandler::SendTeamInvite(const PlayerData& receiver, const PlayerData& sender) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver.playerID);
 
 	//portion that will get routed:
@@ -772,7 +711,7 @@ void ChatPacketHandler::SendTeamInvite(const PlayerData& receiver, const PlayerD
 
 void ChatPacketHandler::SendTeamInviteConfirm(const 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, eChatMessageType::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver.playerID);
 
 	//portion that will get routed:
@@ -799,7 +738,7 @@ void ChatPacketHandler::SendTeamInviteConfirm(const PlayerData& receiver, bool b
 
 void ChatPacketHandler::SendTeamStatus(const PlayerData& receiver, LWOOBJID i64LeaderID, LWOZONEID i64LeaderZoneID, uint8_t ucLootFlag, uint8_t ucNumOfOtherPlayers, std::u16string wsLeaderName) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver.playerID);
 
 	//portion that will get routed:
@@ -824,7 +763,7 @@ void ChatPacketHandler::SendTeamStatus(const PlayerData& receiver, LWOOBJID i64L
 
 void ChatPacketHandler::SendTeamSetLeader(const PlayerData& receiver, LWOOBJID i64PlayerID) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver.playerID);
 
 	//portion that will get routed:
@@ -841,7 +780,7 @@ void ChatPacketHandler::SendTeamSetLeader(const PlayerData& receiver, LWOOBJID i
 
 void ChatPacketHandler::SendTeamAddPlayer(const PlayerData& receiver, bool bIsFreeTrial, bool bLocal, bool bNoLootOnDeath, LWOOBJID i64PlayerID, std::u16string wsPlayerName, LWOZONEID zoneID) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver.playerID);
 
 	//portion that will get routed:
@@ -870,7 +809,7 @@ void ChatPacketHandler::SendTeamAddPlayer(const PlayerData& receiver, bool bIsFr
 
 void ChatPacketHandler::SendTeamRemovePlayer(const PlayerData& receiver, bool bDisband, bool bIsKicked, bool bIsLeaving, bool bLocal, LWOOBJID i64LeaderID, LWOOBJID i64PlayerID, std::u16string wsPlayerName) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver.playerID);
 
 	//portion that will get routed:
@@ -896,7 +835,7 @@ void ChatPacketHandler::SendTeamRemovePlayer(const PlayerData& receiver, bool bD
 
 void ChatPacketHandler::SendTeamSetOffWorldFlag(const PlayerData& receiver, LWOOBJID i64PlayerID, LWOZONEID zoneID) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver.playerID);
 
 	//portion that will get routed:
@@ -930,7 +869,7 @@ void ChatPacketHandler::SendFriendUpdate(const PlayerData& friendData, const Pla
 		[bool] - is FTP*/
 
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(friendData.playerID);
 
 	//portion that will get routed:
@@ -967,7 +906,7 @@ void ChatPacketHandler::SendFriendRequest(const PlayerData& receiver, const Play
 	}
 
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver.playerID);
 
 	//portion that will get routed:
@@ -981,7 +920,7 @@ void ChatPacketHandler::SendFriendRequest(const PlayerData& receiver, const Play
 
 void ChatPacketHandler::SendFriendResponse(const PlayerData& receiver, const PlayerData& sender, eAddFriendResponseType responseCode, uint8_t isBestFriendsAlready, uint8_t isBestFriendRequest) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver.playerID);
 
 	// Portion that will get routed:
@@ -1004,7 +943,7 @@ void ChatPacketHandler::SendFriendResponse(const PlayerData& receiver, const Pla
 
 void ChatPacketHandler::SendRemoveFriend(const PlayerData& receiver, std::string& personToRemove, bool isSuccessful) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
 	bitStream.Write(receiver.playerID);
 
 	//portion that will get routed:

dChatServer/ChatPacketHandler.h

@@ -50,8 +50,6 @@ namespace ChatPacketHandler {
 	void HandleFriendResponse(Packet* packet);
 	void HandleRemoveFriend(Packet* packet);
 	void HandleGMLevelUpdate(Packet* packet);
-	void HandleWho(Packet* packet);
-	void HandleShowAll(Packet* packet);
 
 	void HandleChatMessage(Packet* packet);
 	void HandlePrivateChatMessage(Packet* packet);

dChatServer/ChatServer.cpp

@@ -17,10 +17,10 @@
 #include "PlayerContainer.h"
 #include "ChatPacketHandler.h"
 #include "eChatMessageType.h"
+#include "eChatInternalMessageType.h"
 #include "eWorldMessageType.h"
 #include "ChatIgnoreList.h"
 #include "StringifiedEnum.h"
-#include "ChatWebApi.h"
 
 #include "Game.h"
 #include "Server.h"
@@ -37,7 +37,7 @@ namespace Game {
 	AssetManager* assetManager = nullptr;
 	Game::signal_t lastSignal = 0;
 	std::mt19937 randomEngine;
-	PlayerContainer playerContainer;	
+	PlayerContainer playerContainer;
 }
 
 void HandlePacket(Packet* packet);
@@ -99,15 +99,18 @@ int main(int argc, char** argv) {
 		masterPort = masterInfo->port;
 	}
 	//It's safe to pass 'localhost' here, as the IP is only used as the external IP.
+	uint32_t maxClients = 999;
+	uint32_t ourPort = 1501;
 	std::string ourIP = "localhost";
-	const uint32_t maxClients = GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("max_clients")).value_or(999);
-	const uint32_t ourPort = GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("chat_server_port")).value_or(2005);
+	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;
 
 	Game::server = new dServer(ourIP, ourPort, 0, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::Chat, Game::config, &Game::lastSignal);
 
-	const bool dontGenerateDCF = GeneralUtils::TryParse<bool>(Game::config->GetValue("dont_generate_dcf")).value_or(false);
+	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));
@@ -123,9 +126,6 @@ int main(int argc, char** argv) {
 	uint32_t framesSinceMasterDisconnect = 0;
 	uint32_t framesSinceLastSQLPing = 0;
 
-	// start the web api thread
-	std::thread webAPIThread(ChatWebApi::Listen, ourPort);
-
 	Game::logger->Flush(); // once immediately before main loop
 	while (!Game::ShouldShutdown()) {
 		//Check if we're still connected to master:
@@ -178,10 +178,6 @@ int main(int argc, char** argv) {
 	delete Game::server;
 	delete Game::logger;
 	delete Game::config;
-	
-	// rejoin the web api thread
-	ChatWebApi::Stop();
-	webAPIThread.join();
 
 	return EXIT_SUCCESS;
 }
@@ -189,29 +185,47 @@ int main(int argc, char** argv) {
 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.");
-	} else if (packet->data[0] == ID_NEW_INCOMING_CONNECTION) {
+	}
+
+	if (packet->data[0] == ID_NEW_INCOMING_CONNECTION) {
 		LOG("A server is connecting, awaiting user list.");
-	} else if (packet->length < 4 || packet->data[0] != ID_USER_PACKET_ENUM) return; // Nothing left to process or not the right packet type
+	}
 
-	CINSTREAM;
-	inStream.SetReadOffset(BYTES_TO_BITS(1));
+	if (packet->length < 4) return; // Nothing left to process.  Need 4 bytes to continue.
 
-	eConnectionType connection;
-	eChatMessageType chatMessageID;
+	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);
+			break;
 
-	inStream.Read(connection);
-	if (connection != eConnectionType::CHAT) return;
-	inStream.Read(chatMessageID);
-	
-	switch (chatMessageID) {
-		case eChatMessageType::GM_MUTE:
+		case eChatInternalMessageType::PLAYER_REMOVED_NOTIFICATION:
+			Game::playerContainer.RemovePlayer(packet);
+			break;
+
+		case eChatInternalMessageType::MUTE_UPDATE:
 			Game::playerContainer.MuteUpdate(packet);
 			break;
 
-		case eChatMessageType::CREATE_TEAM:
+		case eChatInternalMessageType::CREATE_TEAM:
 			Game::playerContainer.CreateTeamServer(packet);
 			break;
 
+		case eChatInternalMessageType::ANNOUNCEMENT: {
+			//we just forward this packet to every connected server
+			CINSTREAM;
+			Game::server->Send(&inStream, packet->systemAddress, true); //send to everyone except origin
+			break;
+		}
+
+		default:
+			LOG("Unknown CHAT_INTERNAL id: %i", int(packet->data[3]));
+		}
+	}
+
+	if (static_cast<eConnectionType>(packet->data[1]) == eConnectionType::CHAT) {
+		eChatMessageType chat_message_type = static_cast<eChatMessageType>(packet->data[3]);
+		switch (chat_message_type) {
 		case eChatMessageType::GET_FRIENDS_LIST:
 			ChatPacketHandler::HandleFriendlistRequest(packet);
 			break;
@@ -285,23 +299,6 @@ void HandlePacket(Packet* packet) {
 			ChatPacketHandler::HandleGMLevelUpdate(packet);
 			break;
 		case eChatMessageType::LOGIN_SESSION_NOTIFY:
-			Game::playerContainer.InsertPlayer(packet);
-			break;
-		case eChatMessageType::GM_ANNOUNCE:{
-			// we just forward this packet to every connected server
-			inStream.ResetReadPointer();
-			Game::server->Send(inStream, packet->systemAddress, true); // send to everyone except origin
-			}
-			break;
-		case eChatMessageType::UNEXPECTED_DISCONNECT:
-			Game::playerContainer.RemovePlayer(packet);
-			break;
-		case eChatMessageType::WHO:
-			ChatPacketHandler::HandleWho(packet);
-			break;
-		case eChatMessageType::SHOW_ALL:
-			ChatPacketHandler::HandleShowAll(packet);
-			break;
 		case eChatMessageType::USER_CHANNEL_CHAT_MESSAGE:
 		case eChatMessageType::WORLD_DISCONNECT_REQUEST:
 		case eChatMessageType::WORLD_PROXIMITY_RESPONSE:
@@ -314,6 +311,7 @@ void HandlePacket(Packet* packet) {
 		case eChatMessageType::GUILD_KICK:
 		case eChatMessageType::GUILD_GET_STATUS:
 		case eChatMessageType::GUILD_GET_ALL:
+		case eChatMessageType::SHOW_ALL:
 		case eChatMessageType::BLUEPRINT_MODERATED:
 		case eChatMessageType::BLUEPRINT_MODEL_READY:
 		case eChatMessageType::PROPERTY_READY_FOR_APPROVAL:
@@ -328,6 +326,7 @@ void HandlePacket(Packet* packet) {
 		case eChatMessageType::CSR_REQUEST:
 		case eChatMessageType::CSR_REPLY:
 		case eChatMessageType::GM_KICK:
+		case eChatMessageType::GM_ANNOUNCE:
 		case eChatMessageType::WORLD_ROUTE_PACKET:
 		case eChatMessageType::GET_ZONE_POPULATIONS:
 		case eChatMessageType::REQUEST_MINIMUM_CHAT_MODE:
@@ -336,18 +335,33 @@ void HandlePacket(Packet* packet) {
 		case eChatMessageType::UGCMANIFEST_REPORT_DONE_FILE:
 		case eChatMessageType::UGCMANIFEST_REPORT_DONE_BLUEPRINT:
 		case eChatMessageType::UGCC_REQUEST:
+		case eChatMessageType::WHO:
 		case eChatMessageType::WORLD_PLAYERS_PET_MODERATED_ACKNOWLEDGE:
 		case eChatMessageType::ACHIEVEMENT_NOTIFY:
 		case eChatMessageType::GM_CLOSE_PRIVATE_CHAT_WINDOW:
+		case eChatMessageType::UNEXPECTED_DISCONNECT:
 		case eChatMessageType::PLAYER_READY:
 		case eChatMessageType::GET_DONATION_TOTAL:
 		case eChatMessageType::UPDATE_DONATION:
 		case eChatMessageType::PRG_CSR_COMMAND:
 		case eChatMessageType::HEARTBEAT_REQUEST_FROM_WORLD:
 		case eChatMessageType::UPDATE_FREE_TRIAL_STATUS:
-			LOG("Unhandled CHAT Message id: %s (%i)", StringifiedEnum::ToString(chatMessageID).data(), chatMessageID);
+			LOG("Unhandled CHAT Message id: %s (%i)", StringifiedEnum::ToString(chat_message_type).data(), chat_message_type);
 			break;
 		default:
-			LOG("Unknown CHAT Message id: %i", chatMessageID);
+			LOG("Unknown CHAT Message id: %i", chat_message_type);
+		}
+	}
+
+	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");
+			break;
+		}
+
+		default:
+			LOG("Unknown World id: %i", int(packet->data[3]));
+		}
 	}
 }

dChatServer/ChatWebApi.cpp

@@ -1,93 +0,0 @@
-#include "ChatWebApi.h"
-
-#include <cstdint>
-
-#include "dCommonVars.h"
-#include "eConnectionType.h"
-#include "eChatMessageType.h"
-#include "httplib.h"
-#include "dServer.h"
-#include "PlayerContainer.h"
-#include "dConfig.h"
-#include "httplib.h"
-#include "nlohmann/json.hpp"
-
-using json = nlohmann::json;
-
-namespace {
-	httplib::Server m_APIServer;
-}
-
-void ChatWebApi::Listen(const uint32_t port) {
-	if (Game::config->GetValue("enable_chat_web_api") != "1") {
-		LOG("Chat Web API is disabled");
-		return;
-	}
-	LOG("Chat Web API is enabled, starting web server...");
-
-	m_APIServer.Post("/announce", [](const httplib::Request& req, httplib::Response& res) {
-		const json data = json::parse(req.body);
-		if (!data.contains("title")) {
-			res.set_content("{\"error\":\"Missing paramater: title\"}", "application/json");
-			res.status = 400;
-			return;
-		}
-		std::string title = data["title"];
-		if (!data.contains("message")) {
-			res.set_content("{\"error\":\"Missing paramater: message\"}", "application/json");
-			res.status = 400;
-			return;
-		}
-		std::string message = data["message"];
-		// build and send the packet to all world servers
-		CBITSTREAM;
-		BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::GM_ANNOUNCE);
-		bitStream.Write<uint32_t>(title.size());
-		bitStream.Write(title);
-		bitStream.Write<uint32_t>(message.size());
-		bitStream.Write(message);
-		Game::server->Send(bitStream, UNASSIGNED_SYSTEM_ADDRESS, true);
-	});
-
-	m_APIServer.Get("/players", [](const httplib::Request& req, httplib::Response& res) {
-		auto data = json::array();
-		for (auto& [playerID, playerData ]: Game::playerContainer.GetAllPlayers()){
-			if (!playerData) continue;
-			data.push_back(playerData.to_json());
-		}
-		res.set_content(data.dump(), "application/json");
-		if (data.empty()) res.status = 204;
-	});
-
-	m_APIServer.Get("/teams", [](const httplib::Request& req, httplib::Response& res) {
-		auto data = json::array();
-		for (auto& teamData: Game::playerContainer.GetAllTeams()){
-			if (!teamData) continue;
-			json toInsert;
-			toInsert["id"] = teamData->teamID;
-			toInsert["loot_flag"] = teamData->lootFlag;
-			toInsert["local"] = teamData->local;
-
-			auto& leader = Game::playerContainer.GetPlayerData(teamData->leaderID);
-			toInsert["leader"] = leader.to_json();
-
-			json members;
-			for (auto& member : teamData->memberIDs){
-				auto playerData = Game::playerContainer.GetPlayerData(member);
-				if (!playerData) continue;
-				members.push_back(playerData.to_json());
-			}
-			toInsert["members"] = members;
-			data.push_back(toInsert);
-		}
-		res.set_content(data.dump(), "application/json");
-		if (data.empty()) res.status = 204;
-	});
-
-	m_APIServer.listen(Game::config->GetValue("chat_web_api_listen_address").c_str(), port);
-};
-
-void ChatWebApi::Stop(){
-	LOG("Stopping Chat Web API server...");
-	m_APIServer.stop();
-}

dChatServer/ChatWebApi.h

@@ -1,6 +0,0 @@
-#include <cstdint>
-
-namespace ChatWebApi {
-	void Listen(const uint32_t port);
-	void Stop();
-};

dChatServer/PlayerContainer.cpp

@@ -1,9 +1,7 @@
 #include "PlayerContainer.h"
-
+#include "dNetCommon.h"
 #include <iostream>
 #include <algorithm>
-
-#include "dNetCommon.h"
 #include "Game.h"
 #include "Logger.h"
 #include "ChatPacketHandler.h"
@@ -11,32 +9,22 @@
 #include "BitStreamUtils.h"
 #include "Database.h"
 #include "eConnectionType.h"
+#include "eChatInternalMessageType.h"
+#include "eGameMasterLevel.h"
 #include "ChatPackets.h"
 #include "dConfig.h"
-#include "eChatMessageType.h"	
-
-using json = nlohmann::json;
-
-const json PlayerData::to_json() const {
-	json data;
-	data["id"] = this->playerID;
-	data["name"] = this->playerName;
-	data["gm_level"] = this->gmLevel;
-	data["muted"] = this->GetIsMuted();
-
-	json zoneID;
-	zoneID["map_id"] = std::to_string(this->zoneID.GetMapID());
-	zoneID["instance_id"] = std::to_string(this->zoneID.GetInstanceID());
-	zoneID["clone_id"] = std::to_string(this->zoneID.GetCloneID());
-	data["zone_id"] = zoneID;
-	return data;
-}
 
 void PlayerContainer::Initialize() {
-	m_MaxNumberOfBestFriends =
-		GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("max_number_of_best_friends")).value_or(m_MaxNumberOfBestFriends);
-	m_MaxNumberOfFriends =
-		GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("max_number_of_friends")).value_or(m_MaxNumberOfFriends);
+	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() {
+	m_Players.clear();
+}
+
+PlayerData::PlayerData() {
+	gmLevel = eGameMasterLevel::CIVILIAN;
 }
 
 TeamData::TeamData() {
@@ -68,7 +56,6 @@ void PlayerContainer::InsertPlayer(Packet* packet) {
 	data.sysAddr = packet->systemAddress;
 
 	m_Names[data.playerID] = GeneralUtils::UTF8ToUTF16(data.playerName);
-	m_PlayerCount++;
 
 	LOG("Added user: %s (%llu), zone: %i", data.playerName.c_str(), data.playerID, data.zoneID.GetMapID());
 
@@ -107,7 +94,6 @@ void PlayerContainer::RemovePlayer(Packet* packet) {
 		}
 	}
 
-	m_PlayerCount--;
 	LOG("Removed user: %llu", playerID);
 	m_Players.erase(playerID);
 
@@ -166,12 +152,12 @@ void PlayerContainer::CreateTeamServer(Packet* packet) {
 
 void PlayerContainer::BroadcastMuteUpdate(LWOOBJID player, time_t time) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::GM_MUTE);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::MUTE_UPDATE);
 
 	bitStream.Write(player);
 	bitStream.Write(time);
 
-	Game::server->Send(bitStream, UNASSIGNED_SYSTEM_ADDRESS, true);
+	Game::server->Send(&bitStream, UNASSIGNED_SYSTEM_ADDRESS, true);
 }
 
 TeamData* PlayerContainer::CreateLocalTeam(std::vector<LWOOBJID> members) {
@@ -373,7 +359,7 @@ void PlayerContainer::TeamStatusUpdate(TeamData* team) {
 
 void PlayerContainer::UpdateTeamsOnWorld(TeamData* team, bool deleteTeam) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::TEAM_GET_STATUS);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::TEAM_UPDATE);
 
 	bitStream.Write(team->teamID);
 	bitStream.Write(deleteTeam);
@@ -386,7 +372,7 @@ void PlayerContainer::UpdateTeamsOnWorld(TeamData* team, bool deleteTeam) {
 		}
 	}
 
-	Game::server->Send(bitStream, UNASSIGNED_SYSTEM_ADDRESS, true);
+	Game::server->Send(&bitStream, UNASSIGNED_SYSTEM_ADDRESS, true);
 }
 
 std::u16string PlayerContainer::GetName(LWOOBJID playerID) {
@@ -411,7 +397,7 @@ LWOOBJID PlayerContainer::GetId(const std::u16string& playerName) {
 }
 
 PlayerData& PlayerContainer::GetPlayerDataMutable(const LWOOBJID& playerID) {
-	return m_Players.contains(playerID) ? m_Players[playerID] : m_Players[LWOOBJID_EMPTY];
+	return m_Players[playerID];
 }
 
 PlayerData& PlayerContainer::GetPlayerDataMutable(const std::string& playerName) {

dChatServer/PlayerContainer.h

@@ -6,12 +6,11 @@
 #include "Game.h"
 #include "dServer.h"
 #include <unordered_map>
-#include "nlohmann/json.hpp"
 
 enum class eGameMasterLevel : uint8_t;
 
 struct IgnoreData {
-	IgnoreData(const std::string& name, const LWOOBJID& id) : playerName{ name }, playerId{ id } {}
+	IgnoreData(const std::string& name, const LWOOBJID& id) : playerName(name), playerId(id) {}
 	inline bool operator==(const std::string& other) const noexcept {
 		return playerName == other;
 	}
@@ -25,6 +24,7 @@ struct IgnoreData {
 };
 
 struct PlayerData {
+	PlayerData();
 	operator bool() const noexcept {
 		return playerID != LWOOBJID_EMPTY;
 	}
@@ -37,8 +37,6 @@ struct PlayerData {
 		return muteExpire == 1 || muteExpire > time(NULL);
 	}
 
-	const nlohmann::json to_json() const;
-
 	SystemAddress sysAddr{};
 	LWOZONEID zoneID{};
 	LWOOBJID playerID = LWOOBJID_EMPTY;
@@ -47,7 +45,7 @@ struct PlayerData {
 	std::string playerName;
 	std::vector<FriendData> friends;
 	std::vector<IgnoreData> ignoredPlayers;
-	eGameMasterLevel gmLevel = static_cast<eGameMasterLevel>(0); // CIVILLIAN
+	eGameMasterLevel gmLevel;
 	bool isFTP = false;
 };
 
@@ -63,6 +61,8 @@ struct TeamData {
 
 class PlayerContainer {
 public:
+	~PlayerContainer();
+
 	void Initialize();
 	void InsertPlayer(Packet* packet);
 	void RemovePlayer(Packet* packet);
@@ -74,9 +74,6 @@ public:
 	const PlayerData& GetPlayerData(const std::string& playerName);
 	PlayerData& GetPlayerDataMutable(const LWOOBJID& playerID);
 	PlayerData& GetPlayerDataMutable(const std::string& playerName);
-	uint32_t GetPlayerCount() { return m_PlayerCount; };
-	uint32_t GetSimCount() { return m_SimCount; };
-	const std::map<LWOOBJID, PlayerData>& GetAllPlayers() { return m_Players; };
 
 	TeamData* CreateLocalTeam(std::vector<LWOOBJID> members);
 	TeamData* CreateTeam(LWOOBJID leader, bool local = false);
@@ -91,7 +88,6 @@ public:
 	LWOOBJID GetId(const std::u16string& playerName);
 	uint32_t GetMaxNumberOfBestFriends() { return m_MaxNumberOfBestFriends; }
 	uint32_t GetMaxNumberOfFriends() { return m_MaxNumberOfFriends; }
-	const std::vector<TeamData*>& GetAllTeams() { return mTeams;};
 
 private:
 	LWOOBJID m_TeamIDCounter = 0;
@@ -100,7 +96,5 @@ private:
 	std::unordered_map<LWOOBJID, std::u16string> m_Names;
 	uint32_t m_MaxNumberOfBestFriends = 5;
 	uint32_t m_MaxNumberOfFriends = 50;
-	uint32_t m_PlayerCount = 0;
-	uint32_t m_SimCount = 0;
 };
 

dCommon/AMFDeserialize.cpp

@@ -9,11 +9,12 @@
  * AMF3 Deserializer written by EmosewaMC
  */
 
-AMFBaseValue* AMFDeserialize::Read(RakNet::BitStream& inStream) {
+AMFBaseValue* AMFDeserialize::Read(RakNet::BitStream* inStream) {
+	if (!inStream) return nullptr;
 	AMFBaseValue* returnValue = nullptr;
 	// Read in the value type from the bitStream
 	eAmf marker;
-	inStream.Read(marker);
+	inStream->Read(marker);
 	// Based on the typing, create the value associated with that and return the base value class
 	switch (marker) {
 	case eAmf::Undefined: {
@@ -78,13 +79,13 @@ AMFBaseValue* AMFDeserialize::Read(RakNet::BitStream& inStream) {
 	return returnValue;
 }
 
-uint32_t AMFDeserialize::ReadU29(RakNet::BitStream& inStream) {
+uint32_t AMFDeserialize::ReadU29(RakNet::BitStream* inStream) {
 	bool byteFlag = true;
 	uint32_t actualNumber{};
 	uint8_t numberOfBytesRead{};
 	while (byteFlag && numberOfBytesRead < 4) {
 		uint8_t byte{};
-		inStream.Read(byte);
+		inStream->Read(byte);
 		// Parse the byte
 		if (numberOfBytesRead < 3) {
 			byteFlag = byte & static_cast<uint8_t>(1 << 7);
@@ -100,7 +101,7 @@ uint32_t AMFDeserialize::ReadU29(RakNet::BitStream& inStream) {
 	return actualNumber;
 }
 
-const std::string AMFDeserialize::ReadString(RakNet::BitStream& inStream) {
+const std::string AMFDeserialize::ReadString(RakNet::BitStream* inStream) {
 	auto length = ReadU29(inStream);
 	// Check if this is a reference
 	bool isReference = length % 2 == 1;
@@ -108,7 +109,7 @@ const std::string AMFDeserialize::ReadString(RakNet::BitStream& inStream) {
 	length = length >> 1;
 	if (isReference) {
 		std::string value(length, 0);
-		inStream.Read(&value[0], length);
+		inStream->Read(&value[0], length);
 		// Empty strings are never sent by reference
 		if (!value.empty()) accessedElements.push_back(value);
 		return value;
@@ -118,20 +119,20 @@ const std::string AMFDeserialize::ReadString(RakNet::BitStream& inStream) {
 	}
 }
 
-AMFBaseValue* AMFDeserialize::ReadAmfDouble(RakNet::BitStream& inStream) {
+AMFBaseValue* AMFDeserialize::ReadAmfDouble(RakNet::BitStream* inStream) {
 	double value;
-	inStream.Read<double>(value);
+	inStream->Read<double>(value);
 	return new AMFDoubleValue(value);
 }
 
-AMFBaseValue* AMFDeserialize::ReadAmfArray(RakNet::BitStream& inStream) {
+AMFBaseValue* AMFDeserialize::ReadAmfArray(RakNet::BitStream* inStream) {
 	auto arrayValue = new AMFArrayValue();
 
 	// Read size of dense array
-	const auto sizeOfDenseArray = (ReadU29(inStream) >> 1);
+	auto sizeOfDenseArray = (ReadU29(inStream) >> 1);
 	// Then read associative portion
 	while (true) {
-		const auto key = ReadString(inStream);
+		auto key = ReadString(inStream);
 		// No more associative values when we encounter an empty string key
 		if (key.size() == 0) break;
 		arrayValue->Insert(key, Read(inStream));
@@ -143,10 +144,10 @@ AMFBaseValue* AMFDeserialize::ReadAmfArray(RakNet::BitStream& inStream) {
 	return arrayValue;
 }
 
-AMFBaseValue* AMFDeserialize::ReadAmfString(RakNet::BitStream& inStream) {
+AMFBaseValue* AMFDeserialize::ReadAmfString(RakNet::BitStream* inStream) {
 	return new AMFStringValue(ReadString(inStream));
 }
 
-AMFBaseValue* AMFDeserialize::ReadAmfInteger(RakNet::BitStream& inStream) {
+AMFBaseValue* AMFDeserialize::ReadAmfInteger(RakNet::BitStream* inStream) {
 	return new AMFIntValue(ReadU29(inStream));
 }

dCommon/AMFDeserialize.h

@@ -15,7 +15,7 @@ public:
 	 * @param inStream inStream to read value from.
 	 * @return Returns an AMFValue with all the information from the bitStream in it.
 	 */
-	AMFBaseValue* Read(RakNet::BitStream& inStream);
+	AMFBaseValue* Read(RakNet::BitStream* inStream);
 private:
 	/**
 	 * @brief Private method to read a U29 integer from a bitstream
@@ -23,7 +23,7 @@ private:
 	 * @param inStream bitstream to read data from
 	 * @return The number as an unsigned 29 bit integer
 	 */
-	static uint32_t ReadU29(RakNet::BitStream& inStream);
+	uint32_t ReadU29(RakNet::BitStream* inStream);
 
 	/**
 	 * @brief Reads a string from a bitstream
@@ -31,7 +31,7 @@ private:
 	 * @param inStream bitStream to read data from
 	 * @return The read string
 	 */
-	const std::string ReadString(RakNet::BitStream& inStream);
+	const std::string ReadString(RakNet::BitStream* inStream);
 
 	/**
 	 * @brief Read an AMFDouble value from a bitStream
@@ -39,7 +39,7 @@ private:
 	 * @param inStream bitStream to read data from
 	 * @return Double value represented as an AMFValue
 	 */
-	AMFBaseValue* ReadAmfDouble(RakNet::BitStream& inStream);
+	AMFBaseValue* ReadAmfDouble(RakNet::BitStream* inStream);
 
 	/**
 	 * @brief Read an AMFArray from a bitStream
@@ -47,7 +47,7 @@ private:
 	 * @param inStream bitStream to read data from
 	 * @return Array value represented as an AMFValue
 	 */
-	AMFBaseValue* ReadAmfArray(RakNet::BitStream& inStream);
+	AMFBaseValue* ReadAmfArray(RakNet::BitStream* inStream);
 
 	/**
 	 * @brief Read an AMFString from a bitStream
@@ -55,7 +55,7 @@ private:
 	 * @param inStream bitStream to read data from
 	 * @return String value represented as an AMFValue
 	 */
-	AMFBaseValue* ReadAmfString(RakNet::BitStream& inStream);
+	AMFBaseValue* ReadAmfString(RakNet::BitStream* inStream);
 
 	/**
 	 * @brief Read an AMFInteger from a bitStream
@@ -63,7 +63,7 @@ private:
 	 * @param inStream bitStream to read data from
 	 * @return Integer value represented as an AMFValue
 	 */
-	AMFBaseValue* ReadAmfInteger(RakNet::BitStream& inStream);
+	AMFBaseValue* ReadAmfInteger(RakNet::BitStream* inStream);
 
 	/**
 	 * List of strings read so far saved to be read by reference.

dCommon/Amf3.h

@@ -31,70 +31,54 @@ enum class eAmf : uint8_t {
 
 class AMFBaseValue {
 public:
-	[[nodiscard]] constexpr virtual eAmf GetValueType() const noexcept { return eAmf::Undefined; }
-	constexpr AMFBaseValue() noexcept = default;
-	constexpr virtual ~AMFBaseValue() noexcept = default;
+	virtual eAmf GetValueType() { return eAmf::Undefined; };
+	AMFBaseValue() {};
+	virtual ~AMFBaseValue() {};
 };
 
-// AMFValue template class instantiations
-template <typename ValueType>
+template<typename ValueType>
 class AMFValue : public AMFBaseValue {
 public:
-	AMFValue() = default;
-	AMFValue(const ValueType value) : m_Data{ value } {}
+	AMFValue() {};
+	AMFValue(ValueType value) { SetValue(value); };
+	virtual ~AMFValue() override {};
 
-	virtual ~AMFValue() override = default;
-
-	[[nodiscard]] constexpr eAmf GetValueType() const noexcept override;
-
-	[[nodiscard]] const ValueType& GetValue() const { return m_Data; }
-
-	void SetValue(const ValueType value) { m_Data = value; }
+	eAmf GetValueType() override { return eAmf::Undefined; };
 
+	const ValueType& GetValue() { return data; };
+	void SetValue(ValueType value) { data = value; };
 protected:
-	ValueType m_Data;
+	ValueType data;
 };
 
-// Explicit template class instantiations
-template class AMFValue<std::nullptr_t>;
-template class AMFValue<bool>;
-template class AMFValue<int32_t>;
-template class AMFValue<uint32_t>;
-template class AMFValue<std::string>;
-template class AMFValue<double>;
-
-// AMFValue template class member function instantiations
-template <> [[nodiscard]] constexpr eAmf AMFValue<std::nullptr_t>::GetValueType() const noexcept { return eAmf::Null; }
-template <> [[nodiscard]] constexpr eAmf AMFValue<bool>::GetValueType() const noexcept { return m_Data ? eAmf::True : eAmf::False; }
-template <> [[nodiscard]] constexpr eAmf AMFValue<int32_t>::GetValueType() const noexcept { return eAmf::Integer; }
-template <> [[nodiscard]] constexpr eAmf AMFValue<uint32_t>::GetValueType() const noexcept { return eAmf::Integer; }
-template <> [[nodiscard]] constexpr eAmf AMFValue<std::string>::GetValueType() const noexcept { return eAmf::String; }
-template <> [[nodiscard]] constexpr eAmf AMFValue<double>::GetValueType() const noexcept { return eAmf::Double; }
-
-template <typename ValueType>
-[[nodiscard]] constexpr eAmf AMFValue<ValueType>::GetValueType() const noexcept { return eAmf::Undefined; }
-
 // As a string this is much easier to write and read from a BitStream.
-template <>
+template<>
 class AMFValue<const char*> : public AMFBaseValue {
 public:
-	AMFValue() = default;
-	AMFValue(const char* value) { m_Data = value; }
-	virtual ~AMFValue() override = default;
+	AMFValue() {};
+	AMFValue(const char* value) { SetValue(std::string(value)); };
+	virtual ~AMFValue() override {};
 
-	[[nodiscard]] constexpr eAmf GetValueType() const noexcept override { return eAmf::String; }
+	eAmf GetValueType() override { return eAmf::String; };
 
-	[[nodiscard]] const std::string& GetValue() const { return m_Data; }
-	void SetValue(const std::string& value) { m_Data = value; }
+	const std::string& GetValue() { return data; };
+	void SetValue(std::string value) { data = value; };
 protected:
-	std::string m_Data;
+	std::string data;
 };
 
-using AMFNullValue = AMFValue<std::nullptr_t>;
-using AMFBoolValue = AMFValue<bool>;
-using AMFIntValue = AMFValue<int32_t>;
-using AMFStringValue = AMFValue<std::string>;
-using AMFDoubleValue = AMFValue<double>;
+typedef AMFValue<std::nullptr_t> AMFNullValue;
+typedef AMFValue<bool> AMFBoolValue;
+typedef AMFValue<int32_t> AMFIntValue;
+typedef AMFValue<std::string> AMFStringValue;
+typedef AMFValue<double> AMFDoubleValue;
+
+template<> inline eAmf AMFValue<std::nullptr_t>::GetValueType() { return eAmf::Null; };
+template<> inline eAmf AMFValue<bool>::GetValueType() { return this->data ? eAmf::True : eAmf::False; };
+template<> inline eAmf AMFValue<int32_t>::GetValueType() { return eAmf::Integer; };
+template<> inline eAmf AMFValue<uint32_t>::GetValueType() { return eAmf::Integer; };
+template<> inline eAmf AMFValue<std::string>::GetValueType() { return eAmf::String; };
+template<> inline eAmf AMFValue<double>::GetValueType() { return eAmf::Double; };
 
 /**
  * The AMFArrayValue object holds 2 types of lists:
@@ -105,14 +89,15 @@ using AMFDoubleValue = AMFValue<double>;
  * and are not to be deleted by a caller.
  */
 class AMFArrayValue : public AMFBaseValue {
-	using AMFAssociative = std::unordered_map<std::string, AMFBaseValue*>;
-	using AMFDense = std::vector<AMFBaseValue*>;
+
+	typedef std::unordered_map<std::string, AMFBaseValue*> AMFAssociative;
+	typedef std::vector<AMFBaseValue*> AMFDense;
 
 public:
-	[[nodiscard]] constexpr eAmf GetValueType() const noexcept override { return eAmf::Array; }
+	eAmf GetValueType() override { return eAmf::Array; };
 
 	~AMFArrayValue() override {
-		for (const auto* valueToDelete : GetDense()) {
+		for (auto valueToDelete : GetDense()) {
 			if (valueToDelete) {
 				delete valueToDelete;
 				valueToDelete = nullptr;
@@ -124,17 +109,17 @@ public:
 				valueToDelete.second = nullptr;
 			}
 		}
-	}
+	};
 
 	/**
 	 * Returns the Associative portion of the object
 	 */
-	[[nodiscard]] inline const AMFAssociative& GetAssociative() const noexcept { return m_Associative; }
+	inline AMFAssociative& GetAssociative() { return this->associative; };
 
 	/**
 	 * Returns the dense portion of the object
 	 */
-	[[nodiscard]] inline const AMFDense& GetDense() const noexcept { return m_Dense; }
+	inline AMFDense& GetDense() { return this->dense; };
 
 	/**
 	 * Inserts an AMFValue into the associative portion with the given key.
@@ -150,48 +135,48 @@ public:
 	 * @return The inserted element if the type matched,
 	 * or nullptr if a key existed and was not the same type
 	 */
-	template <typename ValueType>
-	[[maybe_unused]] std::pair<AMFValue<ValueType>*, bool> Insert(const std::string& key, const ValueType value) {
-		const auto element = m_Associative.find(key);
+	template<typename ValueType>
+	std::pair<AMFValue<ValueType>*, bool> Insert(const std::string& key, ValueType value) {
+		auto element = associative.find(key);
 		AMFValue<ValueType>* val = nullptr;
 		bool found = true;
-		if (element == m_Associative.cend()) {
+		if (element == associative.end()) {
 			val = new AMFValue<ValueType>(value);
-			m_Associative.emplace(key, val);
+			associative.insert(std::make_pair(key, val));
 		} else {
 			val = dynamic_cast<AMFValue<ValueType>*>(element->second);
 			found = false;
 		}
 		return std::make_pair(val, found);
-	}
+	};
 
 	// Associates an array with a string key
-	[[maybe_unused]] std::pair<AMFBaseValue*, bool> Insert(const std::string& key) {
-		const auto element = m_Associative.find(key);
+	std::pair<AMFBaseValue*, bool> Insert(const std::string& key) {
+		auto element = associative.find(key);
 		AMFArrayValue* val = nullptr;
 		bool found = true;
-		if (element == m_Associative.cend()) {
+		if (element == associative.end()) {
 			val = new AMFArrayValue();
-			m_Associative.emplace(key, val);
+			associative.insert(std::make_pair(key, val));
 		} else {
 			val = dynamic_cast<AMFArrayValue*>(element->second);
 			found = false;
 		}
 		return std::make_pair(val, found);
-	}
+	};
 
 	// Associates an array with an integer key
-	[[maybe_unused]] std::pair<AMFBaseValue*, bool> Insert(const size_t index) {
+	std::pair<AMFBaseValue*, bool> Insert(const uint32_t& index) {
 		AMFArrayValue* val = nullptr;
 		bool inserted = false;
-		if (index >= m_Dense.size()) {
-			m_Dense.resize(index + 1);
+		if (index >= dense.size()) {
+			dense.resize(index + 1);
 			val = new AMFArrayValue();
-			m_Dense.at(index) = val;
+			dense.at(index) = val;
 			inserted = true;
 		}
-		return std::make_pair(dynamic_cast<AMFArrayValue*>(m_Dense.at(index)), inserted);
-	}
+		return std::make_pair(dynamic_cast<AMFArrayValue*>(dense.at(index)), inserted);
+	};
 
 	/**
 	 * @brief Inserts an AMFValue into the AMFArray key'd by index.
@@ -203,18 +188,18 @@ public:
 	 * @return The inserted element, or nullptr if the type did not match
 	 * what was at the index.
 	 */
-	template <typename ValueType>
-	[[maybe_unused]] std::pair<AMFValue<ValueType>*, bool> Insert(const size_t index, const ValueType value) {
+	template<typename ValueType>
+	std::pair<AMFValue<ValueType>*, bool> Insert(const uint32_t& index, ValueType value) {
 		AMFValue<ValueType>* val = nullptr;
 		bool inserted = false;
-		if (index >= m_Dense.size()) {
-			m_Dense.resize(index + 1);
+		if (index >= this->dense.size()) {
+			this->dense.resize(index + 1);
 			val = new AMFValue<ValueType>(value);
-			m_Dense.at(index) = val;
+			this->dense.at(index) = val;
 			inserted = true;
 		}
-		return std::make_pair(dynamic_cast<AMFValue<ValueType>*>(m_Dense.at(index)), inserted);
-	}
+		return std::make_pair(dynamic_cast<AMFValue<ValueType>*>(this->dense.at(index)), inserted);
+	};
 
 	/**
 	 * Inserts an AMFValue into the associative portion with the given key.
@@ -225,15 +210,15 @@ public:
 	 * @param key The key to associate with the value
 	 * @param value The value to insert
 	 */
-	void Insert(const std::string& key, AMFBaseValue* const value) {
-		const auto element = m_Associative.find(key);
-		if (element != m_Associative.cend() && element->second) {
+	void Insert(const std::string& key, AMFBaseValue* value) {
+		auto element = associative.find(key);
+		if (element != associative.end() && element->second) {
 			delete element->second;
 			element->second = value;
 		} else {
-			m_Associative.emplace(key, value);
+			associative.insert(std::make_pair(key, value));
 		}
-	}
+	};
 
 	/**
 	 * Inserts an AMFValue into the associative portion with the given index.
@@ -244,15 +229,15 @@ public:
 	 * @param key The key to associate with the value
 	 * @param value The value to insert
 	 */
-	void Insert(const size_t index, AMFBaseValue* const value) {
-		if (index < m_Dense.size()) {
-			const AMFDense::const_iterator itr = m_Dense.cbegin() + index;
-			if (*itr) delete m_Dense.at(index);
+	void Insert(const uint32_t index, AMFBaseValue* value) {
+		if (index < dense.size()) {
+			AMFDense::iterator itr = dense.begin() + index;
+			if (*itr) delete dense.at(index);
 		} else {
-			m_Dense.resize(index + 1);
+			dense.resize(index + 1);
 		}
-		m_Dense.at(index) = value;
-	}
+		dense.at(index) = value;
+	};
 
 	/**
 	 * Pushes an AMFValue into the back of the dense portion.
@@ -264,10 +249,10 @@ public:
 	 *
 	 * @return The inserted pointer, or nullptr should the key already be in use.
 	 */
-	template <typename ValueType>
-	[[maybe_unused]] inline AMFValue<ValueType>* Push(const ValueType value) {
-		return Insert(m_Dense.size(), value).first;
-	}
+	template<typename ValueType>
+	inline AMFValue<ValueType>* Push(ValueType value) {
+		return Insert(this->dense.size(), value).first;
+	};
 
 	/**
 	 * Removes the key from the associative portion
@@ -276,49 +261,52 @@ public:
 	 *
 	 * @param key The key to remove from the associative portion
 	 */
-	void Remove(const std::string& key, const bool deleteValue = true) {
-		const AMFAssociative::const_iterator it = m_Associative.find(key);
-		if (it != m_Associative.cend()) {
+	void Remove(const std::string& key, bool deleteValue = true) {
+		AMFAssociative::iterator it = this->associative.find(key);
+		if (it != this->associative.end()) {
 			if (deleteValue) delete it->second;
-			m_Associative.erase(it);
+			this->associative.erase(it);
 		}
 	}
 
 	/**
 	 * Pops the last element in the dense portion, deleting it in the process.
 	 */
-	void Remove(const size_t index) {
-		if (!m_Dense.empty() && index < m_Dense.size()) {
-			const auto itr = m_Dense.cbegin() + index;
+	void Remove(const uint32_t index) {
+		if (!this->dense.empty() && index < this->dense.size()) {
+			auto itr = this->dense.begin() + index;
 			if (*itr) delete (*itr);
-			m_Dense.erase(itr);
+			this->dense.erase(itr);
 		}
 	}
 
 	void Pop() {
-		if (!m_Dense.empty()) Remove(m_Dense.size() - 1);
+		if (!this->dense.empty()) Remove(this->dense.size() - 1);
 	}
 
-	[[nodiscard]] AMFArrayValue* GetArray(const std::string& key) const {
-		const AMFAssociative::const_iterator it = m_Associative.find(key);
-		return it != m_Associative.cend() ? dynamic_cast<AMFArrayValue*>(it->second) : nullptr;
-	}
+	AMFArrayValue* GetArray(const std::string& key) {
+		AMFAssociative::const_iterator it = this->associative.find(key);
+		if (it != this->associative.end()) {
+			return dynamic_cast<AMFArrayValue*>(it->second);
+		}
+		return nullptr;
+	};
 
-	[[nodiscard]] AMFArrayValue* GetArray(const size_t index) const {
-		return index < m_Dense.size() ? dynamic_cast<AMFArrayValue*>(m_Dense.at(index)) : nullptr;
-	}
+	AMFArrayValue* GetArray(const uint32_t index) {
+		return index >= this->dense.size() ? nullptr : dynamic_cast<AMFArrayValue*>(this->dense.at(index));
+	};
 
-	[[maybe_unused]] inline AMFArrayValue* InsertArray(const std::string& key) {
+	inline AMFArrayValue* InsertArray(const std::string& key) {
 		return static_cast<AMFArrayValue*>(Insert(key).first);
-	}
+	};
 
-	[[maybe_unused]] inline AMFArrayValue* InsertArray(const size_t index) {
+	inline AMFArrayValue* InsertArray(const uint32_t index) {
 		return static_cast<AMFArrayValue*>(Insert(index).first);
-	}
+	};
 
-	[[maybe_unused]] inline AMFArrayValue* PushArray() {
-		return static_cast<AMFArrayValue*>(Insert(m_Dense.size()).first);
-	}
+	inline AMFArrayValue* PushArray() {
+		return static_cast<AMFArrayValue*>(Insert(this->dense.size()).first);
+	};
 
 	/**
 	 * Gets an AMFValue by the key from the associative portion and converts it
@@ -330,18 +318,18 @@ public:
 	 * @return The AMFValue
 	 */
 	template <typename AmfType>
-	[[nodiscard]] AMFValue<AmfType>* Get(const std::string& key) const {
-		const AMFAssociative::const_iterator it = m_Associative.find(key);
-		return it != m_Associative.cend() ?
+	AMFValue<AmfType>* Get(const std::string& key) const {
+		AMFAssociative::const_iterator it = this->associative.find(key);
+		return it != this->associative.end() ?
 			dynamic_cast<AMFValue<AmfType>*>(it->second) :
 			nullptr;
-	}
+	};
 
 	// Get from the array but dont cast it
-	[[nodiscard]] AMFBaseValue* Get(const std::string& key) const {
-		const AMFAssociative::const_iterator it = m_Associative.find(key);
-		return it != m_Associative.cend() ? it->second : nullptr;
-	}
+	AMFBaseValue* Get(const std::string& key) const {
+		AMFAssociative::const_iterator it = this->associative.find(key);
+		return it != this->associative.end() ? it->second : nullptr;
+	};
 
 	/**
 	 * @brief Get an AMFValue object at a position in the dense portion.
@@ -353,28 +341,27 @@ public:
 	 * @return The casted object, or nullptr.
 	 */
 	template <typename AmfType>
-	[[nodiscard]] AMFValue<AmfType>* Get(const size_t index) const {
-		return index < m_Dense.size() ?
-			dynamic_cast<AMFValue<AmfType>*>(m_Dense.at(index)) :
+	AMFValue<AmfType>* Get(uint32_t index) const {
+		return index < this->dense.size() ?
+			dynamic_cast<AMFValue<AmfType>*>(this->dense.at(index)) :
 			nullptr;
-	}
+	};
 
 	// Get from the dense but dont cast it
-	[[nodiscard]] AMFBaseValue* Get(const size_t index) const {
-		return index < m_Dense.size() ? m_Dense.at(index) : nullptr;
-	}
-
+	AMFBaseValue* Get(const uint32_t index) const {
+		return index < this->dense.size() ? this->dense.at(index) : nullptr;
+	};
 private:
 	/**
 	 * The associative portion.  These values are key'd with strings to an AMFValue.
 	 */
-	AMFAssociative m_Associative;
+	AMFAssociative associative;
 
 	/**
 	 * The dense portion.  These AMFValue's are stored one after
 	 * another with the most recent addition being at the back.
 	 */
-	AMFDense m_Dense;
+	AMFDense dense;
 };
 
 #endif  //!__AMF3__H__

dCommon/AmfSerialize.cpp

@@ -53,7 +53,7 @@ void RakNet::BitStream::Write<AMFBaseValue&>(AMFBaseValue& value) {
  * A private function to write an value to a RakNet::BitStream
  * RakNet writes in the correct byte order - do not reverse this.
  */
-void WriteUInt29(RakNet::BitStream& bs, uint32_t v) {
+void WriteUInt29(RakNet::BitStream* bs, uint32_t v) {
 	unsigned char b4 = static_cast<unsigned char>(v);
 	if (v < 0x00200000) {
 		b4 = b4 & 0x7F;
@@ -65,10 +65,10 @@ void WriteUInt29(RakNet::BitStream& bs, uint32_t v) {
 				unsigned char b2;
 				v = v >> 7;
 				b2 = static_cast<unsigned char>(v) | 0x80;
-				bs.Write(b2);
+				bs->Write(b2);
 			}
 
-			bs.Write(b3);
+			bs->Write(b3);
 		}
 	} else {
 		unsigned char b1;
@@ -82,19 +82,19 @@ void WriteUInt29(RakNet::BitStream& bs, uint32_t v) {
 		v = v >> 7;
 		b1 = static_cast<unsigned char>(v) | 0x80;
 
-		bs.Write(b1);
-		bs.Write(b2);
-		bs.Write(b3);
+		bs->Write(b1);
+		bs->Write(b2);
+		bs->Write(b3);
 	}
 
-	bs.Write(b4);
+	bs->Write(b4);
 }
 
 /**
  * Writes a flag number to a RakNet::BitStream
  * RakNet writes in the correct byte order - do not reverse this.
  */
-void WriteFlagNumber(RakNet::BitStream& bs, uint32_t v) {
+void WriteFlagNumber(RakNet::BitStream* bs, uint32_t v) {
 	v = (v << 1) | 0x01;
 	WriteUInt29(bs, v);
 }
@@ -104,9 +104,9 @@ 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) {
+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()));
+	bs->Write(str.c_str(), static_cast<uint32_t>(str.size()));
 }
 
 /**
@@ -114,8 +114,8 @@ void WriteAMFString(RakNet::BitStream& bs, const std::string& str) {
  *
  * RakNet writes in the correct byte order - do not reverse this.
  */
-void WriteAMFU16(RakNet::BitStream& bs, uint16_t value) {
-	bs.Write(value);
+void WriteAMFU16(RakNet::BitStream* bs, uint16_t value) {
+	bs->Write(value);
 }
 
 /**
@@ -123,8 +123,8 @@ void WriteAMFU16(RakNet::BitStream& bs, uint16_t value) {
  *
  * RakNet writes in the correct byte order - do not reverse this.
  */
-void WriteAMFU32(RakNet::BitStream& bs, uint32_t value) {
-	bs.Write(value);
+void WriteAMFU32(RakNet::BitStream* bs, uint32_t value) {
+	bs->Write(value);
 }
 
 /**
@@ -132,40 +132,40 @@ void WriteAMFU32(RakNet::BitStream& bs, uint32_t value) {
  *
  * RakNet writes in the correct byte order - do not reverse this.
  */
-void WriteAMFU64(RakNet::BitStream& bs, uint64_t value) {
-	bs.Write(value);
+void WriteAMFU64(RakNet::BitStream* bs, uint64_t value) {
+	bs->Write(value);
 }
 
 // Writes an AMFIntegerValue to BitStream
 template<>
 void RakNet::BitStream::Write<AMFIntValue&>(AMFIntValue& value) {
-	WriteUInt29(*this, value.GetValue());
+	WriteUInt29(this, value.GetValue());
 }
 
 // Writes an AMFDoubleValue to BitStream
 template<>
 void RakNet::BitStream::Write<AMFDoubleValue&>(AMFDoubleValue& value) {
 	double d = value.GetValue();
-	WriteAMFU64(*this, *reinterpret_cast<uint64_t*>(&d));
+	WriteAMFU64(this, *reinterpret_cast<uint64_t*>(&d));
 }
 
 // Writes an AMFStringValue to BitStream
 template<>
 void RakNet::BitStream::Write<AMFStringValue&>(AMFStringValue& value) {
-	WriteAMFString(*this, value.GetValue());
+	WriteAMFString(this, value.GetValue());
 }
 
 // Writes an AMFArrayValue to BitStream
 template<>
 void RakNet::BitStream::Write<AMFArrayValue&>(AMFArrayValue& value) {
 	uint32_t denseSize = value.GetDense().size();
-	WriteFlagNumber(*this, denseSize);
+	WriteFlagNumber(this, denseSize);
 
 	auto it = value.GetAssociative().begin();
 	auto end = value.GetAssociative().end();
 
 	while (it != end) {
-		WriteAMFString(*this, it->first);
+		WriteAMFString(this, it->first);
 		this->Write<AMFBaseValue&>(*it->second);
 		it++;
 	}

dCommon/CMakeLists.txt

@@ -8,9 +8,11 @@ set(DCOMMON_SOURCES
 		"Game.cpp"
 		"GeneralUtils.cpp"
 		"LDFFormat.cpp"
+		"MD5.cpp"
 		"Metrics.cpp"
 		"NiPoint3.cpp"
 		"NiQuaternion.cpp"
+		"SHA512.cpp"
 		"Demangler.cpp"
 		"ZCompression.cpp"
 		"BrickByBrickFix.cpp"
@@ -30,15 +32,11 @@ foreach(file ${DCOMMON_DCLIENT_SOURCES})
 	set(DCOMMON_SOURCES ${DCOMMON_SOURCES} "dClient/${file}")
 endforeach()
 
+include_directories(${PROJECT_SOURCE_DIR}/dCommon/)
+
 add_library(dCommon STATIC ${DCOMMON_SOURCES})
-target_include_directories(dCommon
-	PUBLIC "." "dClient" "dEnums"
-	PRIVATE
-	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase"
-	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables"
-	"${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase"
-	"${PROJECT_SOURCE_DIR}/thirdparty/mariadb-connector-cpp/include"
-)
+
+target_link_libraries(dCommon bcrypt dDatabase tinyxml2)
 
 if (UNIX)
 	find_package(ZLIB REQUIRED)
@@ -69,6 +67,9 @@ else ()
 	)
 endif ()
 
-target_link_libraries(dCommon
-	PRIVATE ZLIB::ZLIB bcrypt tinyxml2
-	INTERFACE dDatabase)
+target_link_libraries(dCommon ZLIB::ZLIB)
+
+# Disable deprecation warnings on MD5.cpp and SHA512.cpp for Apple Clang
+if (APPLE)
+	set_source_files_properties("MD5.cpp" "SHA512.cpp" PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")
+endif()

dCommon/Diagnostics.cpp

@@ -120,8 +120,6 @@ void CatchUnhandled(int sig) {
 		if (eptr) std::rethrow_exception(eptr);
 	} catch(const std::exception& e) {
 		LOG("Caught exception: '%s'", e.what());
-	} catch (...) {
-		LOG("Caught unknown exception.");
 	}
 
 #ifndef INCLUDE_BACKTRACE

dCommon/GeneralUtils.cpp

@@ -8,23 +8,23 @@
 #include <map>
 
 template <typename T>
-static inline size_t MinSize(const size_t size, const std::basic_string_view<T> string) {
-	if (size == SIZE_MAX || size > string.size()) {
+inline size_t MinSize(size_t size, const std::basic_string_view<T>& string) {
+	if (size == size_t(-1) || size > string.size()) {
 		return string.size();
 	} else {
 		return size;
 	}
 }
 
-inline bool IsLeadSurrogate(const char16_t c) {
+inline bool IsLeadSurrogate(char16_t c) {
 	return (0xD800 <= c) && (c <= 0xDBFF);
 }
 
-inline bool IsTrailSurrogate(const char16_t c) {
+inline bool IsTrailSurrogate(char16_t c) {
 	return (0xDC00 <= c) && (c <= 0xDFFF);
 }
 
-inline void PushUTF8CodePoint(std::string& ret, const char32_t cp) {
+inline void PushUTF8CodePoint(std::string& ret, char32_t cp) {
 	if (cp <= 0x007F) {
 		ret.push_back(static_cast<uint8_t>(cp));
 	} else if (cp <= 0x07FF) {
@@ -46,16 +46,16 @@ inline void PushUTF8CodePoint(std::string& ret, const char32_t cp) {
 
 constexpr const char16_t REPLACEMENT_CHARACTER = 0xFFFD;
 
-bool static _IsSuffixChar(const uint8_t c) {
+bool _IsSuffixChar(uint8_t c) {
 	return (c & 0xC0) == 0x80;
 }
 
-bool GeneralUtils::details::_NextUTF8Char(std::string_view& slice, uint32_t& out) {
-	const size_t rem = slice.length();
+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());
 	if (rem > 0) {
-		const uint8_t first = bytes[0];
+		uint8_t first = bytes[0];
 		if (first < 0x80) { // 1 byte character
 			out = static_cast<uint32_t>(first & 0x7F);
 			slice.remove_prefix(1);
@@ -64,7 +64,7 @@ bool GeneralUtils::details::_NextUTF8Char(std::string_view& slice, uint32_t& out
 			// middle byte, not valid at start, fall through
 		} else if (first < 0xE0) { // two byte character
 			if (rem > 1) {
-				const uint8_t second = bytes[1];
+				uint8_t second = bytes[1];
 				if (_IsSuffixChar(second)) {
 					out = (static_cast<uint32_t>(first & 0x1F) << 6)
 						+ static_cast<uint32_t>(second & 0x3F);
@@ -74,8 +74,8 @@ bool GeneralUtils::details::_NextUTF8Char(std::string_view& slice, uint32_t& out
 			}
 		} else if (first < 0xF0) { // three byte character
 			if (rem > 2) {
-				const uint8_t second = bytes[1];
-				const uint8_t third = bytes[2];
+				uint8_t second = bytes[1];
+				uint8_t third = bytes[2];
 				if (_IsSuffixChar(second) && _IsSuffixChar(third)) {
 					out = (static_cast<uint32_t>(first & 0x0F) << 12)
 						+ (static_cast<uint32_t>(second & 0x3F) << 6)
@@ -86,9 +86,9 @@ bool GeneralUtils::details::_NextUTF8Char(std::string_view& slice, uint32_t& out
 			}
 		} else if (first < 0xF8) { // four byte character
 			if (rem > 3) {
-				const uint8_t second = bytes[1];
-				const uint8_t third = bytes[2];
-				const uint8_t fourth = bytes[3];
+				uint8_t second = bytes[1];
+				uint8_t third = bytes[2];
+				uint8_t fourth = bytes[3];
 				if (_IsSuffixChar(second) && _IsSuffixChar(third) && _IsSuffixChar(fourth)) {
 					out = (static_cast<uint32_t>(first & 0x07) << 18)
 						+ (static_cast<uint32_t>(second & 0x3F) << 12)
@@ -107,7 +107,7 @@ bool GeneralUtils::details::_NextUTF8Char(std::string_view& slice, uint32_t& out
 }
 
 /// See <https://www.ietf.org/rfc/rfc2781.html#section-2.1>
-bool PushUTF16CodePoint(std::u16string& output, const uint32_t U, const size_t size) {
+bool PushUTF16CodePoint(std::u16string& output, uint32_t U, size_t size) {
 	if (output.length() >= size) return false;
 	if (U < 0x10000) {
 		// If U < 0x10000, encode U as a 16-bit unsigned integer and terminate.
@@ -120,7 +120,7 @@ bool PushUTF16CodePoint(std::u16string& output, const uint32_t U, const size_t s
 		// Let U' = U - 0x10000. Because U is less than or equal to 0x10FFFF,
 		// U' must be less than or equal to 0xFFFFF. That is, U' can be
 		// represented in 20 bits.
-		const uint32_t Ut = U - 0x10000;
+		uint32_t Ut = U - 0x10000;
 
 		// Initialize two 16-bit unsigned integers, W1 and W2, to 0xD800 and
 		// 0xDC00, respectively. These integers each have 10 bits free to
@@ -141,25 +141,25 @@ bool PushUTF16CodePoint(std::u16string& output, const uint32_t U, const size_t s
 	} else return false;
 }
 
-std::u16string GeneralUtils::UTF8ToUTF16(const std::string_view string, const size_t size) {
-	const size_t newSize = MinSize(size, string);
+std::u16string GeneralUtils::UTF8ToUTF16(const std::string_view& string, size_t size) {
+	size_t newSize = MinSize(size, string);
 	std::u16string output;
 	output.reserve(newSize);
 	std::string_view iterator = string;
 
 	uint32_t c;
-	while (details::_NextUTF8Char(iterator, c) && PushUTF16CodePoint(output, c, size)) {}
+	while (_NextUTF8Char(iterator, c) && PushUTF16CodePoint(output, c, size)) {}
 	return output;
 }
 
 //! Converts an std::string (ASCII) to UCS-2 / UTF-16
-std::u16string GeneralUtils::ASCIIToUTF16(const std::string_view string, const size_t size) {
-	const size_t newSize = MinSize(size, string);
+std::u16string GeneralUtils::ASCIIToUTF16(const std::string_view& string, size_t size) {
+	size_t newSize = MinSize(size, string);
 	std::u16string ret;
 	ret.reserve(newSize);
 
-	for (size_t i = 0; i < newSize; ++i) {
-		const char c = string[i];
+	for (size_t i = 0; i < newSize; i++) {
+		char c = string[i];
 		// Note: both 7-bit ascii characters and REPLACEMENT_CHARACTER fit in one char16_t
 		ret.push_back((c > 0 && c <= 127) ? static_cast<char16_t>(c) : REPLACEMENT_CHARACTER);
 	}
@@ -169,18 +169,18 @@ std::u16string GeneralUtils::ASCIIToUTF16(const std::string_view string, const s
 
 //! Converts a (potentially-ill-formed) UTF-16 string to UTF-8
 //! See: <http://simonsapin.github.io/wtf-8/#decoding-ill-formed-utf-16>
-std::string GeneralUtils::UTF16ToWTF8(const std::u16string_view string, const size_t size) {
-	const size_t newSize = MinSize(size, string);
+std::string GeneralUtils::UTF16ToWTF8(const std::u16string_view& string, size_t size) {
+	size_t newSize = MinSize(size, string);
 	std::string ret;
 	ret.reserve(newSize);
 
-	for (size_t i = 0; i < newSize; ++i) {
-		const char16_t u = string[i];
+	for (size_t i = 0; i < newSize; i++) {
+		char16_t u = string[i];
 		if (IsLeadSurrogate(u) && (i + 1) < newSize) {
-			const char16_t next = string[i + 1];
+			char16_t next = string[i + 1];
 			if (IsTrailSurrogate(next)) {
 				i += 1;
-				const char32_t cp = 0x10000
+				char32_t cp = 0x10000
 					+ ((static_cast<char32_t>(u) - 0xD800) << 10)
 					+ (static_cast<char32_t>(next) - 0xDC00);
 				PushUTF8CodePoint(ret, cp);
@@ -195,40 +195,40 @@ std::string GeneralUtils::UTF16ToWTF8(const std::u16string_view string, const si
 	return ret;
 }
 
-bool GeneralUtils::CaseInsensitiveStringCompare(const std::string_view a, const std::string_view b) {
+bool GeneralUtils::CaseInsensitiveStringCompare(const std::string& a, const std::string& b) {
 	return std::equal(a.begin(), a.end(), b.begin(), b.end(), [](char a, char b) { return tolower(a) == tolower(b); });
 }
 
 // MARK: Bits
 
 //! Sets a specific bit in a signed 64-bit integer
-int64_t GeneralUtils::SetBit(int64_t value, const uint32_t index) {
+int64_t GeneralUtils::SetBit(int64_t value, uint32_t index) {
 	return value |= 1ULL << index;
 }
 
 //! Clears a specific bit in a signed 64-bit integer
-int64_t GeneralUtils::ClearBit(int64_t value, const uint32_t index) {
+int64_t GeneralUtils::ClearBit(int64_t value, uint32_t index) {
 	return value &= ~(1ULL << index);
 }
 
 //! Checks a specific bit in a signed 64-bit integer
-bool GeneralUtils::CheckBit(int64_t value, const uint32_t index) {
+bool GeneralUtils::CheckBit(int64_t value, uint32_t index) {
 	return value & (1ULL << index);
 }
 
-bool GeneralUtils::ReplaceInString(std::string& str, const std::string_view from, const std::string_view to) {
-	const size_t start_pos = str.find(from);
+bool GeneralUtils::ReplaceInString(std::string& str, const std::string& from, const std::string& to) {
+	size_t start_pos = str.find(from);
 	if (start_pos == std::string::npos)
 		return false;
 	str.replace(start_pos, from.length(), to);
 	return true;
 }
 
-std::vector<std::wstring> GeneralUtils::SplitString(const std::wstring_view str, const wchar_t delimiter) {
+std::vector<std::wstring> GeneralUtils::SplitString(std::wstring& str, wchar_t delimiter) {
 	std::vector<std::wstring> vector = std::vector<std::wstring>();
 	std::wstring current;
 
-	for (const wchar_t c : str) {
+	for (const auto& c : str) {
 		if (c == delimiter) {
 			vector.push_back(current);
 			current = L"";
@@ -237,15 +237,15 @@ std::vector<std::wstring> GeneralUtils::SplitString(const std::wstring_view str,
 		}
 	}
 
-	vector.push_back(std::move(current));
+	vector.push_back(current);
 	return vector;
 }
 
-std::vector<std::u16string> GeneralUtils::SplitString(const std::u16string_view str, const char16_t delimiter) {
+std::vector<std::u16string> GeneralUtils::SplitString(const std::u16string& str, char16_t delimiter) {
 	std::vector<std::u16string> vector = std::vector<std::u16string>();
 	std::u16string current;
 
-	for (const char16_t c : str) {
+	for (const auto& c : str) {
 		if (c == delimiter) {
 			vector.push_back(current);
 			current = u"";
@@ -254,15 +254,17 @@ std::vector<std::u16string> GeneralUtils::SplitString(const std::u16string_view
 		}
 	}
 
-	vector.push_back(std::move(current));
+	vector.push_back(current);
 	return vector;
 }
 
-std::vector<std::string> GeneralUtils::SplitString(const std::string_view str, const char delimiter) {
+std::vector<std::string> GeneralUtils::SplitString(const std::string& str, char delimiter) {
 	std::vector<std::string> vector = std::vector<std::string>();
 	std::string current = "";
 
-	for (const char c : str) {
+	for (size_t i = 0; i < str.length(); i++) {
+		char c = str[i];
+
 		if (c == delimiter) {
 			vector.push_back(current);
 			current = "";
@@ -271,70 +273,53 @@ std::vector<std::string> GeneralUtils::SplitString(const std::string_view str, c
 		}
 	}
 
-	vector.push_back(std::move(current));
+	vector.push_back(current);
+
 	return vector;
 }
 
-std::u16string GeneralUtils::ReadWString(RakNet::BitStream& inStream) {
+std::u16string GeneralUtils::ReadWString(RakNet::BitStream* inStream) {
 	uint32_t length;
-	inStream.Read<uint32_t>(length);
+	inStream->Read<uint32_t>(length);
 
 	std::u16string string;
-	for (uint32_t i = 0; i < length; ++i) {
+	for (auto i = 0; i < length; i++) {
 		uint16_t c;
-		inStream.Read(c);
+		inStream->Read(c);
 		string.push_back(c);
 	}
 
 	return string;
 }
 
-std::vector<std::string> GeneralUtils::GetSqlFileNamesFromFolder(const std::string_view folder) {
+std::vector<std::string> GeneralUtils::GetSqlFileNamesFromFolder(const std::string& folder) {
 	// Because we dont know how large the initial number before the first _ is we need to make it a map like so.
     std::map<uint32_t, std::string> filenames{};
-	for (const auto& t : std::filesystem::directory_iterator(folder)) {
+	for (auto& t : std::filesystem::directory_iterator(folder)) {
         auto filename = t.path().filename().string();
-        const auto index = std::stoi(GeneralUtils::SplitString(filename, '_').at(0));
-        filenames.emplace(index, std::move(filename));
+        auto index = std::stoi(GeneralUtils::SplitString(filename, '_').at(0));
+        filenames.insert(std::make_pair(index, filename));
 	}
 
 	// Now sort the map by the oldest migration.
 	std::vector<std::string> sortedFiles{};
-	auto fileIterator = filenames.cbegin();
-	auto oldest = filenames.cbegin();
-	while (!filenames.empty()) {
-		if (fileIterator == filenames.cend()) {
-			sortedFiles.push_back(oldest->second);
-			filenames.erase(oldest);
-			fileIterator = filenames.cbegin();
-			oldest = filenames.cbegin();
-			continue;
+    auto fileIterator = filenames.begin();
+    std::map<uint32_t, std::string>::iterator oldest = filenames.begin();
+    while (!filenames.empty()) {
+		if (fileIterator == filenames.end()) {
+            sortedFiles.push_back(oldest->second);
+            filenames.erase(oldest);
+            fileIterator = filenames.begin();
+            oldest = filenames.begin();
+            continue;
 		}
-		if (oldest->first > fileIterator->first) oldest = fileIterator;
-		++fileIterator;
+        if (oldest->first > fileIterator->first) oldest = fileIterator;
+        fileIterator++;
 	}
 
 	return sortedFiles;
 }
 
-#if !(__GNUC__ >= 11 || _MSC_VER >= 1924)
-
-// MacOS floating-point parse function specializations
-namespace GeneralUtils::details {
-	template <>
-	[[nodiscard]] float _parse<float>(const std::string_view str, size_t& parseNum) {
-		return std::stof(std::string{ str }, &parseNum);
-	}
-
-	template <>
-	[[nodiscard]] double _parse<double>(const std::string_view str, size_t& parseNum) {
-		return std::stod(std::string{ str }, &parseNum);
-	}
-
-	template <>
-	[[nodiscard]] long double _parse<long double>(const std::string_view str, size_t& parseNum) {
-		return std::stold(std::string{ str }, &parseNum);
-	}
+bool GeneralUtils::TryParse(const std::string& x, const std::string& y, const std::string& z, NiPoint3& dst) {
+	return TryParse<float>(x.c_str(), dst.x) && TryParse<float>(y.c_str(), dst.y) && TryParse<float>(z.c_str(), dst.z);
 }
-
-#endif

dCommon/GeneralUtils.h

@@ -1,21 +1,17 @@
 #pragma once
 
 // C++
-#include <charconv>
-#include <cstdint>
-#include <ctime>
-#include <functional>
-#include <optional>
+#include <stdint.h>
 #include <random>
-#include <span>
-#include <stdexcept>
+#include <time.h>
 #include <string>
-#include <string_view>
 #include <type_traits>
-
+#include <functional>
+#include <type_traits>
+#include <stdexcept>
 #include "BitStream.h"
 #include "NiPoint3.h"
-#include "dPlatforms.h"
+
 #include "Game.h"
 #include "Logger.h"
 
@@ -33,31 +29,29 @@ namespace GeneralUtils {
 	//! Converts a plain ASCII string to a UTF-16 string
 	/*!
 	  \param string The string to convert
-	  \param size A size to trim the string to. Default is SIZE_MAX (No trimming)
+	  \param size A size to trim the string to. Default is -1 (No trimming)
 	  \return An UTF-16 representation of the string
 	 */
-	std::u16string ASCIIToUTF16(const std::string_view string, const size_t size = SIZE_MAX);
+	std::u16string ASCIIToUTF16(const std::string_view& string, size_t size = -1);
 
 	//! Converts a UTF-8 String to a UTF-16 string
 	/*!
 	  \param string The string to convert
-	  \param size A size to trim the string to. Default is SIZE_MAX (No trimming)
+	  \param size A size to trim the string to. Default is -1 (No trimming)
 	  \return An UTF-16 representation of the string
 	 */
-	std::u16string UTF8ToUTF16(const std::string_view string, const size_t size = SIZE_MAX);
+	std::u16string UTF8ToUTF16(const std::string_view& string, size_t size = -1);
 
-	namespace details {
-		//! Internal, do not use
-		bool _NextUTF8Char(std::string_view& slice, uint32_t& out);
-	}
+	//! Internal, do not use
+	bool _NextUTF8Char(std::string_view& slice, uint32_t& out);
 
 	//! Converts a UTF-16 string to a UTF-8 string
 	/*!
 	  \param string The string to convert
-	  \param size A size to trim the string to. Default is SIZE_MAX (No trimming)
+	  \param size A size to trim the string to. Default is -1 (No trimming)
 	  \return An UTF-8 representation of the string
 	 */
-	std::string UTF16ToWTF8(const std::u16string_view string, const size_t size = SIZE_MAX);
+	std::string UTF16ToWTF8(const std::u16string_view& string, size_t size = -1);
 
 	/**
 	 * Compares two basic strings but does so ignoring case sensitivity
@@ -65,7 +59,7 @@ namespace GeneralUtils {
 	 * \param b the second string to compare against the first string
 	 * @return if the two strings are equal
 	 */
-	bool CaseInsensitiveStringCompare(const std::string_view a, const std::string_view b);
+	bool CaseInsensitiveStringCompare(const std::string& a, const std::string& b);
 
 	// MARK: Bits
 
@@ -73,9 +67,9 @@ namespace GeneralUtils {
 
 	//! Sets a bit on a numerical value
 	template <typename T>
-	inline void SetBit(T& value, const eObjectBits bits) {
+	inline void SetBit(T& value, eObjectBits bits) {
 		static_assert(std::is_arithmetic<T>::value, "Not an arithmetic type");
-		const auto index = static_cast<size_t>(bits);
+		auto index = static_cast<size_t>(bits);
 		if (index > (sizeof(T) * 8) - 1) {
 			return;
 		}
@@ -85,9 +79,9 @@ namespace GeneralUtils {
 
 	//! Clears a bit on a numerical value
 	template <typename T>
-	inline void ClearBit(T& value, const eObjectBits bits) {
+	inline void ClearBit(T& value, eObjectBits bits) {
 		static_assert(std::is_arithmetic<T>::value, "Not an arithmetic type");
-		const auto index = static_cast<size_t>(bits);
+		auto index = static_cast<size_t>(bits);
 		if (index > (sizeof(T) * 8 - 1)) {
 			return;
 		}
@@ -100,14 +94,14 @@ namespace GeneralUtils {
 	  \param value The value to set the bit for
 	  \param index The index of the bit
 	 */
-	int64_t SetBit(int64_t value, const uint32_t index);
+	int64_t SetBit(int64_t value, uint32_t index);
 
 	//! Clears a specific bit in a signed 64-bit integer
 	/*!
 	  \param value The value to clear the bit from
 	  \param index The index of the bit
 	 */
-	int64_t ClearBit(int64_t value, const uint32_t index);
+	int64_t ClearBit(int64_t value, uint32_t index);
 
 	//! Checks a specific bit in a signed 64-bit integer
 	/*!
@@ -115,128 +109,104 @@ namespace GeneralUtils {
 	  \param index The index of the bit
 	  \return Whether or not the bit is set
 	 */
-	bool CheckBit(int64_t value, const uint32_t index);
+	bool CheckBit(int64_t value, uint32_t index);
 
-	bool ReplaceInString(std::string& str, const std::string_view from, const std::string_view to);
+	bool ReplaceInString(std::string& str, const std::string& from, const std::string& to);
 
-	std::u16string ReadWString(RakNet::BitStream& inStream);
+	std::u16string ReadWString(RakNet::BitStream* inStream);
 
-	std::vector<std::wstring> SplitString(const std::wstring_view str, const wchar_t delimiter);
+	std::vector<std::wstring> SplitString(std::wstring& str, wchar_t delimiter);
 
-	std::vector<std::u16string> SplitString(const std::u16string_view str, const char16_t delimiter);
+	std::vector<std::u16string> SplitString(const std::u16string& str, char16_t delimiter);
 
-	std::vector<std::string> SplitString(const std::string_view str, const char delimiter);
+	std::vector<std::string> SplitString(const std::string& str, char delimiter);
 
-	std::vector<std::string> GetSqlFileNamesFromFolder(const std::string_view folder);
+	std::vector<std::string> GetSqlFileNamesFromFolder(const std::string& folder);
 
-	// Concept constraining to enum types
 	template <typename T>
-	concept Enum = std::is_enum_v<T>;
+	T Parse(const char* value);
 
-	// Concept constraining to numeric types
-	template <typename T>
-	concept Numeric = std::integral<T> || Enum<T> || std::floating_point<T>;
-
-	// Concept trickery to enable parsing underlying numeric types
-	template <Numeric T>
-	struct numeric_parse { using type = T; };
-
-	// If an enum, present an alias to its underlying type for parsing
-	template <Numeric T> requires Enum<T>
-	struct numeric_parse<T> { using type = std::underlying_type_t<T>; };
-
-	// If a boolean, present an alias to an intermediate integral type for parsing
-	template <Numeric T> requires std::same_as<T, bool>
-	struct numeric_parse<T> { using type = uint8_t; };
-
-	// Shorthand type alias
-	template <Numeric T>
-	using numeric_parse_t = numeric_parse<T>::type;
-
-	/**
-	 * For numeric values: Parses a string_view and returns an optional variable depending on the result.
-	 * @param str The string_view to be evaluated
-	 * @returns An std::optional containing the desired value if it is equivalent to the string
-	*/
-	template <Numeric T>
-	[[nodiscard]] std::optional<T> TryParse(std::string_view str) {
-		numeric_parse_t<T> result;
-		while (!str.empty() && std::isspace(str.front())) str.remove_prefix(1);
-
-		const char* const strEnd = str.data() + str.size();
-		const auto [parseEnd, ec] = std::from_chars(str.data(), strEnd, result);
-		const bool isParsed = parseEnd == strEnd && ec == std::errc{};
-
-		return isParsed ? static_cast<T>(result) : std::optional<T>{};
+	template <>
+	inline bool Parse(const char* value) {
+		return std::stoi(value);
 	}
 
-#if !(__GNUC__ >= 11 || _MSC_VER >= 1924)
-
-	// MacOS floating-point parse helper function specializations
-	namespace details {
-		template <std::floating_point T>
-		[[nodiscard]] T _parse(const std::string_view str, size_t& parseNum);
+	template <>
+	inline int32_t Parse(const char* value) {
+		return std::stoi(value);
 	}
 
-	/**
-	 * For floating-point values: Parses a string_view and returns an optional variable depending on the result.
-	 * Note that this function overload is only included for MacOS, as from_chars will fulfill its purpose otherwise.
-	 * @param str The string_view to be evaluated
-	 * @returns An std::optional containing the desired value if it is equivalent to the string
-	*/
-	template <std::floating_point T>
-	[[nodiscard]] std::optional<T> TryParse(std::string_view str) noexcept
-	try {
-		while (!str.empty() && std::isspace(str.front())) str.remove_prefix(1);
-
-		size_t parseNum;
-		const T result = details::_parse<T>(str, parseNum);
-		const bool isParsed = str.length() == parseNum;
-
-		return isParsed ? result : std::optional<T>{};
-	} catch (...) {
-		return std::nullopt;
+	template <>
+	inline int64_t Parse(const char* value) {
+		return std::stoll(value);
 	}
 
-#endif
-
-	/**
-	 * The TryParse overload for handling NiPoint3 by passing 3 seperate string references
-	 * @param strX The string representing the X coordinate
-	 * @param strY The string representing the Y coordinate
-	 * @param strZ The string representing the Z coordinate
-	 * @returns An std::optional containing the desired NiPoint3 if it can be constructed from the string parameters
-	*/
-	template <typename T>
-	[[nodiscard]] std::optional<NiPoint3> TryParse(const std::string_view strX, const std::string_view strY, const std::string_view strZ) {
-		const auto x = TryParse<float>(strX);
-		if (!x) return std::nullopt;
-
-		const auto y = TryParse<float>(strY);
-		if (!y) return std::nullopt;
-
-		const auto z = TryParse<float>(strZ);
-		return z ? std::make_optional<NiPoint3>(x.value(), y.value(), z.value()) : std::nullopt;
+	template <>
+	inline float Parse(const char* value) {
+		return std::stof(value);
 	}
 
-	/**
-	 * The TryParse overload for handling NiPoint3 by passing a span of three strings
-	 * @param str The string vector representing the X, Y, and Z coordinates
-	 * @returns An std::optional containing the desired NiPoint3 if it can be constructed from the string parameters
-	*/
-	template <typename T>
-	[[nodiscard]] std::optional<NiPoint3> TryParse(const std::span<const std::string> str) {
-		return (str.size() == 3) ? TryParse<NiPoint3>(str[0], str[1], str[2]) : std::nullopt;
+	template <>
+	inline double Parse(const char* value) {
+		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);
+	}
+
+	template <>
+	inline uint64_t Parse(const char* value) {
+		return std::stoull(value);
+	}
+
+	template <>
+	inline eInventoryType Parse(const char* value) {
+		return static_cast<eInventoryType>(std::stoul(value));
+	}
+
+	template <>
+	inline eReplicaComponentType Parse(const char* value) {
+		return static_cast<eReplicaComponentType>(std::stoul(value));
 	}
 
 	template <typename T>
-	std::u16string to_u16string(const T value) {
+	bool TryParse(const char* value, T& dst) {
+		try {
+			dst = Parse<T>(value);
+
+			return true;
+		} catch (...) {
+			return false;
+		}
+	}
+
+	template <typename T>
+	T Parse(const std::string& value) {
+		return Parse<T>(value.c_str());
+	}
+
+	template <typename T>
+	bool TryParse(const std::string& value, T& dst) {
+		return TryParse<T>(value.c_str(), dst);
+	}
+
+	bool TryParse(const std::string& x, const std::string& y, const std::string& z, NiPoint3& dst);
+
+	template<typename T>
+	std::u16string to_u16string(T value) {
 		return GeneralUtils::ASCIIToUTF16(std::to_string(value));
 	}
 
 	// From boost::hash_combine
 	template <class T>
-	constexpr void hash_combine(std::size_t& s, const T& v) {
+	void hash_combine(std::size_t& s, const T& v) {
 		std::hash<T> h;
 		s ^= h(v) + 0x9e3779b9 + (s << 6) + (s >> 2);
 	}
@@ -249,7 +219,7 @@ namespace GeneralUtils {
 	  \param max The maximum to generate to
 	 */
 	template <typename T>
-	inline T GenerateRandomNumber(const std::size_t min, const std::size_t max) {
+	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");
 
@@ -269,17 +239,19 @@ namespace GeneralUtils {
 	 * @param entry Enum entry to cast
 	 * @returns The enum entry's value in its underlying type
 	*/
-	template <Enum eType>
-	constexpr std::underlying_type_t<eType> ToUnderlying(const eType entry) noexcept {
-		return static_cast<std::underlying_type_t<eType>>(entry);
+	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
+	#ifdef _WIN32
+	#undef min
+	#undef max
+	#endif
 
 	template <typename T>
 	inline T GenerateRandomNumber() {

dCommon/LDFFormat.cpp

@@ -61,33 +61,33 @@ LDFBaseData* LDFBaseData::DataFromString(const std::string_view& format) {
 	}
 
 	case LDF_TYPE_S32: {
-		const auto data = GeneralUtils::TryParse<int32_t>(ldfTypeAndValue.second);
-		if (!data) {
+		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());
 			return nullptr;
 		}
-		returnValue = new LDFData<int32_t>(key, data.value());
+		returnValue = new LDFData<int32_t>(key, data);
 
 		break;
 	}
 
 	case LDF_TYPE_FLOAT: {
-		const auto data = GeneralUtils::TryParse<float>(ldfTypeAndValue.second);
-		if (!data) {
+		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());
 			return nullptr;
 		}
-		returnValue = new LDFData<float>(key, data.value());
+		returnValue = new LDFData<float>(key, data);
 		break;
 	}
 
 	case LDF_TYPE_DOUBLE: {
-		const auto data = GeneralUtils::TryParse<double>(ldfTypeAndValue.second);
-		if (!data) {
+		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());
 			return nullptr;
 		}
-		returnValue = new LDFData<double>(key, data.value());
+		returnValue = new LDFData<double>(key, data);
 		break;
 	}
 
@@ -100,12 +100,10 @@ LDFBaseData* LDFBaseData::DataFromString(const std::string_view& format) {
 		} else if (ldfTypeAndValue.second == "false") {
 			data = 0;
 		} else {
-			const auto dataOptional = GeneralUtils::TryParse<uint32_t>(ldfTypeAndValue.second);
-			if (!dataOptional) {
+			if (!GeneralUtils::TryParse(ldfTypeAndValue.second.data(), data)) {
 				LOG("Warning: Attempted to process invalid uint32 value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
 				return nullptr;
 			}
-			data = dataOptional.value();
 		}
 
 		returnValue = new LDFData<uint32_t>(key, data);
@@ -120,12 +118,10 @@ LDFBaseData* LDFBaseData::DataFromString(const std::string_view& format) {
 		} else if (ldfTypeAndValue.second == "false") {
 			data = false;
 		} else {
-			const auto dataOptional = GeneralUtils::TryParse<bool>(ldfTypeAndValue.second);
-			if (!dataOptional) {
+			if (!GeneralUtils::TryParse(ldfTypeAndValue.second.data(), data)) {
 				LOG("Warning: Attempted to process invalid bool value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
 				return nullptr;
 			}
-			data = dataOptional.value();
 		}
 
 		returnValue = new LDFData<bool>(key, data);
@@ -133,22 +129,22 @@ LDFBaseData* LDFBaseData::DataFromString(const std::string_view& format) {
 	}
 
 	case LDF_TYPE_U64: {
-		const auto data = GeneralUtils::TryParse<uint64_t>(ldfTypeAndValue.second);
-		if (!data) {
+		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());
 			return nullptr;
 		}
-		returnValue = new LDFData<uint64_t>(key, data.value());
+		returnValue = new LDFData<uint64_t>(key, data);
 		break;
 	}
 
 	case LDF_TYPE_OBJID: {
-		const auto data = GeneralUtils::TryParse<LWOOBJID>(ldfTypeAndValue.second);
-		if (!data) {
+		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());
 			return nullptr;
 		}
-		returnValue = new LDFData<LWOOBJID>(key, data.value());
+		returnValue = new LDFData<LWOOBJID>(key, data);
 		break;
 	}
 

dCommon/LDFFormat.h

@@ -31,7 +31,7 @@ public:
 
 	virtual ~LDFBaseData() {}
 
-	virtual void WriteToPacket(RakNet::BitStream& packet) = 0;
+	virtual void WriteToPacket(RakNet::BitStream* packet) = 0;
 
 	virtual const std::u16string& GetKey() = 0;
 
@@ -62,17 +62,17 @@ private:
 	T value;
 
 	//! Writes the key to the packet
-	void WriteKey(RakNet::BitStream& packet) {
-		packet.Write<uint8_t>(this->key.length() * sizeof(uint16_t));
+	void WriteKey(RakNet::BitStream* packet) {
+		packet->Write<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<uint16_t>(this->key[i]);
 		}
 	}
 
 	//! Writes the value to the packet
-	void WriteValue(RakNet::BitStream& packet) {
-		packet.Write<uint8_t>(this->GetValueType());
-		packet.Write(this->value);
+	void WriteValue(RakNet::BitStream* packet) {
+		packet->Write<uint8_t>(this->GetValueType());
+		packet->Write(this->value);
 	}
 
 public:
@@ -108,7 +108,7 @@ public:
 	/*!
 	  \param packet The packet
 	 */
-	void WriteToPacket(RakNet::BitStream& packet) override {
+	void WriteToPacket(RakNet::BitStream* packet) override {
 		this->WriteKey(packet);
 		this->WriteValue(packet);
 	}
@@ -162,7 +162,7 @@ public:
 		return new LDFData<T>(key, value);
 	}
 
-	inline static const T Default = {};
+	inline static T Default = {};
 };
 
 // LDF Types
@@ -178,31 +178,31 @@ 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());
+inline void LDFData<std::u16string>::WriteValue(RakNet::BitStream* packet) {
+	packet->Write<uint8_t>(this->GetValueType());
 
-	packet.Write<uint32_t>(this->value.length());
+	packet->Write<uint32_t>(this->value.length());
 	for (uint32_t i = 0; i < this->value.length(); ++i) {
-		packet.Write<uint16_t>(this->value[i]);
+		packet->Write<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());
+inline void LDFData<bool>::WriteValue(RakNet::BitStream* packet) {
+	packet->Write<uint8_t>(this->GetValueType());
 
-	packet.Write<uint8_t>(this->value);
+	packet->Write<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());
+inline void LDFData<std::string>::WriteValue(RakNet::BitStream* packet) {
+	packet->Write<uint8_t>(this->GetValueType());
 
-	packet.Write<uint32_t>(this->value.length());
+	packet->Write<uint32_t>(this->value.length());
 	for (uint32_t i = 0; i < this->value.length(); ++i) {
-		packet.Write<uint8_t>(this->value[i]);
+		packet->Write<uint8_t>(this->value[i]);
 	}
 }
 

dCommon/PositionUpdate.h

@@ -6,14 +6,28 @@
 
 
 struct RemoteInputInfo {
+	RemoteInputInfo() {
+		m_RemoteInputX = 0;
+		m_RemoteInputY = 0;
+		m_IsPowersliding = false;
+		m_IsModified = false;
+	}
+
+	void operator=(const RemoteInputInfo& other) {
+		m_RemoteInputX = other.m_RemoteInputX;
+		m_RemoteInputY = other.m_RemoteInputY;
+		m_IsPowersliding = other.m_IsPowersliding;
+		m_IsModified = other.m_IsModified;
+	}
+
 	bool operator==(const RemoteInputInfo& other) {
 		return m_RemoteInputX == other.m_RemoteInputX && m_RemoteInputY == other.m_RemoteInputY && m_IsPowersliding == other.m_IsPowersliding && m_IsModified == other.m_IsModified;
 	}
 
-	float m_RemoteInputX = 0;
-	float m_RemoteInputY = 0;
-	bool m_IsPowersliding = false;
-	bool m_IsModified = false;
+	float m_RemoteInputX;
+	float m_RemoteInputY;
+	bool m_IsPowersliding;
+	bool m_IsModified;
 };
 
 struct LocalSpaceInfo {

dCommon/SHA512.cpp

@@ -0,0 +1,154 @@
+// Source: http://www.zedwood.com/article/cpp-sha512-function
+
+#include "SHA512.h"
+
+#include <cstring>
+#include <fstream>
+
+const unsigned long long SHA512::sha512_k[80] = //ULL = uint64
+{ 0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL,
+	0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL,
+	0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL,
+	0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL,
+	0xd807aa98a3030242ULL, 0x12835b0145706fbeULL,
+	0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
+	0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL,
+	0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL,
+	0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL,
+	0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL,
+	0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL,
+	0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
+	0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL,
+	0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL,
+	0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL,
+	0x06ca6351e003826fULL, 0x142929670a0e6e70ULL,
+	0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL,
+	0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
+	0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL,
+	0x81c2c92e47edaee6ULL, 0x92722c851482353bULL,
+	0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL,
+	0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL,
+	0xd192e819d6ef5218ULL, 0xd69906245565a910ULL,
+	0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
+	0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL,
+	0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL,
+	0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL,
+	0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL,
+	0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL,
+	0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
+	0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL,
+	0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL,
+	0xca273eceea26619cULL, 0xd186b8c721c0c207ULL,
+	0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL,
+	0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL,
+	0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
+	0x28db77f523047d84ULL, 0x32caab7b40c72493ULL,
+	0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL,
+	0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL,
+	0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL };
+
+void SHA512::transform(const unsigned char* message, unsigned int block_nb) {
+	uint64 w[80];
+	uint64 wv[8];
+	uint64 t1, t2;
+	const unsigned char* sub_block;
+	int i, j;
+	for (i = 0; i < (int)block_nb; i++) {
+		sub_block = message + (i << 7);
+		for (j = 0; j < 16; j++) {
+			SHA2_PACK64(&sub_block[j << 3], &w[j]);
+		}
+		for (j = 16; j < 80; j++) {
+			w[j] = SHA512_F4(w[j - 2]) + w[j - 7] + SHA512_F3(w[j - 15]) + w[j - 16];
+		}
+		for (j = 0; j < 8; j++) {
+			wv[j] = m_h[j];
+		}
+		for (j = 0; j < 80; j++) {
+			t1 = wv[7] + SHA512_F2(wv[4]) + SHA2_CH(wv[4], wv[5], wv[6])
+				+ sha512_k[j] + w[j];
+			t2 = SHA512_F1(wv[0]) + SHA2_MAJ(wv[0], wv[1], wv[2]);
+			wv[7] = wv[6];
+			wv[6] = wv[5];
+			wv[5] = wv[4];
+			wv[4] = wv[3] + t1;
+			wv[3] = wv[2];
+			wv[2] = wv[1];
+			wv[1] = wv[0];
+			wv[0] = t1 + t2;
+		}
+		for (j = 0; j < 8; j++) {
+			m_h[j] += wv[j];
+		}
+
+	}
+}
+
+void SHA512::init() {
+	m_h[0] = 0x6a09e667f3bcc908ULL;
+	m_h[1] = 0xbb67ae8584caa73bULL;
+	m_h[2] = 0x3c6ef372fe94f82bULL;
+	m_h[3] = 0xa54ff53a5f1d36f1ULL;
+	m_h[4] = 0x510e527fade682d1ULL;
+	m_h[5] = 0x9b05688c2b3e6c1fULL;
+	m_h[6] = 0x1f83d9abfb41bd6bULL;
+	m_h[7] = 0x5be0cd19137e2179ULL;
+	m_len = 0;
+	m_tot_len = 0;
+}
+
+void SHA512::update(const unsigned char* message, unsigned int len) {
+	unsigned int block_nb;
+	unsigned int new_len, rem_len, tmp_len;
+	const unsigned char* shifted_message;
+	tmp_len = SHA384_512_BLOCK_SIZE - m_len;
+	rem_len = len < tmp_len ? len : tmp_len;
+	memcpy(&m_block[m_len], message, rem_len);
+	if (m_len + len < SHA384_512_BLOCK_SIZE) {
+		m_len += len;
+		return;
+	}
+	new_len = len - rem_len;
+	block_nb = new_len / SHA384_512_BLOCK_SIZE;
+	shifted_message = message + rem_len;
+	transform(m_block, 1);
+	transform(shifted_message, block_nb);
+	rem_len = new_len % SHA384_512_BLOCK_SIZE;
+	memcpy(m_block, &shifted_message[block_nb << 7], rem_len);
+	m_len = rem_len;
+	m_tot_len += (block_nb + 1) << 7;
+}
+
+void SHA512::final(unsigned char* digest) {
+	unsigned int block_nb;
+	unsigned int pm_len;
+	unsigned int len_b;
+	int i;
+	block_nb = 1 + ((SHA384_512_BLOCK_SIZE - 17)
+		< (m_len % SHA384_512_BLOCK_SIZE));
+	len_b = (m_tot_len + m_len) << 3;
+	pm_len = block_nb << 7;
+	memset(m_block + m_len, 0, pm_len - m_len);
+	m_block[m_len] = 0x80;
+	SHA2_UNPACK32(len_b, m_block + pm_len - 4);
+	transform(m_block, block_nb);
+	for (i = 0; i < 8; i++) {
+		SHA2_UNPACK64(m_h[i], &digest[i << 3]);
+	}
+}
+
+std::string sha512(std::string input) {
+	unsigned char digest[SHA512::DIGEST_SIZE];
+	memset(digest, 0, SHA512::DIGEST_SIZE);
+	class SHA512 ctx;
+	ctx.init();
+	ctx.update((unsigned char*)input.c_str(), input.length());
+	ctx.final(digest);
+
+	char buf[2 * SHA512::DIGEST_SIZE + 1];
+	buf[2 * SHA512::DIGEST_SIZE] = 0;
+	for (int i = 0; i < SHA512::DIGEST_SIZE; i++)
+		sprintf(buf + i * 2, "%02x", digest[i]);
+
+	return std::string(buf);
+}

dCommon/SHA512.h

@@ -0,0 +1,68 @@
+#pragma once
+
+// C++
+#include <string>
+
+class SHA512 {
+protected:
+	typedef unsigned char uint8;
+	typedef unsigned int uint32;
+	typedef unsigned long long uint64;
+
+	const static uint64 sha512_k[];
+	static const unsigned int SHA384_512_BLOCK_SIZE = (1024 / 8);
+
+public:
+	void init();
+	void update(const unsigned char* message, unsigned int len);
+	void final(unsigned char* digest);
+	static const unsigned int DIGEST_SIZE = (512 / 8);
+
+protected:
+	void transform(const unsigned char* message, unsigned int block_nb);
+	unsigned int m_tot_len;
+	unsigned int m_len;
+	unsigned char m_block[2 * SHA384_512_BLOCK_SIZE];
+	uint64 m_h[8];
+};
+
+std::string sha512(std::string input);
+
+#define SHA2_SHFR(x, n)    (x >> n)
+#define SHA2_ROTR(x, n)   ((x >> n) | (x << ((sizeof(x) << 3) - n)))
+#define SHA2_ROTL(x, n)   ((x << n) | (x >> ((sizeof(x) << 3) - n)))
+#define SHA2_CH(x, y, z)  ((x & y) ^ (~x & z))
+#define SHA2_MAJ(x, y, z) ((x & y) ^ (x & z) ^ (y & z))
+#define SHA512_F1(x) (SHA2_ROTR(x, 28) ^ SHA2_ROTR(x, 34) ^ SHA2_ROTR(x, 39))
+#define SHA512_F2(x) (SHA2_ROTR(x, 14) ^ SHA2_ROTR(x, 18) ^ SHA2_ROTR(x, 41))
+#define SHA512_F3(x) (SHA2_ROTR(x,  1) ^ SHA2_ROTR(x,  8) ^ SHA2_SHFR(x,  7))
+#define SHA512_F4(x) (SHA2_ROTR(x, 19) ^ SHA2_ROTR(x, 61) ^ SHA2_SHFR(x,  6))
+#define SHA2_UNPACK32(x, str)                 \
+{                                             \
+*((str) + 3) = (uint8) ((x)      );       \
+*((str) + 2) = (uint8) ((x) >>  8);       \
+*((str) + 1) = (uint8) ((x) >> 16);       \
+*((str) + 0) = (uint8) ((x) >> 24);       \
+}
+#define SHA2_UNPACK64(x, str)                 \
+{                                             \
+*((str) + 7) = (uint8) ((x)      );       \
+*((str) + 6) = (uint8) ((x) >>  8);       \
+*((str) + 5) = (uint8) ((x) >> 16);       \
+*((str) + 4) = (uint8) ((x) >> 24);       \
+*((str) + 3) = (uint8) ((x) >> 32);       \
+*((str) + 2) = (uint8) ((x) >> 40);       \
+*((str) + 1) = (uint8) ((x) >> 48);       \
+*((str) + 0) = (uint8) ((x) >> 56);       \
+}
+#define SHA2_PACK64(str, x)                   \
+{                                             \
+*(x) =   ((uint64) *((str) + 7)      )    \
+| ((uint64) *((str) + 6) <<  8)    \
+| ((uint64) *((str) + 5) << 16)    \
+| ((uint64) *((str) + 4) << 24)    \
+| ((uint64) *((str) + 3) << 32)    \
+| ((uint64) *((str) + 2) << 40)    \
+| ((uint64) *((str) + 1) << 48)    \
+| ((uint64) *((str) + 0) << 56);   \
+}

dCommon/dClient/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(DCOMMON_DCLIENT_SOURCES
-	"AssetManager.cpp"
 	"PackIndex.cpp"
 	"Pack.cpp"
+	"AssetManager.cpp"
 	PARENT_SCOPE
 )

dCommon/dClient/ClientVersion.h

@@ -1,12 +0,0 @@
-#ifndef __CLIENTVERSION_H__
-#define __CLIENTVERSION_H__
-
-#include <cstdint>
-
-namespace ClientVersion {
-	constexpr uint16_t major = 1;
-	constexpr uint16_t current = 10;
-	constexpr uint16_t minor = 64;
-}
-
-#endif // !__CLIENTVERSION_H__

dCommon/dEnums/dCommonVars.h

@@ -34,89 +34,91 @@ constexpr uint32_t lowFrameDelta = FRAMES_TO_MS(lowFramerate);
 #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 SEND_PACKET Game::server->Send(bitStream, sysAddr, false);
-#define SEND_PACKET_BROADCAST Game::server->Send(bitStream, UNASSIGNED_SYSTEM_ADDRESS, true);
+#define SEND_PACKET Game::server->Send(&bitStream, sysAddr, false);
+#define SEND_PACKET_BROADCAST Game::server->Send(&bitStream, UNASSIGNED_SYSTEM_ADDRESS, true);
 
 //=========== TYPEDEFS ==========
 
-using LOT = int32_t;                        //!< A LOT
-using LWOOBJID = int64_t;                   //!< An object ID (should be unsigned actually but ok)
-using TSkillID = int32_t;                   //!< A skill ID
-using LWOCLONEID = uint32_t;                 //!< Used for Clone IDs
-using LWOMAPID = uint16_t;                   //!< Used for Map IDs
-using LWOINSTANCEID = uint16_t;              //!< Used for Instance IDs
-using PROPERTYCLONELIST = uint32_t;          //!< Used for Property Clone IDs
-using StripId = uint32_t;
+typedef int32_t LOT;                        //!< A LOT
+typedef int64_t LWOOBJID;                   //!< An object ID (should be unsigned actually but ok)
+typedef int32_t TSkillID;                   //!< A skill ID
+typedef uint32_t LWOCLONEID;                 //!< Used for Clone IDs
+typedef uint16_t LWOMAPID;                   //!< Used for Map IDs
+typedef uint16_t LWOINSTANCEID;              //!< Used for Instance IDs
+typedef uint32_t PROPERTYCLONELIST;          //!< Used for Property Clone IDs
+typedef uint32_t StripId;
 
-constexpr LWOOBJID LWOOBJID_EMPTY = 0;          	//!< An empty object ID
-constexpr LOT LOT_NULL = -1;                    	//!< A null LOT
-constexpr int32_t LOOTTYPE_NONE = 0;            	//!< No loot type available
-constexpr float SECONDARY_PRIORITY = 1.0f;      	//!< Secondary Priority
-constexpr uint32_t INVENTORY_MAX = 9999999;     	//!< The Maximum Inventory Size
-constexpr LWOCLONEID LWOCLONEID_INVALID = -1;     	//!< Invalid LWOCLONEID
-constexpr LWOINSTANCEID LWOINSTANCEID_INVALID = -1; //!< Invalid LWOINSTANCEID
-constexpr LWOMAPID LWOMAPID_INVALID = -1;       	//!< Invalid LWOMAPID
-constexpr uint64_t LWOZONEID_INVALID = 0;       	//!< Invalid LWOZONEID
+const LWOOBJID LWOOBJID_EMPTY = 0;          //!< An empty object ID
+const LOT LOT_NULL = -1;                    //!< A null LOT
+const int32_t LOOTTYPE_NONE = 0;            //!< No loot type available
+const float SECONDARY_PRIORITY = 1.0f;      //!< Secondary Priority
+const uint32_t INVENTORY_MAX = 9999999;     //!< The Maximum Inventory Size
+const uint32_t LWOCLONEID_INVALID = -1;     //!< Invalid LWOCLONEID
+const uint16_t LWOINSTANCEID_INVALID = -1;  //!< Invalid LWOINSTANCEID
+const uint16_t LWOMAPID_INVALID = -1;       //!< Invalid LWOMAPID
+const uint64_t LWOZONEID_INVALID = 0;       //!< Invalid LWOZONEID
 
-constexpr float PI = 3.14159f;
+const float PI = 3.14159f;
 
 //============ STRUCTS ==============
 
 struct LWOSCENEID {
 public:
-	constexpr LWOSCENEID() noexcept { m_sceneID = -1; m_layerID = 0; }
-	constexpr LWOSCENEID(int32_t sceneID) noexcept { m_sceneID = sceneID; m_layerID = 0; }
-	constexpr LWOSCENEID(int32_t sceneID, uint32_t layerID) noexcept { m_sceneID = sceneID; m_layerID = layerID; }
+	LWOSCENEID() { m_sceneID = -1; m_layerID = 0; }
+	LWOSCENEID(int sceneID) { m_sceneID = sceneID; m_layerID = 0; }
+	LWOSCENEID(int sceneID, unsigned int layerID) { m_sceneID = sceneID; m_layerID = layerID; }
 
-	constexpr LWOSCENEID& operator=(const LWOSCENEID& rhs) noexcept { m_sceneID = rhs.m_sceneID; m_layerID = rhs.m_layerID; return *this; }
-	constexpr LWOSCENEID& operator=(const int32_t rhs) noexcept { m_sceneID = rhs; m_layerID = 0; return *this; }
+	LWOSCENEID& operator=(const LWOSCENEID& rhs) { m_sceneID = rhs.m_sceneID; m_layerID = rhs.m_layerID; return *this; }
+	LWOSCENEID& operator=(const int rhs) { m_sceneID = rhs; m_layerID = 0; return *this; }
 
-	constexpr bool operator<(const LWOSCENEID& rhs) const noexcept { return (m_sceneID < rhs.m_sceneID || (m_sceneID == rhs.m_sceneID && m_layerID < rhs.m_layerID)); }
-	constexpr bool operator<(const int32_t rhs) const noexcept { return m_sceneID < rhs; }
+	bool operator<(const LWOSCENEID& rhs) const { return (m_sceneID < rhs.m_sceneID || (m_sceneID == rhs.m_sceneID && m_layerID < rhs.m_layerID)); }
+	bool operator<(const int rhs) const { return m_sceneID < rhs; }
 
-	constexpr bool operator==(const LWOSCENEID& rhs) const noexcept { return (m_sceneID == rhs.m_sceneID && m_layerID == rhs.m_layerID); }
-	constexpr bool operator==(const int32_t rhs) const noexcept { return m_sceneID == rhs; }
+	bool operator==(const LWOSCENEID& rhs) const { return (m_sceneID == rhs.m_sceneID && m_layerID == rhs.m_layerID); }
+	bool operator==(const int rhs) const { return m_sceneID == rhs; }
 
-	constexpr int32_t GetSceneID() const noexcept { return m_sceneID; }
-	constexpr uint32_t GetLayerID() const noexcept { return m_layerID; }
+	const int GetSceneID() const { return m_sceneID; }
+	const unsigned int GetLayerID() const { return m_layerID; }
 
-	constexpr void SetSceneID(const int32_t sceneID) noexcept { m_sceneID = sceneID; }
-	constexpr void SetLayerID(const uint32_t layerID) noexcept { m_layerID = layerID; }
+	void SetSceneID(const int sceneID) { m_sceneID = sceneID; }
+	void SetLayerID(const unsigned int layerID) { m_layerID = layerID; }
 
 private:
-	int32_t m_sceneID;
-	uint32_t m_layerID;
+	int m_sceneID;
+	unsigned int m_layerID;
 };
 
 struct LWOZONEID {
 public:
-	constexpr const LWOMAPID& GetMapID() const noexcept { return m_MapID; }
-	constexpr const LWOINSTANCEID& GetInstanceID() const noexcept { return m_InstanceID; }
-	constexpr const LWOCLONEID& GetCloneID() const noexcept { return m_CloneID; }
+	const LWOMAPID& GetMapID() const { return m_MapID; }
+	const LWOINSTANCEID& GetInstanceID() const { return m_InstanceID; }
+	const LWOCLONEID& GetCloneID() const { return m_CloneID; }
 
 	//In order: def constr, constr, assign op
-	constexpr LWOZONEID() noexcept = default;
-	constexpr LWOZONEID(const LWOMAPID& mapID, const LWOINSTANCEID& instanceID, const LWOCLONEID& cloneID) noexcept { m_MapID = mapID; m_InstanceID = instanceID; m_CloneID = cloneID; }
-	constexpr LWOZONEID(const LWOZONEID& replacement) noexcept { *this = replacement; }
+	LWOZONEID() { m_MapID = LWOMAPID_INVALID; m_InstanceID = LWOINSTANCEID_INVALID; m_CloneID = LWOCLONEID_INVALID; }
+	LWOZONEID(const LWOMAPID& mapID, const LWOINSTANCEID& instanceID, const LWOCLONEID& cloneID) { m_MapID = mapID; m_InstanceID = instanceID; m_CloneID = cloneID; }
+	LWOZONEID(const LWOZONEID& replacement) { *this = replacement; }
 
 private:
-	LWOMAPID m_MapID = LWOMAPID_INVALID; //1000 for VE, 1100 for AG, etc...
-	LWOINSTANCEID m_InstanceID = LWOINSTANCEID_INVALID; //Instances host the same world, but on a different dWorld process.
-	LWOCLONEID m_CloneID = LWOCLONEID_INVALID; //To differentiate between "your property" and "my property". Always 0 for non-prop worlds.
+	LWOMAPID m_MapID; //1000 for VE, 1100 for AG, etc...
+	LWOINSTANCEID m_InstanceID; //Instances host the same world, but on a different dWorld process.
+	LWOCLONEID m_CloneID; //To differentiate between "your property" and "my property". Always 0 for non-prop worlds.
 };
 
-constexpr LWOSCENEID LWOSCENEID_INVALID = -1;
+const LWOSCENEID LWOSCENEID_INVALID = -1;
 
 struct LWONameValue {
 	uint32_t length = 0;        //!< The length of the name
 	std::u16string name;			//!< The name
 
-	LWONameValue() = default;
+	LWONameValue(void) {}
 
 	LWONameValue(const std::u16string& name) {
 		this->name = name;
 		this->length = static_cast<uint32_t>(name.length());
 	}
+
+	~LWONameValue(void) {}
 };
 
 struct FriendData {

dCommon/dEnums/eChatInternalMessageType.h

@@ -0,0 +1,31 @@
+#ifndef __ECHATINTERNALMESSAGETYPE__H__
+#define __ECHATINTERNALMESSAGETYPE__H__
+
+#include <cstdint>
+
+enum eChatInternalMessageType : uint32_t {
+	PLAYER_ADDED_NOTIFICATION = 0,
+	PLAYER_REMOVED_NOTIFICATION,
+	ADD_FRIEND,
+	ADD_BEST_FRIEND,
+	ADD_TO_TEAM,
+	ADD_BLOCK,
+	REMOVE_FRIEND,
+	REMOVE_BLOCK,
+	REMOVE_FROM_TEAM,
+	DELETE_TEAM,
+	REPORT,
+	PRIVATE_CHAT,
+	PRIVATE_CHAT_RESPONSE,
+	ANNOUNCEMENT,
+	MAIL_COUNT_UPDATE,
+	MAIL_SEND_NOTIFY,
+	REQUEST_USER_LIST,
+	FRIEND_LIST,
+	ROUTE_TO_PLAYER,
+	TEAM_UPDATE,
+	MUTE_UPDATE,
+	CREATE_TEAM,
+};
+
+#endif  //!__ECHATINTERNALMESSAGETYPE__H__

dCommon/dEnums/eChatMessageType.h

@@ -72,9 +72,7 @@ enum class eChatMessageType :uint32_t {
 	UPDATE_DONATION,
 	PRG_CSR_COMMAND,
 	HEARTBEAT_REQUEST_FROM_WORLD,
-	UPDATE_FREE_TRIAL_STATUS,
-	// CUSTOM DLU MESSAGE ID FOR INTERNAL USE
-	CREATE_TEAM,
+	UPDATE_FREE_TRIAL_STATUS
 };
 
 #endif  //!__ECHATMESSAGETYPE__H__

dCommon/dEnums/eConnectionType.h

@@ -5,7 +5,8 @@ enum class eConnectionType : uint16_t {
 	SERVER = 0,
 	AUTH,
 	CHAT,
-	WORLD = 4,
+	CHAT_INTERNAL,
+	WORLD,
 	CLIENT,
 	MASTER
 };

dCommon/dEnums/eGameMessageType.h

@@ -790,10 +790,9 @@ enum class eGameMessageType : uint16_t {
 	GET_MISSION_TYPE_STATES = 853,
 	GET_TIME_PLAYED = 854,
 	SET_MISSION_VIEWED = 855,
-	HKX_VEHICLE_LOADED = 856,
-	SLASH_COMMAND_TEXT_FEEDBACK = 857,
+	SLASH_COMMAND_TEXT_FEEDBACK = 856,
+	HANDLE_SLASH_COMMAND_KORE_DEBUGGER = 857,
 	BROADCAST_TEXT_TO_CHATBOX = 858,
-	HANDLE_SLASH_COMMAND_KORE_DEBUGGER = 859,
 	OPEN_PROPERTY_MANAGEMENT = 860,
 	OPEN_PROPERTY_VENDOR = 861,
 	VOTE_ON_PROPERTY = 862,

dCommon/dEnums/eReplicaComponentType.h

@@ -106,7 +106,7 @@ enum class eReplicaComponentType : uint32_t {
 	INTERACTION_MANAGER,
 	DONATION_VENDOR,
 	COMBAT_MEDIATOR,
-	ACHIEVEMENT_VENDOR,
+	COMMENDATION_VENDOR,
 	GATE_RUSH_CONTROL,
 	RAIL_ACTIVATOR,
 	ROLLER,

dCommon/dEnums/eVendorTransactionResult.h

@@ -1,15 +0,0 @@
-#ifndef __EVENDORTRANSACTIONRESULT__
-#define __EVENDORTRANSACTIONRESULT__
-
-#include <cstdint>
-
-enum class eVendorTransactionResult : uint32_t {
-	SELL_SUCCESS = 0,
-	SELL_FAIL,
-	PURCHASE_SUCCESS,
-	PURCHASE_FAIL,
-	DONATION_FAIL,
-	DONATION_FULL
-};
-
-#endif // !__EVENDORTRANSACTIONRESULT__

dCommon/dEnums/eWaypointCommandType.h

@@ -1,59 +0,0 @@
-
-#ifndef __EWAYPOINTCOMMANDTYPES__H__
-#define __EWAYPOINTCOMMANDTYPES__H__
-
-#include <cstdint>
-
-enum class eWaypointCommandType : uint32_t {
-	INVALID,
-	BOUNCE,
-	STOP,
-	GROUP_EMOTE,
-	SET_VARIABLE,
-	CAST_SKILL,
-	EQUIP_INVENTORY,
-	UNEQUIP_INVENTORY,
-	DELAY,
-	EMOTE,
-	TELEPORT,
-	PATH_SPEED,
-	REMOVE_NPC,
-	CHANGE_WAYPOINT,
-	DELETE_SELF,
-	KILL_SELF,
-	SPAWN_OBJECT,
-	PLAY_SOUND,
-};
-
-class WaypointCommandType {
-public:
-	static eWaypointCommandType StringToWaypointCommandType(std::string commandString) {
-		const std::map<std::string, eWaypointCommandType> WaypointCommandTypeMap = {
-			{"bounce", eWaypointCommandType::BOUNCE},
-			{"stop", eWaypointCommandType::STOP},
-			{"groupemote", eWaypointCommandType::GROUP_EMOTE},
-			{"setvar", eWaypointCommandType::SET_VARIABLE},
-			{"castskill", eWaypointCommandType::CAST_SKILL},
-			{"eqInvent", eWaypointCommandType::EQUIP_INVENTORY},
-			{"unInvent", eWaypointCommandType::UNEQUIP_INVENTORY},
-			{"delay", eWaypointCommandType::DELAY},
-			{"femote", eWaypointCommandType::EMOTE},
-			{"emote", eWaypointCommandType::EMOTE},
-			{"teleport", eWaypointCommandType::TELEPORT},
-			{"pathspeed", eWaypointCommandType::PATH_SPEED},
-			{"removeNPC", eWaypointCommandType::REMOVE_NPC},
-			{"changeWP", eWaypointCommandType::CHANGE_WAYPOINT},
-			{"DeleteSelf", eWaypointCommandType::DELETE_SELF},
-			{"killself", eWaypointCommandType::KILL_SELF},
-			{"removeself", eWaypointCommandType::DELETE_SELF},
-			{"spawnOBJ", eWaypointCommandType::SPAWN_OBJECT},
-			{"playSound", eWaypointCommandType::PLAY_SOUND},
-		};
-
-		auto intermed = WaypointCommandTypeMap.find(commandString);
-		return (intermed != WaypointCommandTypeMap.end()) ? intermed->second : eWaypointCommandType::INVALID;
-	};
-};
-
-
-#endif  //!__EWAYPOINTCOMMANDTYPES__H__

dCommon/dEnums/eWorldMessageType.h

@@ -29,8 +29,8 @@ enum class eWorldMessageType : uint32_t {
 	ROUTE_PACKET,  // 				Social?
 	POSITION_UPDATE,
 	MAIL,
-	WORD_CHECK, // 				AllowList word check
-	STRING_CHECK,  // 				AllowList string check
+	WORD_CHECK, // 				Whitelist word check
+	STRING_CHECK,  // 				Whitelist string check
 	GET_PLAYERS_IN_ZONE,
 	REQUEST_UGC_MANIFEST_INFO,
 	BLUEPRINT_GET_ALL_DATA_REQUEST,

dDatabase/CDClientDatabase/CDClientManager.cpp

@@ -25,7 +25,6 @@
 #include "CDScriptComponentTable.h"
 #include "CDSkillBehaviorTable.h"
 #include "CDZoneTableTable.h"
-#include "CDTamingBuildPuzzleTable.h"
 #include "CDVendorComponentTable.h"
 #include "CDActivitiesTable.h"
 #include "CDPackageComponentTable.h"
@@ -40,7 +39,8 @@
 #include "CDFeatureGatingTable.h"
 #include "CDRailActivatorComponent.h"
 #include "CDRewardCodesTable.h"
-#include "CDPetComponentTable.h"
+
+#include <exception>
 
 #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.
@@ -54,60 +54,15 @@
 	#define CDCLIENT_DONT_CACHE_TABLE(x)
 #endif
 
-// Using a macro to reduce repetitive code and issues from copy and paste.
-// As a note, ## in a macro is used to concatenate two tokens together.
-
-#define SPECIALIZE_TABLE_STORAGE(table) \
-	template<> typename table::StorageType& CDClientManager::GetEntriesMutable<table>() { return table##Entries; };
-
-#define DEFINE_TABLE_STORAGE(table) namespace { table::StorageType table##Entries; }; SPECIALIZE_TABLE_STORAGE(table)
-
-DEFINE_TABLE_STORAGE(CDActivityRewardsTable);
-DEFINE_TABLE_STORAGE(CDActivitiesTable);
-DEFINE_TABLE_STORAGE(CDAnimationsTable);
-DEFINE_TABLE_STORAGE(CDBehaviorParameterTable);
-DEFINE_TABLE_STORAGE(CDBehaviorTemplateTable);
-DEFINE_TABLE_STORAGE(CDBrickIDTableTable);
-DEFINE_TABLE_STORAGE(CDComponentsRegistryTable);
-DEFINE_TABLE_STORAGE(CDCurrencyTableTable);
-DEFINE_TABLE_STORAGE(CDDestructibleComponentTable);
-DEFINE_TABLE_STORAGE(CDEmoteTableTable);
-DEFINE_TABLE_STORAGE(CDFeatureGatingTable);
-DEFINE_TABLE_STORAGE(CDInventoryComponentTable);
-DEFINE_TABLE_STORAGE(CDItemComponentTable);
-DEFINE_TABLE_STORAGE(CDItemSetSkillsTable);
-DEFINE_TABLE_STORAGE(CDItemSetsTable);
-DEFINE_TABLE_STORAGE(CDLevelProgressionLookupTable);
-DEFINE_TABLE_STORAGE(CDLootMatrixTable);
-DEFINE_TABLE_STORAGE(CDLootTableTable);
-DEFINE_TABLE_STORAGE(CDMissionEmailTable);
-DEFINE_TABLE_STORAGE(CDMissionNPCComponentTable);
-DEFINE_TABLE_STORAGE(CDMissionTasksTable);
-DEFINE_TABLE_STORAGE(CDMissionsTable);
-DEFINE_TABLE_STORAGE(CDMovementAIComponentTable);
-DEFINE_TABLE_STORAGE(CDObjectSkillsTable);
-DEFINE_TABLE_STORAGE(CDObjectsTable);
-DEFINE_TABLE_STORAGE(CDPhysicsComponentTable);
-DEFINE_TABLE_STORAGE(CDPackageComponentTable);
-DEFINE_TABLE_STORAGE(CDPetComponentTable);
-DEFINE_TABLE_STORAGE(CDProximityMonitorComponentTable);
-DEFINE_TABLE_STORAGE(CDPropertyEntranceComponentTable);
-DEFINE_TABLE_STORAGE(CDPropertyTemplateTable);
-DEFINE_TABLE_STORAGE(CDRailActivatorComponentTable);
-DEFINE_TABLE_STORAGE(CDRarityTableTable);
-DEFINE_TABLE_STORAGE(CDRebuildComponentTable);
-DEFINE_TABLE_STORAGE(CDRewardCodesTable);
-DEFINE_TABLE_STORAGE(CDRewardsTable);
-DEFINE_TABLE_STORAGE(CDScriptComponentTable);
-DEFINE_TABLE_STORAGE(CDSkillBehaviorTable);
-DEFINE_TABLE_STORAGE(CDTamingBuildPuzzleTable);
-DEFINE_TABLE_STORAGE(CDVendorComponentTable);
-DEFINE_TABLE_STORAGE(CDZoneTableTable);
+class CDClientConnectionException : public std::exception {
+public:
+	virtual const char* what() const throw() {
+		return "CDClientDatabase is not connected!";
+	}
+};
 
 void CDClientManager::LoadValuesFromDatabase() {
-	if (!CDClientDatabase::isConnected) {
-		throw std::runtime_error{ "CDClientDatabase is not connected!" };
-	}
+	if (!CDClientDatabase::isConnected) throw CDClientConnectionException();
 
 	CDActivityRewardsTable::Instance().LoadValuesFromDatabase();
 	CDActivitiesTable::Instance().LoadValuesFromDatabase();
@@ -147,7 +102,6 @@ void CDClientManager::LoadValuesFromDatabase() {
 	CDRewardsTable::Instance().LoadValuesFromDatabase();
 	CDScriptComponentTable::Instance().LoadValuesFromDatabase();
 	CDSkillBehaviorTable::Instance().LoadValuesFromDatabase();
-	CDTamingBuildPuzzleTable::Instance().LoadValuesFromDatabase();
 	CDVendorComponentTable::Instance().LoadValuesFromDatabase();
 	CDZoneTableTable::Instance().LoadValuesFromDatabase();
 }

dDatabase/CDClientDatabase/CDClientManager.h

@@ -1,12 +1,18 @@
-#ifndef __CDCLIENTMANAGER__H__
-#define __CDCLIENTMANAGER__H__
+#pragma once
+
+#include "CDTable.h"
+
+#include "Singleton.h"
 
 #define UNUSED_TABLE(v)
 
 /**
  * Initialize the CDClient tables so they are all loaded into memory.
  */
-namespace CDClientManager {
+class CDClientManager : public Singleton<CDClientManager> {
+public:
+	CDClientManager() = default;
+
 	void LoadValuesFromDatabase();
 	void LoadValuesFromDefaults();
 
@@ -17,28 +23,7 @@ namespace CDClientManager {
 	 * @return A pointer to the requested table.
 	 */
 	template<typename T>
-	T* GetTable();
-
-	/**
-	 * Fetch a table from CDClient
-	 * Note: Calling this function without a template specialization in CDClientManager.cpp will cause a linker error.
-	 * 
-	 * @tparam Table type to fetch
-	 * @return A pointer to the requested table.
-	 */
-	template<typename T>
-	typename T::StorageType& GetEntriesMutable();
+	T* GetTable() {
+		return &T::Instance();
+	}
 };
-
-
-// These are included after the CDClientManager namespace declaration as CDTable as of Jan 29 2024 relies on CDClientManager in Templated code.
-#include "CDTable.h"
-
-#include "Singleton.h"
-
-template<typename T>
-T* CDClientManager::GetTable() {
-	return &T::Instance();
-};
-
-#endif  //!__CDCLIENTMANAGER__H__

dDatabase/CDClientDatabase/CDClientTables/CDActivitiesTable.cpp

@@ -1,6 +1,5 @@
 #include "CDActivitiesTable.h"
 
-
 void CDActivitiesTable::LoadValuesFromDatabase() {
 	// First, get the size of the table
 	uint32_t size = 0;
@@ -14,8 +13,7 @@ void CDActivitiesTable::LoadValuesFromDatabase() {
 	tableSize.finalize();
 
 	// Reserve the size
-	auto& entries = GetEntriesMutable();
-	entries.reserve(size);
+	this->entries.reserve(size);
 
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM Activities");
@@ -41,7 +39,7 @@ void CDActivitiesTable::LoadValuesFromDatabase() {
 		entry.noTeamLootOnDeath = tableData.getIntField("noTeamLootOnDeath", -1);
 		entry.optionalPercentage = tableData.getFloatField("optionalPercentage", -1.0f);
 
-		entries.push_back(entry);
+		this->entries.push_back(entry);
 		tableData.nextRow();
 	}
 
@@ -50,7 +48,7 @@ void CDActivitiesTable::LoadValuesFromDatabase() {
 
 std::vector<CDActivities> CDActivitiesTable::Query(std::function<bool(CDActivities)> predicate) {
 
-	std::vector<CDActivities> data = cpplinq::from(GetEntries())
+	std::vector<CDActivities> data = cpplinq::from(this->entries)
 		>> cpplinq::where(predicate)
 		>> cpplinq::to_vector();
 

dDatabase/CDClientDatabase/CDClientTables/CDActivitiesTable.h

@@ -25,10 +25,15 @@ struct CDActivities {
 	float optionalPercentage;
 };
 
-class CDActivitiesTable : public CDTable<CDActivitiesTable, std::vector<CDActivities>> {
+class CDActivitiesTable : public CDTable<CDActivitiesTable> {
+private:
+	std::vector<CDActivities> entries;
+
 public:
 	void LoadValuesFromDatabase();
 
 	// Queries the table with a custom "where" clause
 	std::vector<CDActivities> Query(std::function<bool(CDActivities)> predicate);
+
+	const std::vector<CDActivities>& GetEntries() const { return this->entries; }
 };

dDatabase/CDClientDatabase/CDClientTables/CDActivityRewardsTable.cpp

@@ -1,6 +1,5 @@
 #include "CDActivityRewardsTable.h"
 
-
 void CDActivityRewardsTable::LoadValuesFromDatabase() {
 
 	// First, get the size of the table
@@ -15,8 +14,7 @@ void CDActivityRewardsTable::LoadValuesFromDatabase() {
 	tableSize.finalize();
 
 	// Reserve the size
-	auto& entries = GetEntriesMutable();
-	entries.reserve(size);
+	this->entries.reserve(size);
 
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM ActivityRewards");
@@ -30,7 +28,7 @@ void CDActivityRewardsTable::LoadValuesFromDatabase() {
 		entry.ChallengeRating = tableData.getIntField("ChallengeRating", -1);
 		entry.description = tableData.getStringField("description", "");
 
-		entries.push_back(entry);
+		this->entries.push_back(entry);
 		tableData.nextRow();
 	}
 
@@ -39,7 +37,7 @@ void CDActivityRewardsTable::LoadValuesFromDatabase() {
 
 std::vector<CDActivityRewards> CDActivityRewardsTable::Query(std::function<bool(CDActivityRewards)> predicate) {
 
-	std::vector<CDActivityRewards> data = cpplinq::from(GetEntries())
+	std::vector<CDActivityRewards> data = cpplinq::from(this->entries)
 		>> cpplinq::where(predicate)
 		>> cpplinq::to_vector();
 

dDatabase/CDClientDatabase/CDClientTables/CDActivityRewardsTable.h

@@ -13,9 +13,15 @@ struct CDActivityRewards {
 	std::string description;            //!< The description
 };
 
-class CDActivityRewardsTable : public CDTable<CDActivityRewardsTable, std::vector<CDActivityRewards>> {
+class CDActivityRewardsTable : public CDTable<CDActivityRewardsTable> {
+private:
+	std::vector<CDActivityRewards> entries;
+
 public:
 	void LoadValuesFromDatabase();
 	// Queries the table with a custom "where" clause
 	std::vector<CDActivityRewards> Query(std::function<bool(CDActivityRewards)> predicate);
+
+	std::vector<CDActivityRewards> GetEntries() const;
+
 };

dDatabase/CDClientDatabase/CDClientTables/CDAnimationsTable.cpp

@@ -5,7 +5,6 @@
 
 void CDAnimationsTable::LoadValuesFromDatabase() {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM Animations");
-	auto& animations = GetEntriesMutable();
 	while (!tableData.eof()) {
 		std::string animation_type = tableData.getStringField("animation_type", "");
 		DluAssert(!animation_type.empty());
@@ -25,7 +24,7 @@ void CDAnimationsTable::LoadValuesFromDatabase() {
 		UNUSED_COLUMN(entry.priority = tableData.getFloatField("priority", 0.0f);)
 		UNUSED_COLUMN(entry.blendTime = tableData.getFloatField("blendTime", 0.0f);)
 
-		animations[CDAnimationKey(animation_type, animationGroupID)].push_back(entry);
+		this->animations[CDAnimationKey(animation_type, animationGroupID)].push_back(entry);
 		tableData.nextRow();
 	}
 
@@ -36,7 +35,6 @@ 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;
-	auto& animations = GetEntriesMutable();
 
 	do {
 		std::string animation_type = tableData.getStringField("animation_type", "");
@@ -57,7 +55,7 @@ bool CDAnimationsTable::CacheData(CppSQLite3Statement& queryToCache) {
 		UNUSED_COLUMN(entry.priority = tableData.getFloatField("priority", 0.0f);)
 		UNUSED_COLUMN(entry.blendTime = tableData.getFloatField("blendTime", 0.0f);)
 
-		animations[CDAnimationKey(animation_type, animationGroupID)].push_back(entry);
+		this->animations[CDAnimationKey(animation_type, animationGroupID)].push_back(entry);
 		tableData.nextRow();
 	} while (!tableData.eof());
 
@@ -70,17 +68,15 @@ 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());
-	auto& animations = GetEntriesMutable();
 	// If we received a bad lookup, cache it anyways so we do not run the query again.
 	if (!CacheData(query)) {
-		animations[animationKey];
+		this->animations[animationKey];
 	}
 }
 
 void CDAnimationsTable::CacheAnimationGroup(AnimationGroupID animationGroupID) {
-	auto& animations = GetEntriesMutable();
-	auto animationEntryCached = animations.find(CDAnimationKey("", animationGroupID));
-	if (animationEntryCached != animations.end()) {
+	auto animationEntryCached = this->animations.find(CDAnimationKey("", animationGroupID));
+	if (animationEntryCached != this->animations.end()) {
 		return;
 	}
 
@@ -89,29 +85,28 @@ void CDAnimationsTable::CacheAnimationGroup(AnimationGroupID animationGroupID) {
 
 	// Cache the query so we don't run the query again.
 	CacheData(query);
-	animations[CDAnimationKey("", animationGroupID)];
+	this->animations[CDAnimationKey("", animationGroupID)];
 }
 
-std::optional<CDAnimation> CDAnimationsTable::GetAnimation(const AnimationID& animationType, const std::string& previousAnimationName, const AnimationGroupID animationGroupID) {
-	auto& animations = GetEntriesMutable();
+CDAnimationLookupResult CDAnimationsTable::GetAnimation(const AnimationID& animationType, const std::string& previousAnimationName, const AnimationGroupID animationGroupID) {
 	CDAnimationKey animationKey(animationType, animationGroupID);
-	auto animationEntryCached = animations.find(animationKey);
-	if (animationEntryCached == animations.end()) {
+	auto animationEntryCached = this->animations.find(animationKey);
+	if (animationEntryCached == this->animations.end()) {
 		this->CacheAnimations(animationKey);
 	}
 
-	auto animationEntry = animations.find(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 animationEntry->second.front();
+		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 animationEntry;
+		if (animationEntry.animation_name != previousAnimationName && randomAnimation <= 0.0f) return CDAnimationLookupResult(animationEntry);
 	}
 
-	return std::nullopt;
+	return CDAnimationLookupResult();
 }

dDatabase/CDClientDatabase/CDClientTables/CDAnimationsTable.h

@@ -2,11 +2,6 @@
 
 #include "CDTable.h"
 #include <list>
-#include <optional>
-
-typedef int32_t AnimationGroupID;
-typedef std::string AnimationID;
-typedef std::pair<std::string, AnimationGroupID> CDAnimationKey;
 
 struct CDAnimation {
 	// uint32_t animationGroupID;
@@ -25,7 +20,12 @@ struct CDAnimation {
 	UNUSED_COLUMN(float blendTime;)                //!< The blend time
 };
 
-class CDAnimationsTable : public CDTable<CDAnimationsTable, std::map<CDAnimationKey, std::list<CDAnimation>>> {
+typedef LookupResult<CDAnimation> CDAnimationLookupResult;
+
+class CDAnimationsTable : public CDTable<CDAnimationsTable> {
+	typedef int32_t AnimationGroupID;
+	typedef std::string AnimationID;
+	typedef std::pair<std::string, AnimationGroupID> CDAnimationKey;
 public:
 	void LoadValuesFromDatabase();
 	/**
@@ -38,7 +38,7 @@ public:
 	 * @param animationGroupID The animationGroupID to lookup
 	 * @return CDAnimationLookupResult 
 	 */
-	[[nodiscard]] std::optional<CDAnimation> GetAnimation(const AnimationID& animationType, const std::string& previousAnimationName, const AnimationGroupID animationGroupID);
+	[[nodiscard]] CDAnimationLookupResult GetAnimation(const AnimationID& animationType, const std::string& previousAnimationName, const AnimationGroupID animationGroupID);
 
 	/**
 	 * Cache a full AnimationGroup by its ID.
@@ -58,4 +58,10 @@ private:
 	 * @return false 
 	 */
 	bool CacheData(CppSQLite3Statement& queryToCache);
+
+	/**
+	 * Each animation is key'd by its animationName and its animationGroupID.  Each
+	 * animation has a possible list of animations.  This is because there can be animations have a percent chance to play so one is selected at random.
+	 */
+	std::map<CDAnimationKey, std::list<CDAnimation>> animations;
 };

dDatabase/CDClientDatabase/CDClientTables/CDBehaviorParameterTable.cpp

@@ -1,10 +1,6 @@
 #include "CDBehaviorParameterTable.h"
 #include "GeneralUtils.h"
 
-namespace {
-	std::unordered_map<std::string, uint32_t> m_ParametersList;
-};
-
 uint64_t GetKey(const uint32_t behaviorID, const uint32_t parameterID) {
 	uint64_t key = behaviorID;
 	key <<= 31U;
@@ -15,7 +11,6 @@ uint64_t GetKey(const uint32_t behaviorID, const uint32_t parameterID) {
 
 void CDBehaviorParameterTable::LoadValuesFromDatabase() {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM BehaviorParameter");
-	auto& entries = GetEntriesMutable();
 	while (!tableData.eof()) {
 		uint32_t behaviorID = tableData.getIntField("behaviorID", -1);
 		auto candidateStringToAdd = std::string(tableData.getStringField("parameterID", ""));
@@ -29,7 +24,7 @@ void CDBehaviorParameterTable::LoadValuesFromDatabase() {
 		uint64_t hash = GetKey(behaviorID, parameterId);
 		float value = tableData.getFloatField("value", -1.0f);
 
-		entries.insert(std::make_pair(hash, value));
+		m_Entries.insert(std::make_pair(hash, value));
 
 		tableData.nextRow();
 	}
@@ -37,24 +32,22 @@ void CDBehaviorParameterTable::LoadValuesFromDatabase() {
 }
 
 float CDBehaviorParameterTable::GetValue(const uint32_t behaviorID, const std::string& name, const float defaultValue) {
-	auto parameterID = m_ParametersList.find(name);
-	if (parameterID == m_ParametersList.end()) return 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& entries = GetEntriesMutable();
-	auto it = entries.find(hash);
-	return it != entries.end() ? it->second : defaultValue;
+	auto it = m_Entries.find(hash);
+	return it != m_Entries.end() ? it->second : defaultValue;
 }
 
 std::map<std::string, float> CDBehaviorParameterTable::GetParametersByBehaviorID(uint32_t behaviorID) {
-	auto& entries = GetEntriesMutable();
 	uint64_t hashBase = behaviorID;
 	std::map<std::string, float> returnInfo;
 	for (auto& [parameterString, parameterId] : m_ParametersList) {
 		uint64_t hash = GetKey(hashBase, parameterId);
-		auto infoCandidate = entries.find(hash);
-		if (infoCandidate != entries.end()) {
+		auto infoCandidate = m_Entries.find(hash);
+		if (infoCandidate != m_Entries.end()) {
 			returnInfo.insert(std::make_pair(parameterString, infoCandidate->second));
 		}
 	}

dDatabase/CDClientDatabase/CDClientTables/CDBehaviorParameterTable.h

@@ -5,10 +5,12 @@
 #include <unordered_map>
 #include <unordered_set>
 
-typedef uint64_t BehaviorParameterHash;
-typedef float BehaviorParameterValue;
-
-class CDBehaviorParameterTable : public CDTable<CDBehaviorParameterTable, std::unordered_map<BehaviorParameterHash, BehaviorParameterValue>> {
+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();
 

dDatabase/CDClientDatabase/CDClientTables/CDBehaviorTemplateTable.cpp

@@ -1,9 +1,5 @@
 #include "CDBehaviorTemplateTable.h"
 
-namespace {
-	std::unordered_set<std::string> m_EffectHandles;
-};
-
 void CDBehaviorTemplateTable::LoadValuesFromDatabase() {
 
 	// First, get the size of the table
@@ -17,9 +13,11 @@ void CDBehaviorTemplateTable::LoadValuesFromDatabase() {
 
 	tableSize.finalize();
 
+	// Reserve the size
+	this->entries.reserve(size);
+
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM BehaviorTemplate");
-	auto& entries = GetEntriesMutable();
 	while (!tableData.eof()) {
 		CDBehaviorTemplate entry;
 		entry.behaviorID = tableData.getIntField("behaviorID", -1);
@@ -33,17 +31,30 @@ void CDBehaviorTemplateTable::LoadValuesFromDatabase() {
 			entry.effectHandle = m_EffectHandles.insert(candidateToAdd).first;
 		}
 
-		entries.insert(std::make_pair(entry.behaviorID, entry));
+		this->entries.push_back(entry);
+		this->entriesMappedByBehaviorID.insert(std::make_pair(entry.behaviorID, entry));
 		tableData.nextRow();
 	}
 
 	tableData.finalize();
 }
 
+std::vector<CDBehaviorTemplate> CDBehaviorTemplateTable::Query(std::function<bool(CDBehaviorTemplate)> predicate) {
+
+	std::vector<CDBehaviorTemplate> data = cpplinq::from(this->entries)
+		>> cpplinq::where(predicate)
+		>> cpplinq::to_vector();
+
+	return data;
+}
+
+const std::vector<CDBehaviorTemplate>& CDBehaviorTemplateTable::GetEntries() const {
+	return this->entries;
+}
+
 const CDBehaviorTemplate CDBehaviorTemplateTable::GetByBehaviorID(uint32_t behaviorID) {
-	auto& entries = GetEntriesMutable();
-	auto entry = entries.find(behaviorID);
-	if (entry == entries.end()) {
+	auto entry = this->entriesMappedByBehaviorID.find(behaviorID);
+	if (entry == this->entriesMappedByBehaviorID.end()) {
 		CDBehaviorTemplate entryToReturn;
 		entryToReturn.behaviorID = 0;
 		entryToReturn.effectHandle = m_EffectHandles.end();

dDatabase/CDClientDatabase/CDClientTables/CDBehaviorTemplateTable.h

@@ -12,9 +12,19 @@ struct CDBehaviorTemplate {
 	std::unordered_set<std::string>::iterator effectHandle;          //!< The effect handle
 };
 
-class CDBehaviorTemplateTable : public CDTable<CDBehaviorTemplateTable, std::unordered_map<uint32_t, CDBehaviorTemplate>> {
+
+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/CDBrickIDTableTable.cpp

@@ -14,8 +14,7 @@ void CDBrickIDTableTable::LoadValuesFromDatabase() {
 	tableSize.finalize();
 
 	// Reserve the size
-	auto& entries = GetEntriesMutable();
-	entries.reserve(size);
+	this->entries.reserve(size);
 
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM BrickIDTable");
@@ -24,7 +23,7 @@ void CDBrickIDTableTable::LoadValuesFromDatabase() {
 		entry.NDObjectID = tableData.getIntField("NDObjectID", -1);
 		entry.LEGOBrickID = tableData.getIntField("LEGOBrickID", -1);
 
-		entries.push_back(entry);
+		this->entries.push_back(entry);
 		tableData.nextRow();
 	}
 
@@ -32,9 +31,15 @@ void CDBrickIDTableTable::LoadValuesFromDatabase() {
 }
 
 std::vector<CDBrickIDTable> CDBrickIDTableTable::Query(std::function<bool(CDBrickIDTable)> predicate) {
-	std::vector<CDBrickIDTable> data = cpplinq::from(GetEntries())
+
+	std::vector<CDBrickIDTable> data = cpplinq::from(this->entries)
 		>> cpplinq::where(predicate)
 		>> cpplinq::to_vector();
 
 	return data;
 }
+
+const std::vector<CDBrickIDTable>& CDBrickIDTableTable::GetEntries() const {
+	return this->entries;
+}
+

dDatabase/CDClientDatabase/CDClientTables/CDBrickIDTableTable.h

@@ -16,9 +16,14 @@ struct CDBrickIDTable {
 
 
 //! BrickIDTable table
-class CDBrickIDTableTable : public CDTable<CDBrickIDTableTable, std::vector<CDBrickIDTable>> {
+class CDBrickIDTableTable : public CDTable<CDBrickIDTableTable> {
+private:
+	std::vector<CDBrickIDTable> entries;
+
 public:
 	void LoadValuesFromDatabase();
 	// Queries the table with a custom "where" clause
 	std::vector<CDBrickIDTable> Query(std::function<bool(CDBrickIDTable)> predicate);
+
+	const std::vector<CDBrickIDTable>& GetEntries() const;
 };

dDatabase/CDClientDatabase/CDClientTables/CDComponentsRegistryTable.cpp

@@ -4,15 +4,14 @@
 void CDComponentsRegistryTable::LoadValuesFromDatabase() {
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM ComponentsRegistry");
-	auto& entries = GetEntriesMutable();
 	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);
 
-		entries.insert_or_assign(static_cast<uint64_t>(entry.component_type) << 32 | static_cast<uint64_t>(entry.id), entry.component_id);
-		entries.insert_or_assign(entry.id, 0);
+		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();
 	}
@@ -21,11 +20,10 @@ void CDComponentsRegistryTable::LoadValuesFromDatabase() {
 }
 
 int32_t CDComponentsRegistryTable::GetByIDAndType(uint32_t id, eReplicaComponentType componentType, int32_t defaultValue) {
-	auto& entries = GetEntriesMutable();
-	auto exists = entries.find(id);
-	if (exists != entries.end()) {
-		auto iter = entries.find(static_cast<uint64_t>(componentType) << 32 | static_cast<uint64_t>(id));
-		return iter == entries.end() ? defaultValue : iter->second;
+	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
@@ -40,14 +38,14 @@ int32_t CDComponentsRegistryTable::GetByIDAndType(uint32_t id, eReplicaComponent
 		entry.component_type = static_cast<eReplicaComponentType>(tableData.getIntField("component_type", 0));
 		entry.component_id = tableData.getIntField("component_id", -1);
 
-		entries.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(static_cast<uint64_t>(entry.component_type) << 32 | static_cast<uint64_t>(entry.id), entry.component_id);
 
 		tableData.nextRow();
 	}
 
-	entries.insert_or_assign(id, 0);
+	mappedEntries.insert_or_assign(id, 0);
 
-	auto iter = entries.find(static_cast<uint64_t>(componentType) << 32 | static_cast<uint64_t>(id));
+	auto iter = this->mappedEntries.find(static_cast<uint64_t>(componentType) << 32 | static_cast<uint64_t>(id));
 
-	return iter == entries.end() ? defaultValue : iter->second;
+	return iter == this->mappedEntries.end() ? defaultValue : iter->second;
 }

dDatabase/CDClientDatabase/CDClientTables/CDComponentsRegistryTable.h

@@ -13,7 +13,10 @@ struct CDComponentsRegistry {
 };
 
 
-class CDComponentsRegistryTable : public CDTable<CDComponentsRegistryTable, std::unordered_map<uint64_t, uint32_t>> {
+class CDComponentsRegistryTable : public CDTable<CDComponentsRegistryTable> {
+private:
+	std::unordered_map<uint64_t, uint32_t> mappedEntries; //id, component_type, component_id
+
 public:
 	void LoadValuesFromDatabase();
 	int32_t GetByIDAndType(uint32_t id, eReplicaComponentType componentType, int32_t defaultValue = 0);

dDatabase/CDClientDatabase/CDClientTables/CDCurrencyTableTable.cpp

@@ -15,8 +15,7 @@ void CDCurrencyTableTable::LoadValuesFromDatabase() {
 	tableSize.finalize();
 
 	// Reserve the size
-	auto& entries = GetEntriesMutable();
-	entries.reserve(size);
+	this->entries.reserve(size);
 
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM CurrencyTable");
@@ -28,7 +27,7 @@ void CDCurrencyTableTable::LoadValuesFromDatabase() {
 		entry.maxvalue = tableData.getIntField("maxvalue", -1);
 		entry.id = tableData.getIntField("id", -1);
 
-		entries.push_back(entry);
+		this->entries.push_back(entry);
 		tableData.nextRow();
 	}
 
@@ -36,9 +35,15 @@ void CDCurrencyTableTable::LoadValuesFromDatabase() {
 }
 
 std::vector<CDCurrencyTable> CDCurrencyTableTable::Query(std::function<bool(CDCurrencyTable)> predicate) {
-	std::vector<CDCurrencyTable> data = cpplinq::from(GetEntries())
+
+	std::vector<CDCurrencyTable> data = cpplinq::from(this->entries)
 		>> cpplinq::where(predicate)
 		>> cpplinq::to_vector();
 
 	return data;
 }
+
+const std::vector<CDCurrencyTable>& CDCurrencyTableTable::GetEntries() const {
+	return this->entries;
+}
+

dDatabase/CDClientDatabase/CDClientTables/CDCurrencyTableTable.h

@@ -18,9 +18,14 @@ struct CDCurrencyTable {
 };
 
 //! CurrencyTable table
-class CDCurrencyTableTable : public CDTable<CDCurrencyTableTable, std::vector<CDCurrencyTable>> {
+class CDCurrencyTableTable : public CDTable<CDCurrencyTableTable> {
+private:
+	std::vector<CDCurrencyTable> entries;
+
 public:
 	void LoadValuesFromDatabase();
 	// Queries the table with a custom "where" clause
 	std::vector<CDCurrencyTable> Query(std::function<bool(CDCurrencyTable)> predicate);
+
+	const std::vector<CDCurrencyTable>& GetEntries() const;
 };

dDatabase/CDClientDatabase/CDClientTables/CDDestructibleComponentTable.cpp

@@ -13,8 +13,7 @@ void CDDestructibleComponentTable::LoadValuesFromDatabase() {
 	tableSize.finalize();
 
 	// Reserve the size
-	auto& entries = GetEntriesMutable();
-	entries.reserve(size);
+	this->entries.reserve(size);
 
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM DestructibleComponent");
@@ -35,7 +34,7 @@ void CDDestructibleComponentTable::LoadValuesFromDatabase() {
 		entry.isSmashable = tableData.getIntField("isSmashable", -1) == 1 ? true : false;
 		entry.difficultyLevel = tableData.getIntField("difficultyLevel", -1);
 
-		entries.push_back(entry);
+		this->entries.push_back(entry);
 		tableData.nextRow();
 	}
 
@@ -43,9 +42,15 @@ void CDDestructibleComponentTable::LoadValuesFromDatabase() {
 }
 
 std::vector<CDDestructibleComponent> CDDestructibleComponentTable::Query(std::function<bool(CDDestructibleComponent)> predicate) {
-	std::vector<CDDestructibleComponent> data = cpplinq::from(GetEntries())
+
+	std::vector<CDDestructibleComponent> data = cpplinq::from(this->entries)
 		>> cpplinq::where(predicate)
 		>> cpplinq::to_vector();
 
 	return data;
 }
+
+const std::vector<CDDestructibleComponent>& CDDestructibleComponentTable::GetEntries() const {
+	return this->entries;
+}
+

dDatabase/CDClientDatabase/CDClientTables/CDDestructibleComponentTable.h

@@ -20,9 +20,14 @@ struct CDDestructibleComponent {
 	int32_t difficultyLevel;               //!< ???
 };
 
-class CDDestructibleComponentTable : public CDTable<CDDestructibleComponentTable, std::vector<CDDestructibleComponent>> {
+class CDDestructibleComponentTable : public CDTable<CDDestructibleComponentTable> {
+private:
+	std::vector<CDDestructibleComponent> entries;
+
 public:
 	void LoadValuesFromDatabase();
 	// Queries the table with a custom "where" clause
 	std::vector<CDDestructibleComponent> Query(std::function<bool(CDDestructibleComponent)> predicate);
+
+	const std::vector<CDDestructibleComponent>& GetEntries(void) const;
 };

dDatabase/CDClientDatabase/CDClientTables/CDEmoteTable.cpp

@@ -2,7 +2,6 @@
 
 void CDEmoteTableTable::LoadValuesFromDatabase() {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM Emotes");
-	auto& entries = GetEntriesMutable();
 	while (!tableData.eof()) {
 		CDEmoteTable entry;
 		entry.ID = tableData.getIntField("id", -1);
@@ -22,7 +21,6 @@ void CDEmoteTableTable::LoadValuesFromDatabase() {
 }
 
 CDEmoteTable* CDEmoteTableTable::GetEmote(int32_t id) {
-	auto& entries = GetEntriesMutable();
 	auto itr = entries.find(id);
 	return itr != entries.end() ? &itr->second : nullptr;
 }

dDatabase/CDClientDatabase/CDClientTables/CDEmoteTable.h

@@ -26,7 +26,10 @@ struct CDEmoteTable {
 	std::string gateVersion;
 };
 
-class CDEmoteTableTable : public CDTable<CDEmoteTableTable, std::map<int, CDEmoteTable>> {
+class CDEmoteTableTable : public CDTable<CDEmoteTableTable> {
+private:
+	std::map<int, CDEmoteTable> entries;
+
 public:
 	void LoadValuesFromDatabase();
 	// Returns an emote by ID

dDatabase/CDClientDatabase/CDClientTables/CDFeatureGatingTable.cpp

@@ -14,8 +14,7 @@ void CDFeatureGatingTable::LoadValuesFromDatabase() {
 	tableSize.finalize();
 
 	// Reserve the size
-	auto& entries = GetEntriesMutable();
-	entries.reserve(size);
+	this->entries.reserve(size);
 
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM FeatureGating");
@@ -27,7 +26,7 @@ void CDFeatureGatingTable::LoadValuesFromDatabase() {
 		entry.minor = tableData.getIntField("minor", -1);
 		entry.description = tableData.getStringField("description", "");
 
-		entries.push_back(entry);
+		this->entries.push_back(entry);
 		tableData.nextRow();
 	}
 
@@ -36,8 +35,7 @@ void CDFeatureGatingTable::LoadValuesFromDatabase() {
 
 std::vector<CDFeatureGating> CDFeatureGatingTable::Query(std::function<bool(CDFeatureGating)> predicate) {
 
-	auto& entries = GetEntriesMutable();
-	std::vector<CDFeatureGating> data = cpplinq::from(entries)
+	std::vector<CDFeatureGating> data = cpplinq::from(this->entries)
 		>> cpplinq::where(predicate)
 		>> cpplinq::to_vector();
 
@@ -45,7 +43,6 @@ std::vector<CDFeatureGating> CDFeatureGatingTable::Query(std::function<bool(CDFe
 }
 
 bool CDFeatureGatingTable::FeatureUnlocked(const CDFeatureGating& feature) const {
-	auto& entries = GetEntriesMutable();
 	for (const auto& entry : entries) {
 		if (entry.featureName == feature.featureName && feature >= entry) {
 			return true;
@@ -54,3 +51,8 @@ bool CDFeatureGatingTable::FeatureUnlocked(const CDFeatureGating& feature) const
 
 	return false;
 }
+
+const std::vector<CDFeatureGating>& CDFeatureGatingTable::GetEntries() const {
+	return this->entries;
+}
+

dDatabase/CDClientDatabase/CDClientTables/CDFeatureGatingTable.h

@@ -17,7 +17,10 @@ struct CDFeatureGating {
 	}
 };
 
-class CDFeatureGatingTable : public CDTable<CDFeatureGatingTable, std::vector<CDFeatureGating>> {
+class CDFeatureGatingTable : public CDTable<CDFeatureGatingTable> {
+private:
+	std::vector<CDFeatureGating> entries;
+
 public:
 	void LoadValuesFromDatabase();
 
@@ -25,4 +28,6 @@ public:
 	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/CDInventoryComponentTable.cpp

@@ -14,8 +14,7 @@ void CDInventoryComponentTable::LoadValuesFromDatabase() {
 	tableSize.finalize();
 
 	// Reserve the size
-	auto& entries = GetEntriesMutable();
-	entries.reserve(size);
+	this->entries.reserve(size);
 
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM InventoryComponent");
@@ -26,7 +25,7 @@ void CDInventoryComponentTable::LoadValuesFromDatabase() {
 		entry.count = tableData.getIntField("count", -1);
 		entry.equip = tableData.getIntField("equip", -1) == 1 ? true : false;
 
-		entries.push_back(entry);
+		this->entries.push_back(entry);
 		tableData.nextRow();
 	}
 
@@ -34,9 +33,15 @@ void CDInventoryComponentTable::LoadValuesFromDatabase() {
 }
 
 std::vector<CDInventoryComponent> CDInventoryComponentTable::Query(std::function<bool(CDInventoryComponent)> predicate) {
-	std::vector<CDInventoryComponent> data = cpplinq::from(GetEntries())
+
+	std::vector<CDInventoryComponent> data = cpplinq::from(this->entries)
 		>> cpplinq::where(predicate)
 		>> cpplinq::to_vector();
 
 	return data;
 }
+
+const std::vector<CDInventoryComponent>& CDInventoryComponentTable::GetEntries() const {
+	return this->entries;
+}
+

dDatabase/CDClientDatabase/CDClientTables/CDInventoryComponentTable.h

@@ -10,9 +10,14 @@ struct CDInventoryComponent {
 	bool equip;             //!< Whether or not to equip the item
 };
 
-class CDInventoryComponentTable : public CDTable<CDInventoryComponentTable, std::vector<CDInventoryComponent>> {
+class CDInventoryComponentTable : public CDTable<CDInventoryComponentTable> {
+private:
+	std::vector<CDInventoryComponent> entries;
+
 public:
 	void LoadValuesFromDatabase();
 	// Queries the table with a custom "where" clause
 	std::vector<CDInventoryComponent> Query(std::function<bool(CDInventoryComponent)> predicate);
+
+	const std::vector<CDInventoryComponent>& GetEntries() const;
 };

dDatabase/CDClientDatabase/CDClientTables/CDItemComponentTable.cpp

@@ -17,7 +17,6 @@ void CDItemComponentTable::LoadValuesFromDatabase() {
 
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM ItemComponent");
-	auto& entries = GetEntriesMutable();
 	while (!tableData.eof()) {
 		CDItemComponent entry;
 		entry.id = tableData.getIntField("id", -1);
@@ -63,7 +62,7 @@ void CDItemComponentTable::LoadValuesFromDatabase() {
 		entry.forgeType = tableData.getIntField("forgeType", -1);
 		entry.SellMultiplier = tableData.getFloatField("SellMultiplier", -1.0f);
 
-		entries.insert(std::make_pair(entry.id, entry));
+		this->entries.insert(std::make_pair(entry.id, entry));
 		tableData.nextRow();
 	}
 
@@ -71,9 +70,8 @@ void CDItemComponentTable::LoadValuesFromDatabase() {
 }
 
 const CDItemComponent& CDItemComponentTable::GetItemComponentByID(uint32_t skillID) {
-	auto& entries = GetEntriesMutable();
-	const auto& it = entries.find(skillID);
-	if (it != entries.end()) {
+	const auto& it = this->entries.find(skillID);
+	if (it != this->entries.end()) {
 		return it->second;
 	}
 
@@ -131,12 +129,12 @@ const CDItemComponent& CDItemComponentTable::GetItemComponentByID(uint32_t skill
 		entry.forgeType = tableData.getIntField("forgeType", -1);
 		entry.SellMultiplier = tableData.getFloatField("SellMultiplier", -1.0f);
 
-		entries.insert(std::make_pair(entry.id, entry));
+		this->entries.insert(std::make_pair(entry.id, entry));
 		tableData.nextRow();
 	}
 
-	const auto& it2 = entries.find(skillID);
-	if (it2 != entries.end()) {
+	const auto& it2 = this->entries.find(skillID);
+	if (it2 != this->entries.end()) {
 		return it2->second;
 	}
 

dDatabase/CDClientDatabase/CDClientTables/CDItemComponentTable.h

@@ -49,7 +49,10 @@ struct CDItemComponent {
 	float SellMultiplier;           //!< Something to do with early vendors perhaps (but replaced)
 };
 
-class CDItemComponentTable : public CDTable<CDItemComponentTable, std::map<uint32_t, CDItemComponent>> {
+class CDItemComponentTable : public CDTable<CDItemComponentTable> {
+private:
+	std::map<uint32_t, CDItemComponent> entries;
+
 public:
 	void LoadValuesFromDatabase();
 	static std::map<LOT, uint32_t> ParseCraftingCurrencies(const CDItemComponent& itemComponent);

dDatabase/CDClientDatabase/CDClientTables/CDItemSetSkillsTable.cpp

@@ -14,8 +14,7 @@ void CDItemSetSkillsTable::LoadValuesFromDatabase() {
 	tableSize.finalize();
 
 	// Reserve the size
-	auto& entries = GetEntriesMutable();
-	entries.reserve(size);
+	this->entries.reserve(size);
 
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM ItemSetSkills");
@@ -25,7 +24,7 @@ void CDItemSetSkillsTable::LoadValuesFromDatabase() {
 		entry.SkillID = tableData.getIntField("SkillID", -1);
 		entry.SkillCastType = tableData.getIntField("SkillCastType", -1);
 
-		entries.push_back(entry);
+		this->entries.push_back(entry);
 		tableData.nextRow();
 	}
 
@@ -33,17 +32,22 @@ void CDItemSetSkillsTable::LoadValuesFromDatabase() {
 }
 
 std::vector<CDItemSetSkills> CDItemSetSkillsTable::Query(std::function<bool(CDItemSetSkills)> predicate) {
-	std::vector<CDItemSetSkills> data = cpplinq::from(GetEntries())
+
+	std::vector<CDItemSetSkills> data = cpplinq::from(this->entries)
 		>> cpplinq::where(predicate)
 		>> cpplinq::to_vector();
 
 	return data;
 }
 
+const std::vector<CDItemSetSkills>& CDItemSetSkillsTable::GetEntries() const {
+	return this->entries;
+}
+
 std::vector<CDItemSetSkills> CDItemSetSkillsTable::GetBySkillID(uint32_t SkillSetID) {
 	std::vector<CDItemSetSkills> toReturn;
 
-	for (const auto& entry : GetEntries()) {
+	for (CDItemSetSkills entry : this->entries) {
 		if (entry.SkillSetID == SkillSetID) toReturn.push_back(entry);
 		if (entry.SkillSetID > SkillSetID) return toReturn; //stop seeking in the db if it's not needed.
 	}

dDatabase/CDClientDatabase/CDClientTables/CDItemSetSkillsTable.h

@@ -9,11 +9,16 @@ struct CDItemSetSkills {
 	uint32_t SkillCastType;         //!< The skill cast type
 };
 
-class CDItemSetSkillsTable : public CDTable<CDItemSetSkillsTable, std::vector<CDItemSetSkills>> {
+class CDItemSetSkillsTable : public CDTable<CDItemSetSkillsTable> {
+private:
+	std::vector<CDItemSetSkills> entries;
+
 public:
 	void LoadValuesFromDatabase();
 	// Queries the table with a custom "where" clause
 	std::vector<CDItemSetSkills> Query(std::function<bool(CDItemSetSkills)> predicate);
 
+	const std::vector<CDItemSetSkills>& GetEntries() const;
+
 	std::vector<CDItemSetSkills> GetBySkillID(uint32_t SkillSetID);
 };

dDatabase/CDClientDatabase/CDClientTables/CDItemSetsTable.cpp

@@ -14,8 +14,7 @@ void CDItemSetsTable::LoadValuesFromDatabase() {
 	tableSize.finalize();
 
 	// Reserve the size
-	auto& entries = GetEntriesMutable();
-	entries.reserve(size);
+	this->entries.reserve(size);
 
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM ItemSets");
@@ -37,7 +36,7 @@ void CDItemSetsTable::LoadValuesFromDatabase() {
 		entry.kitID = tableData.getIntField("kitID", -1);
 		entry.priority = tableData.getFloatField("priority", -1.0f);
 
-		entries.push_back(entry);
+		this->entries.push_back(entry);
 		tableData.nextRow();
 	}
 
@@ -46,9 +45,14 @@ void CDItemSetsTable::LoadValuesFromDatabase() {
 
 std::vector<CDItemSets> CDItemSetsTable::Query(std::function<bool(CDItemSets)> predicate) {
 
-	std::vector<CDItemSets> data = cpplinq::from(GetEntries())
+	std::vector<CDItemSets> data = cpplinq::from(this->entries)
 		>> cpplinq::where(predicate)
 		>> cpplinq::to_vector();
 
 	return data;
 }
+
+const std::vector<CDItemSets>& CDItemSetsTable::GetEntries() const {
+	return this->entries;
+}
+

dDatabase/CDClientDatabase/CDClientTables/CDItemSetsTable.h

@@ -21,10 +21,15 @@ struct CDItemSets {
 	float priority;         //!< The priority
 };
 
-class CDItemSetsTable : public CDTable<CDItemSetsTable, std::vector<CDItemSets>> {
+class CDItemSetsTable : public CDTable<CDItemSetsTable> {
+private:
+	std::vector<CDItemSets> entries;
+
 public:
 	void LoadValuesFromDatabase();
 	// Queries the table with a custom "where" clause
 	std::vector<CDItemSets> Query(std::function<bool(CDItemSets)> predicate);
+
+	const std::vector<CDItemSets>& GetEntries(void) const;
 };
 

dDatabase/CDClientDatabase/CDClientTables/CDLevelProgressionLookupTable.cpp

@@ -14,8 +14,7 @@ void CDLevelProgressionLookupTable::LoadValuesFromDatabase() {
 	tableSize.finalize();
 
 	// Reserve the size
-	auto& entries = GetEntriesMutable();
-	entries.reserve(size);
+	this->entries.reserve(size);
 
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM LevelProgressionLookup");
@@ -25,7 +24,7 @@ void CDLevelProgressionLookupTable::LoadValuesFromDatabase() {
 		entry.requiredUScore = tableData.getIntField("requiredUScore", -1);
 		entry.BehaviorEffect = tableData.getStringField("BehaviorEffect", "");
 
-		entries.push_back(entry);
+		this->entries.push_back(entry);
 		tableData.nextRow();
 	}
 
@@ -34,9 +33,14 @@ void CDLevelProgressionLookupTable::LoadValuesFromDatabase() {
 
 std::vector<CDLevelProgressionLookup> CDLevelProgressionLookupTable::Query(std::function<bool(CDLevelProgressionLookup)> predicate) {
 
-	std::vector<CDLevelProgressionLookup> data = cpplinq::from(GetEntries())
+	std::vector<CDLevelProgressionLookup> data = cpplinq::from(this->entries)
 		>> cpplinq::where(predicate)
 		>> cpplinq::to_vector();
 
 	return data;
 }
+
+const std::vector<CDLevelProgressionLookup>& CDLevelProgressionLookupTable::GetEntries() const {
+	return this->entries;
+}
+

dDatabase/CDClientDatabase/CDClientTables/CDLevelProgressionLookupTable.h

@@ -9,10 +9,15 @@ struct CDLevelProgressionLookup {
 	std::string BehaviorEffect;    //!< The behavior effect attached to this
 };
 
-class CDLevelProgressionLookupTable : public CDTable<CDLevelProgressionLookupTable, std::vector<CDLevelProgressionLookup>> {
+class CDLevelProgressionLookupTable : public CDTable<CDLevelProgressionLookupTable> {
+private:
+	std::vector<CDLevelProgressionLookup> entries;
+
 public:
 	void LoadValuesFromDatabase();
 
 	// Queries the table with a custom "where" clause
 	std::vector<CDLevelProgressionLookup> Query(std::function<bool(CDLevelProgressionLookup)> predicate);
+
+	const std::vector<CDLevelProgressionLookup>& GetEntries() const;
 };

dDatabase/CDClientDatabase/CDClientTables/CDLootMatrixTable.cpp

@@ -25,8 +25,7 @@ void CDLootMatrixTable::LoadValuesFromDatabase() {
 	}
 
 	// Reserve the size
-	auto& entries = GetEntriesMutable();
-	entries.reserve(size);
+	this->entries.reserve(size);
 
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM LootMatrix");
@@ -34,15 +33,14 @@ void CDLootMatrixTable::LoadValuesFromDatabase() {
 		CDLootMatrix entry;
 		uint32_t lootMatrixIndex = tableData.getIntField("LootMatrixIndex", -1);
 
-		entries[lootMatrixIndex].push_back(ReadRow(tableData));
+		this->entries[lootMatrixIndex].push_back(ReadRow(tableData));
 		tableData.nextRow();
 	}
 }
 
 const LootMatrixEntries& CDLootMatrixTable::GetMatrix(uint32_t matrixId) {
-	auto& entries = GetEntriesMutable();
-	auto itr = entries.find(matrixId);
-	if (itr != entries.end()) {
+	auto itr = this->entries.find(matrixId);
+	if (itr != this->entries.end()) {
 		return itr->second;
 	}
 
@@ -51,10 +49,10 @@ const LootMatrixEntries& CDLootMatrixTable::GetMatrix(uint32_t matrixId) {
 
 	auto tableData = query.execQuery();
 	while (!tableData.eof()) {
-		entries[matrixId].push_back(ReadRow(tableData));
+		this->entries[matrixId].push_back(ReadRow(tableData));
 		tableData.nextRow();
 	}
 
-	return entries[matrixId];
+	return this->entries[matrixId];
 }
 

dDatabase/CDClientDatabase/CDClientTables/CDLootMatrixTable.h

@@ -16,7 +16,7 @@ struct CDLootMatrix {
 typedef uint32_t LootMatrixIndex;
 typedef std::vector<CDLootMatrix> LootMatrixEntries;
 
-class CDLootMatrixTable : public CDTable<CDLootMatrixTable, std::unordered_map<LootMatrixIndex, LootMatrixEntries>> {
+class CDLootMatrixTable : public CDTable<CDLootMatrixTable> {
 public:
 	void LoadValuesFromDatabase();
 
@@ -24,5 +24,6 @@ public:
 	const LootMatrixEntries& GetMatrix(uint32_t matrixId);
 private:
 	CDLootMatrix ReadRow(CppSQLite3Query& tableData) const;
+	std::unordered_map<LootMatrixIndex, LootMatrixEntries> entries;
 };
 

dDatabase/CDClientDatabase/CDClientTables/CDLootTableTable.cpp

@@ -6,8 +6,8 @@
 
 // Sort the tables by their rarity so the highest rarity items are first.
 void SortTable(LootTableEntries& table) {
-	auto* componentsRegistryTable = CDClientManager::GetTable<CDComponentsRegistryTable>();
-	auto* itemComponentTable = CDClientManager::GetTable<CDItemComponentTable>();
+	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.
@@ -49,8 +49,7 @@ void CDLootTableTable::LoadValuesFromDatabase() {
 	}
 
 	// Reserve the size
-	auto& entries = GetEntriesMutable();
-	entries.reserve(size);
+	this->entries.reserve(size);
 
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM LootTable");
@@ -58,18 +57,17 @@ void CDLootTableTable::LoadValuesFromDatabase() {
 		CDLootTable entry;
 		uint32_t lootTableIndex = tableData.getIntField("LootTableIndex", -1);
 
-		entries[lootTableIndex].emplace_back(ReadRow(tableData));
+		this->entries[lootTableIndex].push_back(ReadRow(tableData));
 		tableData.nextRow();
 	}
-	for (auto& [id, table] : entries) {
+	for (auto& [id, table] : this->entries) {
 		SortTable(table);
 	}
 }
 
-const LootTableEntries& CDLootTableTable::GetTable(const uint32_t tableId) {
-	auto& entries = GetEntriesMutable();
-	auto itr = entries.find(tableId);
-	if (itr != entries.end()) {
+const LootTableEntries& CDLootTableTable::GetTable(uint32_t tableId) {
+	auto itr = this->entries.find(tableId);
+	if (itr != this->entries.end()) {
 		return itr->second;
 	}
 
@@ -79,10 +77,10 @@ const LootTableEntries& CDLootTableTable::GetTable(const uint32_t tableId) {
 
 	while (!tableData.eof()) {
 		CDLootTable entry;
-		entries[tableId].emplace_back(ReadRow(tableData));
+		this->entries[tableId].push_back(ReadRow(tableData));
 		tableData.nextRow();
 	}
-	SortTable(entries[tableId]);
+	SortTable(this->entries[tableId]);
 
-	return entries[tableId];
+	return this->entries[tableId];
 }

dDatabase/CDClientDatabase/CDClientTables/CDLootTableTable.h

@@ -3,8 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-#include <cstdint>
-
 struct CDLootTable {
 	uint32_t itemid;                 //!< The LOT of the item
 	uint32_t LootTableIndex;         //!< The Loot Table Index
@@ -15,12 +13,14 @@ struct CDLootTable {
 typedef uint32_t LootTableIndex;
 typedef std::vector<CDLootTable> LootTableEntries;
 
-class CDLootTableTable : public CDTable<CDLootTableTable, std::unordered_map<LootTableIndex, LootTableEntries>> {
+class CDLootTableTable : public CDTable<CDLootTableTable> {
 private:
 	CDLootTable ReadRow(CppSQLite3Query& tableData) const;
+	std::unordered_map<LootTableIndex, LootTableEntries> entries;
 
 public:
 	void LoadValuesFromDatabase();
 	// Queries the table with a custom "where" clause
-	const LootTableEntries& GetTable(const uint32_t tableId);
+	const LootTableEntries& GetTable(uint32_t tableId);
 };
+

dDatabase/CDClientDatabase/CDClientTables/CDMissionEmailTable.cpp

@@ -1,7 +1,7 @@
 #include "CDMissionEmailTable.h"
 
-
 void CDMissionEmailTable::LoadValuesFromDatabase() {
+
 	// First, get the size of the table
 	uint32_t size = 0;
 	auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM MissionEmail");
@@ -14,13 +14,12 @@ void CDMissionEmailTable::LoadValuesFromDatabase() {
 	tableSize.finalize();
 
 	// Reserve the size
-	auto& entries = GetEntriesMutable();
-	entries.reserve(size);
+	this->entries.reserve(size);
 
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM MissionEmail");
 	while (!tableData.eof()) {
-		auto& entry = entries.emplace_back();
+		CDMissionEmail entry;
 		entry.ID = tableData.getIntField("ID", -1);
 		entry.messageType = tableData.getIntField("messageType", -1);
 		entry.notificationGroup = tableData.getIntField("notificationGroup", -1);
@@ -30,15 +29,24 @@ void CDMissionEmailTable::LoadValuesFromDatabase() {
 		entry.locStatus = tableData.getIntField("locStatus", -1);
 		entry.gate_version = tableData.getStringField("gate_version", "");
 
+		this->entries.push_back(entry);
 		tableData.nextRow();
 	}
+
+	tableData.finalize();
 }
 
 //! Queries the table with a custom "where" clause
 std::vector<CDMissionEmail> CDMissionEmailTable::Query(std::function<bool(CDMissionEmail)> predicate) {
-	std::vector<CDMissionEmail> data = cpplinq::from(GetEntries())
+
+	std::vector<CDMissionEmail> data = cpplinq::from(this->entries)
 		>> cpplinq::where(predicate)
 		>> cpplinq::to_vector();
 
 	return data;
 }
+
+//! Gets all the entries in the table
+const std::vector<CDMissionEmail>& CDMissionEmailTable::GetEntries() const {
+	return this->entries;
+}

dDatabase/CDClientDatabase/CDClientTables/CDMissionEmailTable.h

@@ -3,8 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-#include <cstdint>
-
 struct CDMissionEmail {
 	uint32_t ID;
 	uint32_t messageType;
@@ -17,9 +15,14 @@ struct CDMissionEmail {
 };
 
 
-class CDMissionEmailTable : public CDTable<CDMissionEmailTable, std::vector<CDMissionEmail>> {
+class CDMissionEmailTable : public CDTable<CDMissionEmailTable> {
+private:
+	std::vector<CDMissionEmail> entries;
+
 public:
 	void LoadValuesFromDatabase();
 	// Queries the table with a custom "where" clause
 	std::vector<CDMissionEmail> Query(std::function<bool(CDMissionEmail)> predicate);
+
+	const std::vector<CDMissionEmail>& GetEntries() const;
 };

dDatabase/CDClientDatabase/CDClientTables/CDMissionNPCComponentTable.cpp

@@ -14,29 +14,37 @@ void CDMissionNPCComponentTable::LoadValuesFromDatabase() {
 	tableSize.finalize();
 
 	// Reserve the size
-	auto& entries = GetEntriesMutable();
-	entries.reserve(size);
+	this->entries.reserve(size);
 
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM MissionNPCComponent");
 	while (!tableData.eof()) {
-		auto& entry = entries.emplace_back();
+		CDMissionNPCComponent entry;
 		entry.id = tableData.getIntField("id", -1);
 		entry.missionID = tableData.getIntField("missionID", -1);
 		entry.offersMission = tableData.getIntField("offersMission", -1) == 1 ? true : false;
 		entry.acceptsMission = tableData.getIntField("acceptsMission", -1) == 1 ? true : false;
 		entry.gate_version = tableData.getStringField("gate_version", "");
 
+		this->entries.push_back(entry);
 		tableData.nextRow();
 	}
+
+	tableData.finalize();
 }
 
 //! Queries the table with a custom "where" clause
 std::vector<CDMissionNPCComponent> CDMissionNPCComponentTable::Query(std::function<bool(CDMissionNPCComponent)> predicate) {
 
-	std::vector<CDMissionNPCComponent> data = cpplinq::from(GetEntries())
+	std::vector<CDMissionNPCComponent> data = cpplinq::from(this->entries)
 		>> cpplinq::where(predicate)
 		>> cpplinq::to_vector();
 
 	return data;
 }
+
+//! Gets all the entries in the table
+const std::vector<CDMissionNPCComponent>& CDMissionNPCComponentTable::GetEntries() const {
+	return this->entries;
+}
+

dDatabase/CDClientDatabase/CDClientTables/CDMissionNPCComponentTable.h

@@ -3,8 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-#include <cstdint>
-
 struct CDMissionNPCComponent {
 	uint32_t id;                //!< The ID
 	uint32_t missionID;         //!< The Mission ID
@@ -13,9 +11,17 @@ struct CDMissionNPCComponent {
 	std::string gate_version;  //!< The gate version
 };
 
-class CDMissionNPCComponentTable : public CDTable<CDMissionNPCComponentTable, std::vector<CDMissionNPCComponent>> {
+class CDMissionNPCComponentTable : public CDTable<CDMissionNPCComponentTable> {
+private:
+	std::vector<CDMissionNPCComponent> entries;
+
 public:
 	void LoadValuesFromDatabase();
 	// Queries the table with a custom "where" clause
 	std::vector<CDMissionNPCComponent> Query(std::function<bool(CDMissionNPCComponent)> predicate);
+
+	// Gets all the entries in the table
+	const std::vector<CDMissionNPCComponent>& GetEntries() const;
+
 };
+

dDatabase/CDClientDatabase/CDClientTables/CDMissionTasksTable.cpp

@@ -14,13 +14,12 @@ void CDMissionTasksTable::LoadValuesFromDatabase() {
 	tableSize.finalize();
 
 	// Reserve the size
-	auto& entries = GetEntriesMutable();
-	entries.reserve(size);
+	this->entries.reserve(size);
 
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM MissionTasks");
 	while (!tableData.eof()) {
-		auto& entry = entries.emplace_back();
+		CDMissionTasks entry;
 		entry.id = tableData.getIntField("id", -1);
 		UNUSED(entry.locStatus = tableData.getIntField("locStatus", -1));
 		entry.taskType = tableData.getIntField("taskType", -1);
@@ -35,24 +34,26 @@ void CDMissionTasksTable::LoadValuesFromDatabase() {
 		UNUSED(entry.localize = tableData.getIntField("localize", -1) == 1 ? true : false);
 		UNUSED(entry.gate_version = tableData.getStringField("gate_version", ""));
 
+		this->entries.push_back(entry);
 		tableData.nextRow();
 	}
+
+	tableData.finalize();
 }
 
 std::vector<CDMissionTasks> CDMissionTasksTable::Query(std::function<bool(CDMissionTasks)> predicate) {
 
-	std::vector<CDMissionTasks> data = cpplinq::from(GetEntries())
+	std::vector<CDMissionTasks> data = cpplinq::from(this->entries)
 		>> cpplinq::where(predicate)
 		>> cpplinq::to_vector();
 
 	return data;
 }
 
-std::vector<CDMissionTasks*> CDMissionTasksTable::GetByMissionID(const uint32_t missionID) {
+std::vector<CDMissionTasks*> CDMissionTasksTable::GetByMissionID(uint32_t missionID) {
 	std::vector<CDMissionTasks*> tasks;
 
-	// TODO: this should not be linear(?) and also shouldnt need to be a pointer
-	for (auto& entry : GetEntriesMutable()) {
+	for (auto& entry : this->entries) {
 		if (entry.id == missionID) {
 			tasks.push_back(&entry);
 		}
@@ -61,6 +62,7 @@ std::vector<CDMissionTasks*> CDMissionTasksTable::GetByMissionID(const uint32_t
 	return tasks;
 }
 
-const typename CDMissionTasksTable::StorageType& CDMissionTasksTable::GetEntries() const {
-	return CDTable::GetEntries();
+const std::vector<CDMissionTasks>& CDMissionTasksTable::GetEntries() const {
+	return this->entries;
 }
+

dDatabase/CDClientDatabase/CDClientTables/CDMissionTasksTable.h

@@ -3,8 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-#include <cstdint>
-
 struct CDMissionTasks {
 	uint32_t id;                //!< The Mission ID that the task belongs to
 	UNUSED(uint32_t locStatus);         //!< ???
@@ -21,15 +19,17 @@ struct CDMissionTasks {
 	UNUSED(std::string gate_version);  //!< ???
 };
 
-class CDMissionTasksTable : public CDTable<CDMissionTasksTable, std::vector<CDMissionTasks>> {
+class CDMissionTasksTable : public CDTable<CDMissionTasksTable> {
+private:
+	std::vector<CDMissionTasks> entries;
+
 public:
 	void LoadValuesFromDatabase();
 	// Queries the table with a custom "where" clause
 	std::vector<CDMissionTasks> Query(std::function<bool(CDMissionTasks)> predicate);
 
-	std::vector<CDMissionTasks*> GetByMissionID(const uint32_t missionID);
+	std::vector<CDMissionTasks*> GetByMissionID(uint32_t missionID);
 
-	// TODO: Remove this and replace it with a proper lookup function.
-	const CDTable::StorageType& GetEntries() const;
+	const std::vector<CDMissionTasks>& GetEntries() const;
 };
 

dDatabase/CDClientDatabase/CDClientTables/CDMissionsTable.cpp

@@ -16,13 +16,12 @@ void CDMissionsTable::LoadValuesFromDatabase() {
 	tableSize.finalize();
 
 	// Reserve the size
-	auto& entries = GetEntriesMutable();
-	entries.reserve(size);
+	this->entries.reserve(size);
 
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM Missions");
 	while (!tableData.eof()) {
-		auto& entry = entries.emplace_back();
+		CDMissions entry;
 		entry.id = tableData.getIntField("id", -1);
 		entry.defined_type = tableData.getStringField("defined_type", "");
 		entry.defined_subtype = tableData.getStringField("defined_subtype", "");
@@ -76,8 +75,10 @@ void CDMissionsTable::LoadValuesFromDatabase() {
 		UNUSED(entry.locStatus = tableData.getIntField("locStatus", -1));
 		entry.reward_bankinventory = tableData.getIntField("reward_bankinventory", -1);
 
+		this->entries.push_back(entry);
 		tableData.nextRow();
 	}
+
 	tableData.finalize();
 
 	Default.id = -1;
@@ -85,15 +86,19 @@ void CDMissionsTable::LoadValuesFromDatabase() {
 
 std::vector<CDMissions> CDMissionsTable::Query(std::function<bool(CDMissions)> predicate) {
 
-	std::vector<CDMissions> data = cpplinq::from(GetEntries())
+	std::vector<CDMissions> data = cpplinq::from(this->entries)
 		>> cpplinq::where(predicate)
 		>> cpplinq::to_vector();
 
 	return data;
 }
 
+const std::vector<CDMissions>& CDMissionsTable::GetEntries(void) const {
+	return this->entries;
+}
+
 const CDMissions* CDMissionsTable::GetPtrByMissionID(uint32_t missionID) const {
-	for (const auto& entry : GetEntries()) {
+	for (const auto& entry : entries) {
 		if (entry.id == missionID) {
 			return const_cast<CDMissions*>(&entry);
 		}
@@ -103,7 +108,7 @@ const CDMissions* CDMissionsTable::GetPtrByMissionID(uint32_t missionID) const {
 }
 
 const CDMissions& CDMissionsTable::GetByMissionID(uint32_t missionID, bool& found) const {
-	for (const auto& entry : GetEntries()) {
+	for (const auto& entry : entries) {
 		if (entry.id == missionID) {
 			found = true;
 
@@ -116,12 +121,3 @@ const CDMissions& CDMissionsTable::GetByMissionID(uint32_t missionID, bool& foun
 	return Default;
 }
 
-const std::set<int32_t> CDMissionsTable::GetMissionsForReward(LOT lot) {
-	std::set<int32_t> toReturn {};
-	for (const auto& entry : GetEntries()) {
-		if (lot == entry.reward_item1 || lot == entry.reward_item2 || lot == entry.reward_item3 || lot == entry.reward_item4) {
-			toReturn.insert(entry.id);
-		}
-	}
-	return toReturn;
-}

dDatabase/CDClientDatabase/CDClientTables/CDMissionsTable.h

@@ -60,18 +60,22 @@ struct CDMissions {
 	int32_t reward_bankinventory;      //!< The amount of bank space this mission rewards
 };
 
-class CDMissionsTable : public CDTable<CDMissionsTable, std::vector<CDMissions>> {
+class CDMissionsTable : public CDTable<CDMissionsTable> {
+private:
+	std::vector<CDMissions> entries;
+
 public:
 	void LoadValuesFromDatabase();
 	// Queries the table with a custom "where" clause
 	std::vector<CDMissions> Query(std::function<bool(CDMissions)> predicate);
 
+	// Gets all the entries in the table
+	const std::vector<CDMissions>& GetEntries() const;
+
 	const CDMissions* GetPtrByMissionID(uint32_t missionID) const;
 
 	const CDMissions& GetByMissionID(uint32_t missionID, bool& found) const;
 
-	const std::set<int32_t> GetMissionsForReward(LOT lot);
-
-
 	static CDMissions Default;
 };
+

dDatabase/CDClientDatabase/CDClientTables/CDMovementAIComponentTable.cpp

@@ -14,13 +14,12 @@ void CDMovementAIComponentTable::LoadValuesFromDatabase() {
 	tableSize.finalize();
 
 	// Reserve the size
-	auto& entries = GetEntriesMutable();
-	entries.reserve(size);
+	this->entries.reserve(size);
 
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM MovementAIComponent");
 	while (!tableData.eof()) {
-		auto& entry = entries.emplace_back();
+		CDMovementAIComponent entry;
 		entry.id = tableData.getIntField("id", -1);
 		entry.MovementType = tableData.getStringField("MovementType", "");
 		entry.WanderChance = tableData.getFloatField("WanderChance", -1.0f);
@@ -30,15 +29,23 @@ void CDMovementAIComponentTable::LoadValuesFromDatabase() {
 		entry.WanderRadius = tableData.getFloatField("WanderRadius", -1.0f);
 		entry.attachedPath = tableData.getStringField("attachedPath", "");
 
+		this->entries.push_back(entry);
 		tableData.nextRow();
 	}
+
+	tableData.finalize();
 }
 
 std::vector<CDMovementAIComponent> CDMovementAIComponentTable::Query(std::function<bool(CDMovementAIComponent)> predicate) {
 
-	std::vector<CDMovementAIComponent> data = cpplinq::from(GetEntries())
+	std::vector<CDMovementAIComponent> data = cpplinq::from(this->entries)
 		>> cpplinq::where(predicate)
 		>> cpplinq::to_vector();
 
 	return data;
 }
+
+const std::vector<CDMovementAIComponent>& CDMovementAIComponentTable::GetEntries(void) const {
+	return this->entries;
+}
+

dDatabase/CDClientDatabase/CDClientTables/CDMovementAIComponentTable.h

@@ -3,8 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-#include <cstdint>
-
 struct CDMovementAIComponent {
 	uint32_t id;
 	std::string MovementType;
@@ -16,9 +14,15 @@ struct CDMovementAIComponent {
 	std::string attachedPath;
 };
 
-class CDMovementAIComponentTable : public CDTable<CDMovementAIComponentTable, std::vector<CDMovementAIComponent>> {
+class CDMovementAIComponentTable : public CDTable<CDMovementAIComponentTable> {
+private:
+	std::vector<CDMovementAIComponent> entries;
+
 public:
 	void LoadValuesFromDatabase();
 	// Queries the table with a custom "where" clause
 	std::vector<CDMovementAIComponent> Query(std::function<bool(CDMovementAIComponent)> predicate);
+
+	// Gets all the entries in the table
+	const std::vector<CDMovementAIComponent>& GetEntries() const;
 };

dDatabase/CDClientDatabase/CDClientTables/CDObjectSkillsTable.cpp

@@ -14,27 +14,33 @@ void CDObjectSkillsTable::LoadValuesFromDatabase() {
 	tableSize.finalize();
 
 	// Reserve the size
-	auto& entries = GetEntriesMutable();
-	entries.reserve(size);
+	this->entries.reserve(size);
 
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM ObjectSkills");
 	while (!tableData.eof()) {
-		auto &entry = entries.emplace_back();
+		CDObjectSkills entry;
 		entry.objectTemplate = tableData.getIntField("objectTemplate", -1);
 		entry.skillID = tableData.getIntField("skillID", -1);
 		entry.castOnType = tableData.getIntField("castOnType", -1);
 		entry.AICombatWeight = tableData.getIntField("AICombatWeight", -1);
 
+		this->entries.push_back(entry);
 		tableData.nextRow();
 	}
+
+	tableData.finalize();
 }
 
 std::vector<CDObjectSkills> CDObjectSkillsTable::Query(std::function<bool(CDObjectSkills)> predicate) {
 
-	std::vector<CDObjectSkills> data = cpplinq::from(GetEntries())
+	std::vector<CDObjectSkills> data = cpplinq::from(this->entries)
 		>> cpplinq::where(predicate)
 		>> cpplinq::to_vector();
 
 	return data;
 }
+
+const std::vector<CDObjectSkills>& CDObjectSkillsTable::GetEntries() const {
+	return this->entries;
+}

dDatabase/CDClientDatabase/CDClientTables/CDObjectSkillsTable.h

@@ -3,8 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-#include <cstdint>
-
 struct CDObjectSkills {
 	uint32_t objectTemplate;        //!< The LOT of the item
 	uint32_t skillID;               //!< The Skill ID of the object
@@ -12,10 +10,17 @@ struct CDObjectSkills {
 	uint32_t AICombatWeight;        //!< ???
 };
 
-class CDObjectSkillsTable : public CDTable<CDObjectSkillsTable, std::vector<CDObjectSkills>> {
+class CDObjectSkillsTable : public CDTable<CDObjectSkillsTable> {
+private:
+	std::vector<CDObjectSkills> entries;
+
 public:
 	void LoadValuesFromDatabase();
 	// Queries the table with a custom "where" clause
 	std::vector<CDObjectSkills> Query(std::function<bool(CDObjectSkills)> predicate);
+
+	// Gets all the entries in the table
+	const std::vector<CDObjectSkills>& GetEntries() const;
+
 };
 

dDatabase/CDClientDatabase/CDClientTables/CDObjectsTable.cpp

@@ -1,9 +1,5 @@
 #include "CDObjectsTable.h"
 
-namespace {
-	CDObjects ObjDefault;
-};
-
 void CDObjectsTable::LoadValuesFromDatabase() {
 	// First, get the size of the table
 	uint32_t size = 0;
@@ -18,12 +14,9 @@ void CDObjectsTable::LoadValuesFromDatabase() {
 
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM Objects");
-	auto& entries = GetEntriesMutable();
 	while (!tableData.eof()) {
-		const uint32_t lot = tableData.getIntField("id", 0);
-
-		auto& entry = entries[lot];
-		entry.id = lot;
+		CDObjects entry;
+		entry.id = tableData.getIntField("id", -1);
 		entry.name = tableData.getStringField("name", "");
 		UNUSED_COLUMN(entry.placeable = tableData.getIntField("placeable", -1);)
 		entry.type = tableData.getStringField("type", "");
@@ -38,34 +31,34 @@ void CDObjectsTable::LoadValuesFromDatabase() {
 		UNUSED_COLUMN(entry.gate_version = tableData.getStringField("gate_version", "");)
 		UNUSED_COLUMN(entry.HQ_valid = tableData.getIntField("HQ_valid", -1);)
 
+		this->entries.insert(std::make_pair(entry.id, entry));
 		tableData.nextRow();
 	}
 
-	ObjDefault.id = 0;
+	tableData.finalize();
+
+	m_default.id = 0;
 }
 
-const CDObjects& CDObjectsTable::GetByID(const uint32_t lot) {
-	auto& entries = GetEntriesMutable();
-	const auto& it = entries.find(lot);
-	if (it != entries.end()) {
+const CDObjects& CDObjectsTable::GetByID(uint32_t LOT) {
+	const auto& it = this->entries.find(LOT);
+	if (it != this->entries.end()) {
 		return it->second;
 	}
 
 	auto query = CDClientDatabase::CreatePreppedStmt("SELECT * FROM Objects WHERE id = ?;");
-	query.bind(1, static_cast<int32_t>(lot));
+	query.bind(1, static_cast<int32_t>(LOT));
 
 	auto tableData = query.execQuery();
 	if (tableData.eof()) {
-		entries.emplace(lot, ObjDefault);
-		return ObjDefault;
+		this->entries.insert(std::make_pair(LOT, m_default));
+		return m_default;
 	}
 
 	// Now get the data
 	while (!tableData.eof()) {
-		const uint32_t lot = tableData.getIntField("id", 0);
-
-		auto& entry = entries[lot];
-		entry.id = lot;
+		CDObjects entry;
+		entry.id = tableData.getIntField("id", -1);
 		entry.name = tableData.getStringField("name", "");
 		UNUSED(entry.placeable = tableData.getIntField("placeable", -1));
 		entry.type = tableData.getStringField("type", "");
@@ -80,15 +73,17 @@ const CDObjects& CDObjectsTable::GetByID(const uint32_t lot) {
 		UNUSED(entry.gate_version = tableData.getStringField("gate_version", ""));
 		UNUSED(entry.HQ_valid = tableData.getIntField("HQ_valid", -1));
 
+		this->entries.insert(std::make_pair(entry.id, entry));
 		tableData.nextRow();
 	}
 
 	tableData.finalize();
 
-	const auto& it2 = entries.find(lot);
+	const auto& it2 = entries.find(LOT);
 	if (it2 != entries.end()) {
 		return it2->second;
 	}
 
-	return ObjDefault;
+	return m_default;
 }
+

dDatabase/CDClientDatabase/CDClientTables/CDObjectsTable.h

@@ -3,8 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-#include <cstdint>
-
 struct CDObjects {
 	uint32_t id;                            //!< The LOT of the object
 	std::string name;                      //!< The internal name of the object
@@ -22,10 +20,14 @@ struct CDObjects {
 	UNUSED(uint32_t HQ_valid);                      //!< Probably used for the Nexus HQ database on LEGOUniverse.com
 };
 
-class CDObjectsTable : public CDTable<CDObjectsTable, std::map<uint32_t, CDObjects>> {
+class CDObjectsTable : public CDTable<CDObjectsTable> {
+private:
+	std::map<uint32_t, CDObjects> entries;
+	CDObjects m_default;
+
 public:
 	void LoadValuesFromDatabase();
 	// Gets an entry by ID
-	const CDObjects& GetByID(const uint32_t lot);
+	const CDObjects& GetByID(uint32_t LOT);
 };
 

dDatabase/CDClientDatabase/CDClientTables/CDPackageComponentTable.cpp

@@ -13,17 +13,18 @@ void CDPackageComponentTable::LoadValuesFromDatabase() {
 
 	tableSize.finalize();
 
-	auto& entries = GetEntriesMutable();
-	entries.reserve(size);
+	// Reserve the size
+	this->entries.reserve(size);
 
 	// Now get the data
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM PackageComponent");
 	while (!tableData.eof()) {
-		auto& entry = entries.emplace_back();
+		CDPackageComponent entry;
 		entry.id = tableData.getIntField("id", -1);
 		entry.LootMatrixIndex = tableData.getIntField("LootMatrixIndex", -1);
 		entry.packageType = tableData.getIntField("packageType", -1);
 
+		this->entries.push_back(entry);
 		tableData.nextRow();
 	}
 
@@ -33,9 +34,15 @@ void CDPackageComponentTable::LoadValuesFromDatabase() {
 //! Queries the table with a custom "where" clause
 std::vector<CDPackageComponent> CDPackageComponentTable::Query(std::function<bool(CDPackageComponent)> predicate) {
 
-	std::vector<CDPackageComponent> data = cpplinq::from(GetEntries())
+	std::vector<CDPackageComponent> data = cpplinq::from(this->entries)
 		>> cpplinq::where(predicate)
 		>> cpplinq::to_vector();
 
 	return data;
 }
+
+//! Gets all the entries in the table
+const std::vector<CDPackageComponent>& CDPackageComponentTable::GetEntries() const {
+	return this->entries;
+}
+

dDatabase/CDClientDatabase/CDClientTables/CDPackageComponentTable.h

@@ -3,17 +3,20 @@
 // Custom Classes
 #include "CDTable.h"
 
-#include <cstdint>
-
 struct CDPackageComponent {
 	uint32_t id;
 	uint32_t LootMatrixIndex;
 	uint32_t packageType;
 };
 
-class CDPackageComponentTable : public CDTable<CDPackageComponentTable, std::vector<CDPackageComponent>> {
+class CDPackageComponentTable : public CDTable<CDPackageComponentTable> {
+private:
+	std::vector<CDPackageComponent> entries;
+
 public:
 	void LoadValuesFromDatabase();
 	// Queries the table with a custom "where" clause
 	std::vector<CDPackageComponent> Query(std::function<bool(CDPackageComponent)> predicate);
+
+	const std::vector<CDPackageComponent>& GetEntries() const;
 };

dDatabase/CDClientDatabase/CDClientTables/CDPetComponentTable.cpp

@@ -23,12 +23,10 @@ namespace {
 
 void CDPetComponentTable::LoadValuesFromDatabase() {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM PetComponent");
-	auto& entries = GetEntriesMutable();
 	while (!tableData.eof()) {
 		const uint32_t componentID = tableData.getIntField("id", defaultEntry.id);
 
-		auto& entry = entries[componentID];
-
+		auto& entry = m_Entries[componentID];
 		entry.id = componentID;
 		UNUSED_COLUMN(entry.minTameUpdateTime = tableData.getFloatField("minTameUpdateTime", defaultEntry.minTameUpdateTime));
 		UNUSED_COLUMN(entry.maxTameUpdateTime = tableData.getFloatField("maxTameUpdateTime", defaultEntry.maxTameUpdateTime));
@@ -50,13 +48,12 @@ void CDPetComponentTable::LoadValuesFromDatabase() {
 }
 
 void CDPetComponentTable::LoadValuesFromDefaults() {
-	GetEntriesMutable().emplace(defaultEntry.id, defaultEntry);
+	m_Entries.insert(std::make_pair(defaultEntry.id, defaultEntry));
 }
 
 CDPetComponent& CDPetComponentTable::GetByID(const uint32_t componentID) {
-	auto& entries = GetEntriesMutable();
-	auto itr = entries.find(componentID);
-	if (itr == entries.end()) {
+	auto itr = m_Entries.find(componentID);
+	if (itr == m_Entries.end()) {
 		LOG("Unable to load pet component (ID %i) values from database! Using default values instead.", componentID);
 		return defaultEntry;
 	}

dDatabase/CDClientDatabase/CDClientTables/CDPetComponentTable.h

@@ -21,7 +21,7 @@ struct CDPetComponent {
 	UNUSED_COLUMN(std::string buffIDs;)
 };
 
-class CDPetComponentTable : public CDTable<CDPetComponentTable, std::map<uint32_t, CDPetComponent>> {
+class CDPetComponentTable : public CDTable<CDPetComponentTable> {
 public:
 
 	/**
@@ -39,4 +39,7 @@ public:
 	 * @returns A reference to the corresponding table, or the default if one could not be found
 	*/
 	CDPetComponent& GetByID(const uint32_t componentID);
+	
+private:
+	std::map<uint32_t, CDPetComponent> m_Entries;
 };

dDatabase/CDClientDatabase/CDClientTables/CDPhysicsComponentTable.cpp

@@ -2,35 +2,34 @@
 
 void CDPhysicsComponentTable::LoadValuesFromDatabase() {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM PhysicsComponent");
-	auto& entries = GetEntriesMutable();
 	while (!tableData.eof()) {
-		const uint32_t componentID = tableData.getIntField("id", -1);
-
-		auto& entry = entries[componentID];
-		entry.id = componentID;
+		CDPhysicsComponent entry;
+		entry.id = tableData.getIntField("id", -1);
 		entry.bStatic = tableData.getIntField("static", -1) != 0;
 		entry.physicsAsset = tableData.getStringField("physics_asset", "");
-		UNUSED_COLUMN(entry.jump = tableData.getIntField("jump", -1) != 0;)
-		UNUSED_COLUMN(entry.doubleJump = tableData.getIntField("doublejump", -1) != 0;)
-		entry.speed = static_cast<float>(tableData.getFloatField("speed", -1));
-		UNUSED_COLUMN(entry.rotSpeed = tableData.getFloatField("rotSpeed", -1);)
-		entry.playerHeight = static_cast<float>(tableData.getFloatField("playerHeight"));
-		entry.playerRadius = static_cast<float>(tableData.getFloatField("playerRadius"));
+		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_COLUMN(entry.airSpeed = tableData.getFloatField("airSpeed");)
-		UNUSED_COLUMN(entry.boundaryAsset = tableData.getStringField("boundaryAsset");)
-		UNUSED_COLUMN(entry.jumpAirSpeed = tableData.getFloatField("jumpAirSpeed");)
-		UNUSED_COLUMN(entry.friction = tableData.getFloatField("friction");)
-		UNUSED_COLUMN(entry.gravityVolumeAsset = tableData.getStringField("gravityVolumeAsset");)
+		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(const uint32_t componentID) {
-	auto& entries = GetEntriesMutable();
-	auto itr = entries.find(componentID);
-	return itr != entries.end() ? &itr->second : nullptr;
+CDPhysicsComponent* CDPhysicsComponentTable::GetByID(uint32_t componentID) {
+	auto itr = m_entries.find(componentID);
+	return itr != m_entries.end() ? &itr->second : nullptr;
 }