A few minor changes and fixing in game camera

.github/workflows/build-and-test.yml

@@ -10,13 +10,12 @@ jobs:
   build-and-test:
     name: Build & Test (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
-    continue-on-error: true
     strategy:
       matrix:
         os: [ windows-2022, ubuntu-20.04, macos-11 ]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
       with:
         submodules: true
     - name: Add msbuild to PATH (Windows only)
@@ -35,7 +34,7 @@ jobs:
         buildPreset: "ci-${{matrix.os}}"
         testPreset: "ci-${{matrix.os}}"
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
       if: ${{ github.ref == 'ref/head/main' }}
       with:
         name: build-${{matrix.os}}

.gitignore

@@ -121,4 +121,4 @@ docker/__pycache__
 
 docker-compose.override.yml
 
-!*Test.bin
+!/tests/TestBitStreams/*.bin

.gitmodules

@@ -23,3 +23,6 @@
 [submodule "thirdparty/AccountManager"]
 	path = thirdparty/AccountManager
 	url = https://github.com/DarkflameUniverse/AccountManager
+[submodule "thirdparty/raylib"]
+	path = thirdparty/raylib
+	url = https://github.com/raysan5/raylib

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18)
+cmake_minimum_required(VERSION 3.14)
 project(Darkflame)
 include(CTest)
 
@@ -39,6 +39,9 @@ endforeach()
 # Set the version
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 
+# Set our compile options
+option(BUILD_VISUAL_DEBUGGER "Toggle for building visual debugger (default off)" OFF)
+
 # Echo the version
 message(STATUS "Version: ${PROJECT_VERSION}")
 
@@ -58,7 +61,7 @@ if(UNIX)
 	if(APPLE)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17 -O2 -Wuninitialized -D_GLIBCXX_USE_CXX11_ABI=0 -D_GLIBCXX_USE_CXX17_ABI=0 -fPIC")
 	else()
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17 -O2 -Wuninitialized -D_GLIBCXX_USE_CXX11_ABI=0 -D_GLIBCXX_USE_CXX17_ABI=0 -static-libgcc -fPIC -lstdc++fs")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17 -O2 -Wuninitialized -D_GLIBCXX_USE_CXX11_ABI=0 -D_GLIBCXX_USE_CXX17_ABI=0 -static-libgcc -fPIC")
 	endif()
 	if (__dynamic AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -rdynamic")
@@ -76,15 +79,6 @@ endif()
 
 # Our output dir
 set(CMAKE_BINARY_DIR ${PROJECT_BINARY_DIR})
-
-# TODO make this not have to override the build type directories
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR})
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR})
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
-
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
@@ -92,11 +86,14 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 # Create a /res directory
 make_directory(${CMAKE_BINARY_DIR}/res)
 
+# Create a /locale directory
+make_directory(${CMAKE_BINARY_DIR}/locale)
+
 # Create a /logs directory
 make_directory(${CMAKE_BINARY_DIR}/logs)
 
 # Copy resource files on first build
-set(RESOURCE_FILES "sharedconfig.ini" "authconfig.ini" "chatconfig.ini" "worldconfig.ini" "masterconfig.ini" "blacklist.dcf")
+set(RESOURCE_FILES "authconfig.ini" "chatconfig.ini" "worldconfig.ini" "masterconfig.ini" "blacklist.dcf")
 foreach(resource_file ${RESOURCE_FILES})
 	if (NOT EXISTS ${PROJECT_BINARY_DIR}/${resource_file})
 		configure_file(
@@ -107,17 +104,6 @@ foreach(resource_file ${RESOURCE_FILES})
 	endif()
 endforeach()
 
-# Copy navmesh data on first build and extract it
-if (NOT EXISTS ${PROJECT_BINARY_DIR}/navmeshes/)
-	configure_file(
-		${CMAKE_SOURCE_DIR}/resources/navmeshes.zip ${PROJECT_BINARY_DIR}/navmeshes.zip
-		COPYONLY
-	)
-
-	file(ARCHIVE_EXTRACT INPUT ${PROJECT_BINARY_DIR}/navmeshes.zip)
-	file(REMOVE ${PROJECT_BINARY_DIR}/navmeshes.zip)
-endif()
-
 # Copy vanity files on first build
 set(VANITY_FILES "CREDITS.md" "INFO.md" "TESTAMENT.md" "NPC.xml")
 foreach(file ${VANITY_FILES})
@@ -125,25 +111,13 @@ foreach(file ${VANITY_FILES})
 endforeach()
 
 # Move our migrations for MasterServer to run
-file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/migrations/dlu/)
+file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/migrations/)
 file(GLOB SQL_FILES ${CMAKE_SOURCE_DIR}/migrations/dlu/*.sql)
 foreach(file ${SQL_FILES})
 	get_filename_component(file ${file} NAME)
-	if (NOT EXISTS ${PROJECT_BINARY_DIR}/migrations/dlu/${file})
+	if (NOT EXISTS ${PROJECT_BINARY_DIR}/migrations/${file})
 		configure_file(
-			${CMAKE_SOURCE_DIR}/migrations/dlu/${file} ${PROJECT_BINARY_DIR}/migrations/dlu/${file}
-			COPYONLY
-		)
-	endif()
-endforeach()
-
-file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/migrations/cdserver/)
-file(GLOB SQL_FILES ${CMAKE_SOURCE_DIR}/migrations/cdserver/*.sql)
-foreach(file ${SQL_FILES})
-	get_filename_component(file ${file} NAME)
-	if (NOT EXISTS ${PROJECT_BINARY_DIR}/migrations/cdserver/${file})
-		configure_file(
-			${CMAKE_SOURCE_DIR}/migrations/cdserver/${file} ${PROJECT_BINARY_DIR}/migrations/cdserver/${file}
+			${CMAKE_SOURCE_DIR}/migrations/dlu/${file} ${PROJECT_BINARY_DIR}/migrations/${file}
 			COPYONLY
 		)
 	endif()
@@ -152,8 +126,6 @@ endforeach()
 # Create our list of include directories
 set(INCLUDED_DIRECTORIES
 	"dCommon"
-	"dCommon/dClient"
-	"dCommon/dEnums"
 	"dChatFilter"
 	"dGame"
 	"dGame/dBehaviors"
@@ -162,7 +134,6 @@ set(INCLUDED_DIRECTORIES
 	"dGame/dInventory"
 	"dGame/dMission"
 	"dGame/dEntity"
-	"dGame/dPropertyBehaviors"
 	"dGame/dUtilities"
 	"dPhysics"
 	"dNavigation"
@@ -172,85 +143,13 @@ set(INCLUDED_DIRECTORIES
 	"dDatabase/Tables"
 	"dNet"
 	"dScripts"
-	"dScripts/02_server"
-	"dScripts/ai"
-	"dScripts/client"
-	"dScripts/EquipmentScripts"
-	"dScripts/zone"
-	"dScripts/02_server/DLU"
-	"dScripts/02_server/Enemy"
-	"dScripts/02_server/Equipment"
-	"dScripts/02_server/Map"
-	"dScripts/02_server/Minigame"
-	"dScripts/02_server/Objects"
-	"dScripts/02_server/Pets"
-	"dScripts/02_server/Enemy/AG"
-	"dScripts/02_server/Enemy/AM"
-	"dScripts/02_server/Enemy/FV"
-	"dScripts/02_server/Enemy/General"
-	"dScripts/02_server/Enemy/Survival"
-	"dScripts/02_server/Enemy/VE"
-	"dScripts/02_server/Enemy/Waves"
-	"dScripts/02_server/Map/AG"
-	"dScripts/02_server/Map/AG_Spider_Queen"
-	"dScripts/02_server/Map/AM"
-	"dScripts/02_server/Map/FV"
-	"dScripts/02_server/Map/General"
-	"dScripts/02_server/Map/GF"
-	"dScripts/02_server/Map/njhub"
-	"dScripts/02_server/Map/NS"
-	"dScripts/02_server/Map/NT"
-	"dScripts/02_server/Map/PR"
-	"dScripts/02_server/Map/Property"
-	"dScripts/02_server/Map/SS"
-	"dScripts/02_server/Map/VE"
-	"dScripts/02_server/Map/FV/Racing"
-	"dScripts/02_server/Map/General/Ninjago"
-	"dScripts/02_server/Map/njhub/boss_instance"
-	"dScripts/02_server/Map/NS/Waves"
-	"dScripts/02_server/Map/Property/AG_Med"
-	"dScripts/02_server/Map/Property/AG_Small"
-	"dScripts/02_server/Map/Property/NS_Med"
-	"dScripts/02_server/Minigame/General"
-	"dScripts/ai/ACT"
-	"dScripts/ai/AG"
-	"dScripts/ai/FV"
-	"dScripts/ai/GENERAL"
-	"dScripts/ai/GF"
-	"dScripts/ai/MINIGAME"
-	"dScripts/ai/NP"
-	"dScripts/ai/NS"
-	"dScripts/ai/PETS"
-	"dScripts/ai/PROPERTY"
-	"dScripts/ai/RACING"
-	"dScripts/ai/SPEC"
-	"dScripts/ai/WILD"
-	"dScripts/ai/ACT/FootRace"
-	"dScripts/ai/MINIGAME/SG_GF"
-	"dScripts/ai/MINIGAME/SG_GF/SERVER"
-	"dScripts/ai/NS/NS_PP_01"
-	"dScripts/ai/NS/WH"
-	"dScripts/ai/PROPERTY/AG"
-	"dScripts/ai/RACING/OBJECTS"
-	"dScripts/client/ai"
-	"dScripts/client/ai/PR"
-	"dScripts/zone/AG"
-	"dScripts/zone/LUPs"
-	"dScripts/zone/PROPERTY"
-	"dScripts/zone/PROPERTY/FV"
-	"dScripts/zone/PROPERTY/GF"
-	"dScripts/zone/PROPERTY/NS"
+	"dWorldServer"
 
 	"thirdparty/raknet/Source"
 	"thirdparty/tinyxml2"
 	"thirdparty/recastnavigation"
 	"thirdparty/SQLite"
 	"thirdparty/cpplinq"
-
-	"tests"
-	"tests/dCommonTests"
-	"tests/dGameTests"
-	"tests/dGameTests/dComponentsTests"
 	)
 
 # Add system specfic includes for Apple, Windows and Other Unix OS' (including Linux)
@@ -265,6 +164,7 @@ elseif (UNIX)
 	set(INCLUDED_DIRECTORIES ${INCLUDED_DIRECTORIES} "thirdparty/libbcrypt/include/bcrypt")
 endif()
 
+include_directories(${ZLIB_INCLUDE_DIRS})
 # Add binary directory as an include directory
 include_directories(${PROJECT_BINARY_DIR})
 
@@ -320,6 +220,10 @@ add_subdirectory(dZoneManager)
 add_subdirectory(dNavigation)
 add_subdirectory(dPhysics)
 
+if (BUILD_VISUAL_DEBUGGER)
+	add_subdirectory(dVisualDebugger)
+endif()
+
 # Create a list of common libraries shared between all binaries
 set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "mariadbConnCpp")
 
@@ -332,11 +236,12 @@ if (UNIX)
 	endif()
 endif()
 
+add_subdirectory(tests)
+
 # Include all of our binary directories
 add_subdirectory(dWorldServer)
 add_subdirectory(dAuthServer)
 add_subdirectory(dChatServer)
-add_subdirectory(dUgcServer)
 add_subdirectory(dMasterServer) # Add MasterServer last so it can rely on the other binaries
 
 # Add our precompiled headers
@@ -365,7 +270,3 @@ target_precompile_headers(
 	tinyxml2 PRIVATE
 	"$<$<COMPILE_LANGUAGE:CXX>:${PROJECT_SOURCE_DIR}/thirdparty/tinyxml2/tinyxml2.h>"
 )
-
-if (${__enable_testing__} MATCHES "1")
-	add_subdirectory(tests)
-endif()

CMakePresets.json

@@ -1,131 +1,126 @@
 {
-    "version": 3,
-    "cmakeMinimumRequired": {
-      "major": 3,
-      "minor": 14,
-      "patch": 0
+  "version": 3,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 14,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "default",
+      "displayName": "Default configure step",
+      "description": "Use 'build' dir and Unix makefiles",
+      "binaryDir": "${sourceDir}/build",
+      "generator": "Unix Makefiles"
     },
-    "configurePresets": [
-      {
-        "name": "default",
-        "displayName": "Default configure step",
-        "description": "Use 'build' dir and Unix makefiles",
-        "binaryDir": "${sourceDir}/build",
-        "generator": "Unix Makefiles"
-      },
-      {
-        "name": "ci-ubuntu-20.04",
-        "displayName": "CI configure step for Ubuntu",
-        "description": "Same as default, Used in GitHub actions workflow",
-        "inherits": "default"
-      },
-      {
-        "name": "ci-macos-11",
-        "displayName": "CI configure step for MacOS",
-        "description": "Same as default, Used in GitHub actions workflow",
-        "inherits": "default",
-        "cacheVariables": {
-          "OPENSSL_ROOT_DIR": "/usr/local/opt/openssl@3/"
-        }
-      },
-      {
-        "name": "ci-windows-2022",
-        "displayName": "CI configure step for Windows",
-        "description": "Set architecture to 64-bit (b/c RakNet)",
-        "inherits": "default",
-        "generator": "Visual Studio 17 2022",
-        "architecture": {
-          "value": "x64"
-        },
-        "cacheVariables": {
-          "CMAKE_BUILD_TYPE": "RelWithDebInfo"
-        }
-      },
-      {
-        "name": "windows-default",
-        "inherits": "ci-windows-2022",
-        "displayName": "Windows only Configure Settings",
-        "description": "Sets build and install directories",
-        "generator": "Ninja",
-        "architecture": {
-          "value": "x64",
-          "strategy": "external"
-        }
+    {
+      "name": "ci-ubuntu-20.04",
+      "displayName": "CI configure step for Ubuntu",
+      "description": "Same as default, Used in GitHub actions workflow",
+      "inherits": "default"
+    },
+    {
+      "name": "ci-macos-11",
+      "displayName": "CI configure step for MacOS",
+      "description": "Same as default, Used in GitHub actions workflow",
+      "inherits": "default",
+      "cacheVariables": {
+        "OPENSSL_ROOT_DIR": "/usr/local/Cellar/openssl@3/3.0.5/"
       }
-    ],
-    "buildPresets": [
-      {
-        "name": "default",
-        "configurePreset": "default",
-        "displayName": "Default Build",
-        "description": "Default Build",
-        "jobs": 2
+    },
+    {
+      "name": "ci-windows-2022",
+      "displayName": "CI configure step for Windows",
+      "description": "Set architecture to 64-bit (b/c RakNet)",
+      "inherits": "default",
+      "generator": "Visual Studio 17 2022",
+      "architecture": {
+        "value": "x64"
       },
-      {
-        "name": "ci-windows-2022",
-        "configurePreset": "ci-windows-2022",
-        "displayName": "Windows CI Build",
-        "description": "This preset is used by the CI build on windows",
-        "configuration": "RelWithDebInfo",
-        "jobs": 2
-      },
-      {
-        "name": "ci-ubuntu-20.04",
-        "configurePreset": "ci-ubuntu-20.04",
-        "displayName": "Linux CI Build",
-        "description": "This preset is used by the CI build on linux",
-        "jobs": 2
-      },
-      {
-        "name": "ci-macos-11",
-        "configurePreset": "ci-macos-11",
-        "displayName": "MacOS CI Build",
-        "description": "This preset is used by the CI build on MacOS",
-        "jobs": 2
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
       }
-    ],
-    "testPresets": [
-      {
-        "name": "ci-ubuntu-20.04",
-        "configurePreset": "ci-ubuntu-20.04",
-        "displayName": "CI Tests on Linux",
-        "description": "Runs all tests on a linux configuration",
-		"execution": {
-			"jobs": 2
-		},
-        "output": {
-          "outputOnFailure": true
-        }
-      },
-      {
-        "name": "ci-macos-11",
-        "configurePreset": "ci-macos-11",
-        "displayName": "CI Tests on MacOS",
-        "description": "Runs all tests on a Mac configuration",
-		"execution": {
-			"jobs": 2
-		},
-        "output": {
-          "outputOnFailure": true
-        }
-      },
-      {
-        "name": "ci-windows-2022",
-        "configurePreset": "ci-windows-2022",
-        "displayName": "CI Tests on windows",
-        "description": "Runs all tests on a windows configuration",
-		"configuration": "RelWithDebInfo",
-		"execution": {
-			"jobs": 2
-		},
-        "output": {
-          "outputOnFailure": true
-        },
-		"filter": {
-			"exclude": {
-				"name": "((example)|(minigzip))+"
-			}
-		}
+    },
+    {
+      "name": "windows-default",
+      "inherits": "ci-windows-2022",
+      "displayName": "Windows only Configure Settings",
+      "description": "Sets build and install directories",
+      "generator": "Ninja",
+      "architecture": {
+        "value": "x64",
+        "strategy": "external"
       }
-    ]
-  }
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "default",
+      "configurePreset": "default",
+      "displayName": "Default Build",
+      "description": "Default Build",
+      "jobs": 2
+    },
+    {
+      "name": "ci-windows-2022",
+      "configurePreset": "ci-windows-2022",
+      "displayName": "Windows CI Build",
+      "description": "This preset is used by the CI build on windows",
+      "configuration": "RelWithDebInfo",
+      "jobs": 2
+    },
+    {
+      "name": "ci-ubuntu-20.04",
+      "configurePreset": "ci-ubuntu-20.04",
+      "displayName": "Linux CI Build",
+      "description": "This preset is used by the CI build on linux",
+      "jobs": 2
+    },
+    {
+      "name": "ci-macos-11",
+      "configurePreset": "ci-macos-11",
+      "displayName": "MacOS CI Build",
+      "description": "This preset is used by the CI build on MacOS",
+      "jobs": 2
+    }
+  ],
+  "testPresets": [
+    {
+      "name": "ci-ubuntu-20.04",
+      "configurePreset": "ci-ubuntu-20.04",
+      "displayName": "CI Tests on Linux",
+      "description": "Runs all tests on a linux configuration",
+      "execution": {
+        "jobs": 2
+      },
+      "output": {
+        "outputOnFailure": true
+      }
+    },
+    {
+      "name": "ci-macos-11",
+      "configurePreset": "ci-macos-11",
+      "displayName": "CI Tests on MacOS",
+      "description": "Runs all tests on a Mac configuration",
+      "execution": {
+        "jobs": 2
+      },
+      "output": {
+        "outputOnFailure": true
+      }
+    },
+    {
+      "name": "ci-windows-2022",
+      "configurePreset": "ci-windows-2022",
+      "displayName": "CI Tests on windows",
+      "description": "Runs all tests on a windows configuration",
+      "configuration": "RelWithDebInfo",
+      "execution": {
+        "jobs": 2
+      },
+      "output": {
+        "outputOnFailure": true
+      }
+    }
+  ]
+}

CMakeVariables.txt

@@ -15,8 +15,6 @@ __dynamic=1
 # __include_backtrace__=1
 # Set __include_backtrace__ to 1 to includes the backtrace library for better crashlogs.
 # __compile_backtrace__=1
-# Set __compile_backtrace__ to 1 to compile the backtrace library instead of using system libraries.
+# Set __compile_backtrace__ to 1 to compile the backtrace library instead of using system libraries. 
 __maria_db_connector_compile_jobs__=1
 # Set to the number of jobs (make -j equivalent) to compile the mariadbconn files with.
-__enable_testing__=1
-# When set to 1 and uncommented, compiling and linking testing folders and libraries will be done.

README.md

@@ -38,14 +38,10 @@ Some tools utilized to streamline the setup process require Python 3, make sure
 
 ### Choosing the right version for your client
 DLU clients identify themselves using a higher version number than the regular live clients out there.
-This was done make sure that older and incomplete clients wouldn't produce false positive bug reports for us, and because we made bug fixes and new content for the client.
+This was done make sure that older and incomplete clients wouldn't produce false positive bug reports for us, and because we made bug fixes and new content for the client. 
 
 If you're using a DLU client you'll have to go into the "CMakeVariables.txt" file and change the NET_VERSION variable to 171023 to match the modified client's version number.
 
-### Enabling testing
-While it is highly recommended to enable testing, if you would like to save compilation time, you'll want to comment out the enable_testing variable in CMakeVariables.txt.
-It is recommended that after building and if testing is enabled, to run `ctest` and make sure all the tests pass.
-
 ### Using Docker
 Refer to [Docker.md](/Docker.md).
 
@@ -173,7 +169,7 @@ Known good SHA256 checksums of the client:
 - `0d862f71eedcadc4494c4358261669721b40b2131101cbd6ef476c5a6ec6775b` (unpacked client, includes extra locales, rar compressed)
 
 Known good *SHA1* checksum of the DLU client:
-- `91498e09b83ce69f46baf9e521d48f23fe502985` (packed client, zip compressed)
+- `91498e09b83ce69f46baf9e521d48f23fe502985` (packed client, zip compressed) 
 
 How to generate a SHA256 checksum:
 ```bash
@@ -200,25 +196,23 @@ certutil -hashfile <file> SHA256
 * Copy over or create symlinks from `locale.xml` in your client `locale` directory to the `build/locale` directory
 
 #### Client database
-* Move the file `res/cdclient.fdb` from the unpacked client to the `build/res` folder on the server.
-* The server will automatically copy and convert the file from fdb to sqlite should `CDServer.sqlite` not already exist.
-* You can also convert the database manually using `fdb_to_sqlite.py` using lcdr's utilities.  Just make sure to rename the file to `CDServer.sqlite` instead of `cdclient.sqlite`.
-* Migrations to the database are automatically run on server start.  When migrations are needed to be ran, the server may take a bit longer to start.
+* Use `fdb_to_sqlite.py` in lcdr's utilities on `res/cdclient.fdb` in the unpacked client to convert the client database to `cdclient.sqlite`
+* Move and rename `cdclient.sqlite` into `build/res/CDServer.sqlite`
+* Run each SQL file in the order at which they appear [here](migrations/cdserver/) on the SQLite database
 
 ### Database
 Darkflame Universe utilizes a MySQL/MariaDB database for account and character information.
 
 Initial setup can vary drastically based on which operating system or distribution you are running; there are instructions out there for most setups, follow those and come back here when you have a database up and running.
-
-* All that you need to do is create a database to connect to.  As long as the server can connect to the database, the schema will always be kept up to date when you start the server.
+* Create a database for Darkflame Universe to use
 
 #### Configuration
 
-After the server has been built there should be four `ini` files in the build director: `sharedconfig.ini`, `authconfig.ini`, `chatconfig.ini`, `masterconfig.ini`, and `worldconfig.ini`. Go through them and fill in the database credentials and configure other settings if necessary.
+After the server has been built there should be four `ini` files in the build director: `authconfig.ini`, `chatconfig.ini`, `masterconfig.ini`, and `worldconfig.ini`. Go through them and fill in the database credentials and configure other settings if necessary.
 
-#### Migrations
+#### Setup and Migrations
 
-The database is automatically setup and migrated to what it should look like for the latest commit whenever you start the server.
+Use the command `./MasterServer -m` to setup the tables in the database. The first time this command is run on a database, the tables will be up to date with the most recent version. To update your database tables, run this command again. Multiple invocations will not affect any functionality.
 
 #### Verify
 
@@ -234,7 +228,7 @@ Your build directory should now look like this:
 * **locale/**
   * locale.xml
 * **res/**
-  * cdclient.fdb
+  * CDServer.sqlite
   * chatplus_en_us.txt
   * **macros/**
     * ...
@@ -273,6 +267,16 @@ To connect to a server follow these steps:
 * Launch `legouniverse.exe`, through `wine` if on a Unix-like operating system
 * Note that if you are on WSL2, you will need to configure the public IP in the server and client to be the IP of the WSL2 instance and not localhost, which can be found by running `ifconfig` in the terminal. Windows defaults to WSL1, so this will not apply to most users.
 
+### Survival
+
+The client script for the survival minigame has a bug in it which can cause the minigame to not load. To fix this, follow these instructions:
+* Open `res/scripts/ai/minigame/survival/l_zone_survival_client.lua`
+* Navigate to line `617`
+* Change `PlayerReady(self)` to `onPlayerReady(self)`
+* Save the file, overriding readonly mode if required
+
+If you still experience the bug, try deleting/renaming `res/pack/scripts.pk`.
+
 ### Brick-By-Brick building
 
 Brick-By-Brick building requires `PATCHSERVERIP=0:` in the `boot.cfg` to point to a HTTP server which always returns `HTTP 404 - Not Found` for all requests. This can be achieved by pointing it to `localhost` while having `sudo python -m http.server 80` running in the background.
@@ -330,7 +334,7 @@ Here is a summary of the commands available in-game. All commands are prefixed b
       /instanceinfo
     </td>
     <td>
-      Displays in the chat the current zone, clone, and instance id.
+      Displays in the chat the current zone, clone, and instance id. 
     </td>
     <td>
     </td>

build.sh

@@ -1,6 +1,3 @@
-# Error if any command fails
-set -e
-
 # Create the build directory, preserving it if it already exists
 mkdir -p build
 cd build
@@ -11,3 +8,5 @@ cmake ..
 # To build utilizing multiple cores, append `-j` and the amount of cores to utilize, for example `cmake --build . --config Release -j8'
 cmake --build . --config Release
 
+# Run migrations
+./MasterServer -m

dAuthServer/AuthServer.cpp

@@ -11,7 +11,6 @@
 #include "Database.h"
 #include "dConfig.h"
 #include "Diagnostics.h"
-#include "BinaryPathFinder.h"
 
 //RakNet includes:
 #include "RakNetDefines.h"
@@ -22,10 +21,9 @@
 
 #include "Game.h"
 namespace Game {
-	dLogger* logger = nullptr;
-	dServer* server = nullptr;
-	dConfig* config = nullptr;
-	bool shouldShutdown = false;
+	dLogger* logger;
+	dServer* server;
+	dConfig* config;
 }
 
 dLogger* SetupLogger();
@@ -38,22 +36,22 @@ int main(int argc, char** argv) {
 
 	//Create all the objects we need to run our service:
 	Game::logger = SetupLogger();
-	if (!Game::logger) return EXIT_FAILURE;
-
-	//Read our config:
-	Game::config = new dConfig((BinaryPathFinder::GetBinaryDir() / "authconfig.ini").string());
-	Game::logger->SetLogToConsole(Game::config->GetValue("log_to_console") != "0");
-	Game::logger->SetLogDebugStatements(Game::config->GetValue("log_debug_statements") == "1");
-
+	if (!Game::logger) return 0;
 	Game::logger->Log("AuthServer", "Starting Auth server...");
 	Game::logger->Log("AuthServer", "Version: %i.%i", PROJECT_VERSION_MAJOR, PROJECT_VERSION_MINOR);
 	Game::logger->Log("AuthServer", "Compiled on: %s", __TIMESTAMP__);
 
+	//Read our config:
+	dConfig config("authconfig.ini");
+	Game::config = &config;
+	Game::logger->SetLogToConsole(bool(std::stoi(config.GetValue("log_to_console"))));
+	Game::logger->SetLogDebugStatements(config.GetValue("log_debug_statements") == "1");
+
 	//Connect to the MySQL Database
-	std::string mysql_host = Game::config->GetValue("mysql_host");
-	std::string mysql_database = Game::config->GetValue("mysql_database");
-	std::string mysql_username = Game::config->GetValue("mysql_username");
-	std::string mysql_password = Game::config->GetValue("mysql_password");
+	std::string mysql_host = config.GetValue("mysql_host");
+	std::string mysql_database = config.GetValue("mysql_database");
+	std::string mysql_username = config.GetValue("mysql_username");
+	std::string mysql_password = config.GetValue("mysql_password");
 
 	try {
 		Database::Connect(mysql_host, mysql_database, mysql_username, mysql_password);
@@ -62,7 +60,7 @@ int main(int argc, char** argv) {
 		Database::Destroy("AuthServer");
 		delete Game::server;
 		delete Game::logger;
-		return EXIT_FAILURE;
+		return 0;
 	}
 
 	//Find out the master's IP:
@@ -81,10 +79,10 @@ int main(int argc, char** argv) {
 	//It's safe to pass 'localhost' here, as the IP is only used as the external IP.
 	int maxClients = 50;
 	int ourPort = 1001; //LU client is hardcoded to use this for auth port, so I'm making it the default.
-	if (Game::config->GetValue("max_clients") != "") maxClients = std::stoi(Game::config->GetValue("max_clients"));
-	if (Game::config->GetValue("port") != "") ourPort = std::atoi(Game::config->GetValue("port").c_str());
+	if (config.GetValue("max_clients") != "") maxClients = std::stoi(config.GetValue("max_clients"));
+	if (config.GetValue("port") != "") ourPort = std::atoi(config.GetValue("port").c_str());
 
-	Game::server = new dServer(Game::config->GetValue("external_ip"), ourPort, 0, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::Auth, Game::config, &Game::shouldShutdown);
+	Game::server = new dServer(config.GetValue("external_ip"), ourPort, 0, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::Auth);
 
 	//Run it until server gets a kill message from Master:
 	auto t = std::chrono::high_resolution_clock::now();
@@ -93,7 +91,7 @@ int main(int argc, char** argv) {
 	int framesSinceMasterDisconnect = 0;
 	int framesSinceLastSQLPing = 0;
 
-	while (!Game::shouldShutdown) {
+	while (true) {
 		//Check if we're still connected to master:
 		if (!Game::server->GetIsConnectedToMaster()) {
 			framesSinceMasterDisconnect++;
@@ -146,13 +144,13 @@ int main(int argc, char** argv) {
 	Database::Destroy("AuthServer");
 	delete Game::server;
 	delete Game::logger;
-	delete Game::config;
 
+	exit(EXIT_SUCCESS);
 	return EXIT_SUCCESS;
 }
 
 dLogger* SetupLogger() {
-	std::string logPath = (BinaryPathFinder::GetBinaryDir() / ("logs/AuthServer_" + std::to_string(time(nullptr)) + ".log")).string();
+	std::string logPath = "./logs/AuthServer_" + std::to_string(time(nullptr)) + ".log";
 	bool logToConsole = false;
 	bool logDebugStatements = false;
 #ifdef _DEBUG

dAuthServer/CMakeLists.txt

@@ -1,2 +1,4 @@
-add_executable(AuthServer "AuthServer.cpp")
+set(DAUTHSERVER_SOURCES "AuthServer.cpp")
+
+add_executable(AuthServer ${DAUTHSERVER_SOURCES})
 target_link_libraries(AuthServer ${COMMON_LIBRARIES})

dChatServer/CMakeLists.txt

@@ -1,10 +1,6 @@
-set(DCHATSERVER_SOURCES
-	"ChatPacketHandler.cpp"
-	"PlayerContainer.cpp"
-)
-
-add_executable(ChatServer "ChatServer.cpp")
-add_library(dChatServer ${DCHATSERVER_SOURCES})
-
-target_link_libraries(dChatServer ${COMMON_LIBRARIES} dChatFilter)
-target_link_libraries(ChatServer ${COMMON_LIBRARIES} dChatFilter dChatServer)
+set(DCHATSERVER_SOURCES "ChatPacketHandler.cpp"
+	"ChatServer.cpp"
+	"PlayerContainer.cpp")
+	
+add_executable(ChatServer ${DCHATSERVER_SOURCES})
+target_link_libraries(ChatServer ${COMMON_LIBRARIES} dChatFilter)

dChatServer/ChatPacketHandler.cpp

@@ -33,10 +33,9 @@ void ChatPacketHandler::HandleFriendlistRequest(Packet* packet) {
 		"WHEN friend_id = ? THEN player_id "
 		"END AS requested_player, best_friend FROM friends) AS fr "
 		"JOIN charinfo AS ci ON ci.id = fr.requested_player "
-		"WHERE fr.requested_player IS NOT NULL AND fr.requested_player != ?;"));
+		"WHERE fr.requested_player IS NOT NULL;"));
 	stmt->setUInt(1, static_cast<uint32_t>(playerID));
 	stmt->setUInt(2, static_cast<uint32_t>(playerID));
-	stmt->setUInt(3, static_cast<uint32_t>(playerID));
 
 	std::vector<FriendData> friends;
 
@@ -114,10 +113,6 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
 	inStream.Read(isBestFriendRequest);
 
 	auto requestor = playerContainer.GetPlayerData(requestorPlayerID);
-	if (requestor->playerName == playerName) {
-		SendFriendResponse(requestor, requestor, AddFriendResponseType::MYTHRAN);
-		return;
-	};
 	std::unique_ptr<PlayerData> requestee(playerContainer.GetPlayerData(playerName));
 
 	// Check if player is online first
@@ -394,7 +389,7 @@ void ChatPacketHandler::HandleChatMessage(Packet* packet) {
 	uint8_t channel = 0;
 	inStream.Read(channel);
 
-	std::string message = PacketUtils::ReadString(0x66, packet, true, 512);
+	std::string message = PacketUtils::ReadString(0x66, packet, true);
 
 	Game::logger->Log("ChatPacketHandler", "Got a message from (%s) [%d]: %s", senderName.c_str(), channel, message.c_str());
 
@@ -436,7 +431,7 @@ void ChatPacketHandler::HandleChatMessage(Packet* packet) {
 void ChatPacketHandler::HandlePrivateChatMessage(Packet* packet) {
 	LWOOBJID senderID = PacketUtils::ReadPacketS64(0x08, packet);
 	std::string receiverName = PacketUtils::ReadString(0x66, packet, true);
-	std::string message = PacketUtils::ReadString(0xAA, packet, true, 512);
+	std::string message = PacketUtils::ReadString(0xAA, packet, true);
 
 	//Get the bois:
 	auto goonA = playerContainer.GetPlayerData(senderID);

dChatServer/ChatServer.cpp

@@ -12,20 +12,16 @@
 #include "dMessageIdentifiers.h"
 #include "dChatFilter.h"
 #include "Diagnostics.h"
-#include "AssetManager.h"
-#include "BinaryPathFinder.h"
 
 #include "PlayerContainer.h"
 #include "ChatPacketHandler.h"
 
 #include "Game.h"
 namespace Game {
-	dLogger* logger = nullptr;
-	dServer* server = nullptr;
-	dConfig* config = nullptr;
-	dChatFilter* chatFilter = nullptr;
-	AssetManager* assetManager = nullptr;
-	bool shouldShutdown = false;
+	dLogger* logger;
+	dServer* server;
+	dConfig* config;
+	dChatFilter* chatFilter;
 }
 
 //RakNet includes:
@@ -43,37 +39,22 @@ int main(int argc, char** argv) {
 
 	//Create all the objects we need to run our service:
 	Game::logger = SetupLogger();
-	if (!Game::logger) return EXIT_FAILURE;
-
-	//Read our config:
-	Game::config = new dConfig((BinaryPathFinder::GetBinaryDir() / "chatconfig.ini").string());
-	Game::logger->SetLogToConsole(Game::config->GetValue("log_to_console") != "0");
-	Game::logger->SetLogDebugStatements(Game::config->GetValue("log_debug_statements") == "1");
-
+	if (!Game::logger) return 0;
 	Game::logger->Log("ChatServer", "Starting Chat server...");
 	Game::logger->Log("ChatServer", "Version: %i.%i", PROJECT_VERSION_MAJOR, PROJECT_VERSION_MINOR);
 	Game::logger->Log("ChatServer", "Compiled on: %s", __TIMESTAMP__);
 
-	try {
-		std::string clientPathStr = Game::config->GetValue("client_location");
-		if (clientPathStr.empty()) clientPathStr = "./res";
-		std::filesystem::path clientPath = std::filesystem::path(clientPathStr);
-		if (clientPath.is_relative()) {
-			clientPath = BinaryPathFinder::GetBinaryDir() / clientPath;
-		}
-
-		Game::assetManager = new AssetManager(clientPath);
-	} catch (std::runtime_error& ex) {
-		Game::logger->Log("ChatServer", "Got an error while setting up assets: %s", ex.what());
-
-		return EXIT_FAILURE;
-	}
+	//Read our config:
+	dConfig config("chatconfig.ini");
+	Game::config = &config;
+	Game::logger->SetLogToConsole(bool(std::stoi(config.GetValue("log_to_console"))));
+	Game::logger->SetLogDebugStatements(config.GetValue("log_debug_statements") == "1");
 
 	//Connect to the MySQL Database
-	std::string mysql_host = Game::config->GetValue("mysql_host");
-	std::string mysql_database = Game::config->GetValue("mysql_database");
-	std::string mysql_username = Game::config->GetValue("mysql_username");
-	std::string mysql_password = Game::config->GetValue("mysql_password");
+	std::string mysql_host = config.GetValue("mysql_host");
+	std::string mysql_database = config.GetValue("mysql_database");
+	std::string mysql_username = config.GetValue("mysql_username");
+	std::string mysql_password = config.GetValue("mysql_password");
 
 	try {
 		Database::Connect(mysql_host, mysql_database, mysql_username, mysql_password);
@@ -82,7 +63,7 @@ int main(int argc, char** argv) {
 		Database::Destroy("ChatServer");
 		delete Game::server;
 		delete Game::logger;
-		return EXIT_FAILURE;
+		return 0;
 	}
 
 	//Find out the master's IP:
@@ -101,12 +82,12 @@ int main(int argc, char** argv) {
 	//It's safe to pass 'localhost' here, as the IP is only used as the external IP.
 	int maxClients = 50;
 	int ourPort = 1501;
-	if (Game::config->GetValue("max_clients") != "") maxClients = std::stoi(Game::config->GetValue("max_clients"));
-	if (Game::config->GetValue("port") != "") ourPort = std::atoi(Game::config->GetValue("port").c_str());
+	if (config.GetValue("max_clients") != "") maxClients = std::stoi(config.GetValue("max_clients"));
+	if (config.GetValue("port") != "") ourPort = std::atoi(config.GetValue("port").c_str());
 
-	Game::server = new dServer(Game::config->GetValue("external_ip"), ourPort, 0, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::Chat, Game::config, &Game::shouldShutdown);
+	Game::server = new dServer(config.GetValue("external_ip"), ourPort, 0, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::Chat);
 
-	Game::chatFilter = new dChatFilter(Game::assetManager->GetResPath().string() + "/chatplus_en_us", bool(std::stoi(Game::config->GetValue("dont_generate_dcf"))));
+	Game::chatFilter = new dChatFilter("./res/chatplus_en_us", bool(std::stoi(config.GetValue("dont_generate_dcf"))));
 
 	//Run it until server gets a kill message from Master:
 	auto t = std::chrono::high_resolution_clock::now();
@@ -115,7 +96,7 @@ int main(int argc, char** argv) {
 	int framesSinceMasterDisconnect = 0;
 	int framesSinceLastSQLPing = 0;
 
-	while (!Game::shouldShutdown) {
+	while (true) {
 		//Check if we're still connected to master:
 		if (!Game::server->GetIsConnectedToMaster()) {
 			framesSinceMasterDisconnect++;
@@ -168,13 +149,13 @@ int main(int argc, char** argv) {
 	Database::Destroy("ChatServer");
 	delete Game::server;
 	delete Game::logger;
-	delete Game::config;
 
+	exit(EXIT_SUCCESS);
 	return EXIT_SUCCESS;
 }
 
 dLogger* SetupLogger() {
-	std::string logPath = (BinaryPathFinder::GetBinaryDir() / ("logs/ChatServer_" + std::to_string(time(nullptr)) + ".log")).string();
+	std::string logPath = "./logs/ChatServer_" + std::to_string(time(nullptr)) + ".log";
 	bool logToConsole = false;
 	bool logDebugStatements = false;
 #ifdef _DEBUG

dCommon/AMFFormat.cpp

@@ -58,6 +58,16 @@ void AMFArrayValue::RemoveValue(const std::string& key) {
 	}
 }
 
+// AMFArray Find Value
+AMFValue* AMFArrayValue::FindValue(const std::string& key) {
+	_AMFArrayMap_::iterator it = this->associative.find(key);
+	if (it != this->associative.end()) {
+		return it->second;
+	}
+
+	return nullptr;
+}
+
 // AMFArray Get Associative Iterator Begin
 _AMFArrayMap_::iterator AMFArrayValue::GetAssociativeIteratorValueBegin() {
 	return this->associative.begin();
@@ -83,6 +93,11 @@ uint32_t AMFArrayValue::GetDenseValueSize() {
 	return (uint32_t)this->dense.size();
 }
 
+// AMFArray Get value at index in Dense List
+AMFValue* AMFArrayValue::GetValueAt(uint32_t index) {
+	return this->dense.at(index);
+}
+
 // AMFArray Get Dense Iterator Begin
 _AMFArrayList_::iterator AMFArrayValue::GetDenseIteratorBegin() {
 	return this->dense.begin();

dCommon/AMFFormat.h

@@ -75,9 +75,7 @@ private:
 	/*!
 	  \return The AMF value type
 	 */
-	AMFValueType GetValueType() { return ValueType; }
-public:
-	static const AMFValueType ValueType = AMFUndefined;
+	AMFValueType GetValueType() { return AMFUndefined; }
 };
 
 //! The null value AMF type
@@ -87,9 +85,7 @@ private:
 	/*!
 	 \return The AMF value type
 	 */
-	AMFValueType GetValueType() { return ValueType; }
-public:
-	static const AMFValueType ValueType = AMFNull;
+	AMFValueType GetValueType() { return AMFNull; }
 };
 
 //! The false value AMF type
@@ -99,9 +95,7 @@ private:
 	/*!
 	 \return The AMF value type
 	 */
-	AMFValueType GetValueType() { return ValueType; }
-public:
-	static const AMFValueType ValueType = AMFFalse;
+	AMFValueType GetValueType() { return AMFFalse; }
 };
 
 //! The true value AMF type
@@ -111,9 +105,7 @@ private:
 	/*!
 	 \return The AMF value type
 	 */
-	AMFValueType GetValueType() { return ValueType; }
-public:
-	static const AMFValueType ValueType = AMFTrue;
+	AMFValueType GetValueType() { return AMFTrue; }
 };
 
 //! The integer value AMF type
@@ -125,10 +117,9 @@ private:
 	/*!
 	 \return The AMF value type
 	 */
-	AMFValueType GetValueType() { return ValueType; }
+	AMFValueType GetValueType() { return AMFInteger; }
 
 public:
-	static const AMFValueType ValueType = AMFInteger;
 	//! Sets the integer value
 	/*!
 	  \param value The value to set
@@ -151,10 +142,9 @@ private:
 	/*!
 	 \return The AMF value type
 	 */
-	AMFValueType GetValueType() { return ValueType; }
+	AMFValueType GetValueType() { return AMFDouble; }
 
 public:
-	static const AMFValueType ValueType = AMFDouble;
 	//! Sets the double value
 	/*!
 	  \param value The value to set to
@@ -177,10 +167,9 @@ private:
 	/*!
 	 \return The AMF value type
 	 */
-	AMFValueType GetValueType() { return ValueType; }
+	AMFValueType GetValueType() { return AMFString; }
 
 public:
-	static const AMFValueType ValueType = AMFString;
 	//! Sets the string value
 	/*!
 	  \param value The string value to set to
@@ -203,10 +192,9 @@ private:
 	/*!
 	 \return The AMF value type
 	 */
-	AMFValueType GetValueType() { return ValueType; }
+	AMFValueType GetValueType() { return AMFXMLDoc; }
 
 public:
-	static const AMFValueType ValueType = AMFXMLDoc;
 	//! Sets the XML Doc value
 	/*!
 	  \param value The value to set to
@@ -229,10 +217,9 @@ private:
 	/*!
 	 \return The AMF value type
 	 */
-	AMFValueType GetValueType() { return ValueType; }
+	AMFValueType GetValueType() { return AMFDate; }
 
 public:
-	static const AMFValueType ValueType = AMFDate;
 	//! Sets the date time
 	/*!
 	  \param value The value to set to
@@ -257,11 +244,9 @@ private:
 	/*!
 	 \return The AMF value type
 	 */
-	AMFValueType GetValueType() { return ValueType; }
+	AMFValueType GetValueType() { return AMFArray; }
 
 public:
-	static const AMFValueType ValueType = AMFArray;
-
 	~AMFArrayValue() override;
 	//! Inserts an item into the array map for a specific key
 	/*!
@@ -280,15 +265,7 @@ public:
 	/*!
 	  \return The AMF value if found, nullptr otherwise
 	 */
-	template <typename T>
-	T* FindValue(const std::string& key) const {
-		_AMFArrayMap_::const_iterator it = this->associative.find(key);
-		if (it != this->associative.end() && T::ValueType == it->second->GetValueType()) {
-			return dynamic_cast<T*>(it->second);
-		}
-
-		return nullptr;
-	};
+	AMFValue* FindValue(const std::string& key);
 
 	//! Returns where the associative iterator begins
 	/*!
@@ -321,12 +298,7 @@ public:
 	/*!
 	  \param index The index to get
 	 */
-	template <typename T>
-	T* GetValueAt(uint32_t index) {
-		if (index >= this->dense.size()) return nullptr;
-		AMFValue* foundValue = this->dense.at(index);
-		return T::ValueType == foundValue->GetValueType() ? dynamic_cast<T*>(foundValue) : nullptr;
-	};
+	AMFValue* GetValueAt(uint32_t index);
 
 	//! Returns where the dense iterator begins
 	/*!
@@ -362,11 +334,10 @@ private:
 	/*!
 	 \return The AMF value type
 	 */
-	AMFValueType GetValueType() { return ValueType; }
+	AMFValueType GetValueType() { return AMFObject; }
 	~AMFObjectValue() override;
 
 public:
-	static const AMFValueType ValueType = AMFObject;
 	//! Constructor
 	/*!
 	  \param traits The traits to set

dCommon/BinaryIO.cpp

@@ -10,7 +10,7 @@ void BinaryIO::WriteString(const std::string& stringToWrite, std::ofstream& outs
 }
 
 //For reading null-terminated strings
-std::string BinaryIO::ReadString(std::istream& instream) {
+std::string BinaryIO::ReadString(std::ifstream& instream) {
 	std::string toReturn;
 	char buffer;
 
@@ -25,7 +25,7 @@ std::string BinaryIO::ReadString(std::istream& instream) {
 }
 
 //For reading strings of a specific size
-std::string BinaryIO::ReadString(std::istream& instream, size_t size) {
+std::string BinaryIO::ReadString(std::ifstream& instream, size_t size) {
 	std::string toReturn;
 	char buffer;
 
@@ -37,7 +37,7 @@ std::string BinaryIO::ReadString(std::istream& instream, size_t size) {
 	return toReturn;
 }
 
-std::string BinaryIO::ReadWString(std::istream& instream) {
+std::string BinaryIO::ReadWString(std::ifstream& instream) {
 	size_t size;
 	BinaryRead(instream, size);
 	//toReturn.resize(size);

dCommon/BinaryIO.h

@@ -10,15 +10,16 @@ namespace BinaryIO {
 
 	template<typename T>
 	std::istream& BinaryRead(std::istream& stream, T& value) {
-		if (!stream.good()) throw std::runtime_error("Failed to read from istream.");
+		if (!stream.good())
+			printf("bla");
 
 		return stream.read(reinterpret_cast<char*>(&value), sizeof(T));
 	}
 
 	void WriteString(const std::string& stringToWrite, std::ofstream& outstream);
-	std::string ReadString(std::istream& instream);
-	std::string ReadString(std::istream& instream, size_t size);
-	std::string ReadWString(std::istream& instream);
+	std::string ReadString(std::ifstream& instream);
+	std::string ReadString(std::ifstream& instream, size_t size);
+	std::string ReadWString(std::ifstream& instream);
 
 	inline bool DoesFileExist(const std::string& name) {
 		std::ifstream f(name.c_str());

dCommon/BinaryPathFinder.cpp

@@ -1,71 +0,0 @@
-#include <filesystem>
-#include <string>
-#include "BinaryPathFinder.h"
-#include "dPlatforms.h"
-
-#if defined(DARKFLAME_PLATFORM_WIN32)
-#include <Windows.h>
-#elif defined(DARKFLAME_PLATFORM_MACOS) || defined(DARKFLAME_PLATFORM_IOS)
-#include <mach-o/dyld.h>
-#elif defined(DARKFLAME_PLATFORM_FREEBSD)
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <stdlib.h>
-#endif
-
-std::filesystem::path BinaryPathFinder::binaryDir;
-
-std::filesystem::path BinaryPathFinder::GetBinaryDir() {
-	if (!binaryDir.empty()) {
-		return binaryDir;
-	}
-
-	std::string pathStr;
-
-	// Derived from boost::dll::program_location, licensed under the Boost Software License: http://www.boost.org/LICENSE_1_0.txt
-#if defined(DARKFLAME_PLATFORM_WIN32)
-	char path[MAX_PATH];
-	GetModuleFileName(NULL, path, MAX_PATH);
-	pathStr = std::string(path);
-#elif defined(DARKFLAME_PLATFORM_MACOS) || defined(DARKFLAME_PLATFORM_IOS)
-	char path[1024];
-	uint32_t size = sizeof(path);
-	if (_NSGetExecutablePath(path, &size) == 0) {
-		pathStr = std::string(path);
-	} else {
-		// The filepath size is greater than our initial buffer size, so try again with the size
-		// that _NSGetExecutablePath told us it actually is
-		char *p = new char[size];
-		if (_NSGetExecutablePath(p, &size) != 0) {
-			throw std::runtime_error("Failed to get binary path from _NSGetExecutablePath");
-		}
-
-		pathStr = std::string(p);
-		delete[] p;
-	}
-#elif defined(DARKFLAME_PLATFORM_FREEBSD)
-	int mib[4];
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_PROC;
-	mib[2] = KERN_PROC_PATHNAME;
-	mib[3] = -1;
-	char buf[10240];
-	size_t cb = sizeof(buf);
-	sysctl(mib, 4, buf, &cb, NULL, 0);
-	pathStr = std::string(buf);
-#else // DARKFLAME_PLATFORM_LINUX || DARKFLAME_PLATFORM_UNIX || DARKFLAME_PLATFORM_ANDROID
-	pathStr = std::filesystem::read_symlink("/proc/self/exe");
-#endif
-
-	// Some methods like _NSGetExecutablePath could return a symlink
-	// Either way, we need to get the parent path because we want the directory, not the binary itself
-	// We also ensure that it is an absolute path so that it is valid if we need to construct a path
-	// to exucute on unix systems (eg sudo BinaryPathFinder::GetBinaryDir() / WorldServer)
-	if (std::filesystem::is_symlink(pathStr)) {
-		binaryDir = std::filesystem::absolute(std::filesystem::read_symlink(pathStr).parent_path());
-	} else {
-		binaryDir = std::filesystem::absolute(std::filesystem::path(pathStr).parent_path());
-	}
-
-	return binaryDir;
-}

dCommon/BinaryPathFinder.h

@@ -1,15 +0,0 @@
-#pragma once
-
-#ifndef __BINARYPATHFINDER__H__
-#define __BINARYPATHFINDER__H__
-
-#include <filesystem>
-
-class BinaryPathFinder {
-private:
-	static std::filesystem::path binaryDir;
-public:
-	static std::filesystem::path GetBinaryDir();
-};
-
-#endif  //!__BINARYPATHFINDER__H__

dCommon/BrickByBrickFix.cpp

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

dCommon/BrickByBrickFix.h

@@ -1,20 +0,0 @@
-#pragma once
-
-#include <cstdint>
-
-namespace BrickByBrickFix {
-	/**
-	 * @brief Deletes all broken BrickByBrick models that have invalid XML
-	 *
-	 * @return The number of BrickByBrick models that were truncated
-	 */
-	uint32_t TruncateBrokenBrickByBrickXml();
-
-	/**
-	 * @brief Updates all BrickByBrick models in the database to be
-	 * in the sd0 format as opposed to a zlib compressed format.
-	 *
-	 * @return The number of BrickByBrick models that were updated
-	 */
-	uint32_t UpdateBrickByBrickModelsToSd0();
-};

dCommon/CMakeLists.txt

@@ -13,51 +13,15 @@ set(DCOMMON_SOURCES "AMFFormat.cpp"
 		"NiQuaternion.cpp"
 		"SHA512.cpp"
 		"Type.cpp"
-		"ZCompression.cpp"
-		"BrickByBrickFix.cpp"
-		"BinaryPathFinder.cpp"
-		"FdbToSqlite.cpp"
-)
-
-add_subdirectory(dClient)
-
-foreach(file ${DCOMMON_DCLIENT_SOURCES})
-	set(DCOMMON_SOURCES ${DCOMMON_SOURCES} "dClient/${file}")
-endforeach()
+		"ZCompression.cpp")
 
 include_directories(${PROJECT_SOURCE_DIR}/dCommon/)
 
 add_library(dCommon STATIC ${DCOMMON_SOURCES})
 
-target_link_libraries(dCommon bcrypt dDatabase tinyxml2)
+target_link_libraries(dCommon bcrypt)
 
 if (UNIX)
 	find_package(ZLIB REQUIRED)
-elseif (WIN32)
-	include(FetchContent)
-
-	# TODO Keep an eye on the zlib repository for an update to disable testing.  Don't forget to update CMakePresets
-	FetchContent_Declare(
-		zlib
-		URL https://github.com/madler/zlib/archive/refs/tags/v1.2.11.zip
-		URL_HASH MD5=9d6a627693163bbbf3f26403a3a0b0b1
-	)
-
-	# Disable warning about no project version.
-	set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
-	# Disable warning about the minimum version of cmake used for bcrypt being deprecated in the future
-	set(CMAKE_WARN_DEPRECATED OFF CACHE BOOL "" FORCE)
-
-	FetchContent_MakeAvailable(zlib)
-
-	set(ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR} ${zlib_BINARY_DIR})
-	set_target_properties(zlib PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}")
-	add_library(ZLIB::ZLIB ALIAS zlib)
-else ()
-	message(
-		FATAL_ERROR
-		"This platform does not have a way to use zlib.\nCreate an issue on GitHub with your build system so it can be configured."
-	)
-endif ()
-
-target_link_libraries(dCommon ZLIB::ZLIB)
+	target_link_libraries(dCommon ZLIB::ZLIB)
+endif()

dCommon/Diagnostics.cpp

@@ -1,6 +1,4 @@
 #include "Diagnostics.h"
-#include "Game.h"
-#include "dLogger.h"
 
 // If we're on Win32, we'll include our minidump writer
 #ifdef _WIN32
@@ -28,7 +26,7 @@ void make_minidump(EXCEPTION_POINTERS* e) {
 			"_%4d%02d%02d_%02d%02d%02d.dmp",
 			t.wYear, t.wMonth, t.wDay, t.wHour, t.wMinute, t.wSecond);
 	}
-	Game::logger->Log("Diagnostics", "Creating crash dump %s", name);
+
 	auto hFile = CreateFileA(name, GENERIC_WRITE, FILE_SHARE_READ, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
 	if (hFile == INVALID_HANDLE_VALUE)
 		return;
@@ -83,7 +81,6 @@ struct bt_ctx {
 
 static inline void Bt(struct backtrace_state* state) {
 	std::string fileName = Diagnostics::GetOutDirectory() + "crash_" + Diagnostics::GetProcessName() + "_" + std::to_string(getpid()) + ".log";
-	Game::logger->Log("Diagnostics", "backtrace is enabled, crash dump located at %s", fileName.c_str());
 	FILE* file = fopen(fileName.c_str(), "w+");
 	if (file != nullptr) {
 		backtrace_print(state, 2, file);
@@ -117,8 +114,6 @@ void GenerateDump() {
 void CatchUnhandled(int sig) {
 #ifndef __include_backtrace__
 
-	std::string fileName = Diagnostics::GetOutDirectory() + "crash_" + Diagnostics::GetProcessName() + "_" + std::to_string(getpid()) + ".log";
-	Game::logger->Log("Diagnostics", "Encountered signal %i, creating crash dump %s", sig, fileName.c_str());
 	if (Diagnostics::GetProduceMemoryDump()) {
 		GenerateDump();
 	}
@@ -129,6 +124,7 @@ void CatchUnhandled(int sig) {
 	// get void*'s for all entries on the stack
 	size = backtrace(array, 10);
 
+	printf("Fatal error %i\nStacktrace:\n", sig);
 #if defined(__GNUG__) and defined(__dynamic)
 
 	// Loop through the returned addresses, and get the symbols to be demangled
@@ -146,18 +142,19 @@ void CatchUnhandled(int sig) {
 			demangled = demangle(functionName.c_str());
 
 			if (demangled.empty()) {
-				Game::logger->Log("Diagnostics", "[%02zu] %s", i, demangled.c_str());
+				printf("[%02zu] %s\n", i, demangled.c_str());
 			} else {
-				Game::logger->Log("Diagnostics", "[%02zu] %s", i, functionName.c_str());
+				printf("[%02zu] %s\n", i, functionName.c_str());
 			}
 		} else {
-			Game::logger->Log("Diagnostics", "[%02zu] %s", i, functionName.c_str());
+			printf("[%02zu] %s\n", i, functionName.c_str());
 		}
 	}
 #else
 	backtrace_symbols_fd(array, size, STDOUT_FILENO);
 #endif
 
+	std::string fileName = Diagnostics::GetOutDirectory() + "crash_" + Diagnostics::GetProcessName() + "_" + std::to_string(getpid()) + ".log";
 	FILE* file = fopen(fileName.c_str(), "w+");
 	if (file != NULL) {
 		// print out all the frames to stderr

dCommon/FdbToSqlite.cpp

@@ -1,248 +0,0 @@
-#include "FdbToSqlite.h"
-
-#include <map>
-#include <fstream>
-#include <cassert>
-#include <iomanip>
-
-#include "BinaryIO.h"
-#include "CDClientDatabase.h"
-#include "GeneralUtils.h"
-#include "Game.h"
-#include "dLogger.h"
-
-#include "eSqliteDataType.h"
-
-std::map<eSqliteDataType, std::string> FdbToSqlite::Convert::sqliteType = {
-			{ eSqliteDataType::NONE, "none"},
-			{ eSqliteDataType::INT32, "int32"},
-			{ eSqliteDataType::REAL, "real"},
-			{ eSqliteDataType::TEXT_4, "text_4"},
-			{ eSqliteDataType::INT_BOOL, "int_bool"},
-			{ eSqliteDataType::INT64, "int64"},
-			{ eSqliteDataType::TEXT_8, "text_8"}
-};
-
-FdbToSqlite::Convert::Convert(std::string basePath) {
-	this->basePath = basePath;
-}
-
-bool FdbToSqlite::Convert::ConvertDatabase() {
-	fdb.open(basePath + "/cdclient.fdb", std::ios::binary);
-
-	try {
-		CDClientDatabase::Connect(basePath + "/CDServer.sqlite");
-
-		CDClientDatabase::ExecuteQuery("BEGIN TRANSACTION;");
-
-		int32_t numberOfTables = ReadInt32();
-		ReadTables(numberOfTables);
-
-		CDClientDatabase::ExecuteQuery("COMMIT;");
-	} catch (CppSQLite3Exception& e) {
-		Game::logger->Log("FdbToSqlite", "Encountered error %s converting FDB to SQLite", e.errorMessage());
-		return false;
-	}
-
-	fdb.close();
-	return true;
-}
-
-int32_t FdbToSqlite::Convert::ReadInt32() {
-	int32_t nextInt{};
-	BinaryIO::BinaryRead(fdb, nextInt);
-	return nextInt;
-}
-
-int64_t FdbToSqlite::Convert::ReadInt64() {
-	int32_t prevPosition = SeekPointer();
-
-	int64_t value{};
-	BinaryIO::BinaryRead(fdb, value);
-
-	fdb.seekg(prevPosition);
-	return value;
-}
-
-std::string FdbToSqlite::Convert::ReadString() {
-	int32_t prevPosition = SeekPointer();
-
-	auto readString = BinaryIO::ReadString(fdb);
-
-	fdb.seekg(prevPosition);
-	return readString;
-}
-
-int32_t FdbToSqlite::Convert::SeekPointer() {
-	int32_t position{};
-	BinaryIO::BinaryRead(fdb, position);
-	int32_t prevPosition = fdb.tellg();
-	fdb.seekg(position);
-	return prevPosition;
-}
-
-std::string FdbToSqlite::Convert::ReadColumnHeader() {
-	int32_t prevPosition = SeekPointer();
-
-	int32_t numberOfColumns = ReadInt32();
-	std::string tableName = ReadString();
-
-	auto columns = ReadColumns(numberOfColumns);
-	std::string newTable = "CREATE TABLE IF NOT EXISTS '" + tableName + "' (" + columns + ");";
-	CDClientDatabase::ExecuteDML(newTable);
-
-	fdb.seekg(prevPosition);
-
-	return tableName;
-}
-
-void FdbToSqlite::Convert::ReadTables(int32_t& numberOfTables) {
-	int32_t prevPosition = SeekPointer();
-
-	for (int32_t i = 0; i < numberOfTables; i++) {
-		auto columnHeader = ReadColumnHeader();
-		ReadRowHeader(columnHeader);
-	}
-
-	fdb.seekg(prevPosition);
-}
-
-std::string FdbToSqlite::Convert::ReadColumns(int32_t& numberOfColumns) {
-	std::stringstream columnsToCreate;
-	int32_t prevPosition = SeekPointer();
-
-	std::string name{};
-	eSqliteDataType dataType{};
-	for (int32_t i = 0; i < numberOfColumns; i++) {
-		if (i != 0) columnsToCreate << ", ";
-		dataType = static_cast<eSqliteDataType>(ReadInt32());
-		name = ReadString();
-		columnsToCreate << "'" << name << "' " << FdbToSqlite::Convert::sqliteType[dataType];
-	}
-
-	fdb.seekg(prevPosition);
-	return columnsToCreate.str();
-}
-
-void FdbToSqlite::Convert::ReadRowHeader(std::string& tableName) {
-	int32_t prevPosition = SeekPointer();
-
-	int32_t numberOfAllocatedRows = ReadInt32();
-	if (numberOfAllocatedRows != 0) assert((numberOfAllocatedRows & (numberOfAllocatedRows - 1)) == 0);  // assert power of 2 allocation size
-	ReadRows(numberOfAllocatedRows, tableName);
-
-	fdb.seekg(prevPosition);
-}
-
-void FdbToSqlite::Convert::ReadRows(int32_t& numberOfAllocatedRows, std::string& tableName) {
-	int32_t prevPosition = SeekPointer();
-
-	int32_t rowid = 0;
-	for (int32_t row = 0; row < numberOfAllocatedRows; row++) {
-		int32_t rowPointer = ReadInt32();
-		if (rowPointer == -1) rowid++;
-		else ReadRow(rowid, rowPointer, tableName);
-	}
-
-	fdb.seekg(prevPosition);
-}
-
-void FdbToSqlite::Convert::ReadRow(int32_t& rowid, int32_t& position, std::string& tableName) {
-	int32_t prevPosition = fdb.tellg();
-	fdb.seekg(position);
-
-	while (true) {
-		ReadRowInfo(tableName);
-		int32_t linked = ReadInt32();
-
-		rowid += 1;
-
-		if (linked == -1) break;
-
-		fdb.seekg(linked);
-	}
-
-	fdb.seekg(prevPosition);
-}
-
-void FdbToSqlite::Convert::ReadRowInfo(std::string& tableName) {
-	int32_t prevPosition = SeekPointer();
-
-	int32_t numberOfColumns = ReadInt32();
-	ReadRowValues(numberOfColumns, tableName);
-
-	fdb.seekg(prevPosition);
-}
-
-void FdbToSqlite::Convert::ReadRowValues(int32_t& numberOfColumns, std::string& tableName) {
-	int32_t prevPosition = SeekPointer();
-
-	int32_t emptyValue{};
-	int32_t intValue{};
-	float_t floatValue{};
-	std::string stringValue{};
-	int32_t boolValue{};
-	int64_t int64Value{};
-	bool insertedFirstEntry = false;
-	std::stringstream insertedRow;
-	insertedRow << "INSERT INTO " << tableName << " values (";
-
-	for (int32_t i = 0; i < numberOfColumns; i++) {
-		if (i != 0) insertedRow << ", "; // Only append comma and space after first entry in row.
-		switch (static_cast<eSqliteDataType>(ReadInt32())) {
-		case eSqliteDataType::NONE:
-			BinaryIO::BinaryRead(fdb, emptyValue);
-			assert(emptyValue == 0);
-			insertedRow << "NULL";
-			break;
-
-		case eSqliteDataType::INT32:
-			intValue = ReadInt32();
-			insertedRow << intValue;
-			break;
-
-		case eSqliteDataType::REAL:
-			BinaryIO::BinaryRead(fdb, floatValue);
-			insertedRow << std::fixed << std::setprecision(34) << floatValue; // maximum precision of floating point number
-			break;
-
-		case eSqliteDataType::TEXT_4:
-		case eSqliteDataType::TEXT_8: {
-			stringValue = ReadString();
-			size_t position = 0;
-
-			// Need to escape quote with a double of ".
-			while (position < stringValue.size()) {
-				if (stringValue.at(position) == '\"') {
-					stringValue.insert(position, "\"");
-					position++;
-				}
-				position++;
-			}
-			insertedRow << "\"" << stringValue << "\"";
-			break;
-		}
-
-		case eSqliteDataType::INT_BOOL:
-			BinaryIO::BinaryRead(fdb, boolValue);
-			insertedRow << static_cast<bool>(boolValue);
-			break;
-
-		case eSqliteDataType::INT64:
-			int64Value = ReadInt64();
-			insertedRow << std::to_string(int64Value);
-			break;
-
-		default:
-			throw std::invalid_argument("Unsupported SQLite type encountered.");
-			break;
-
-		}
-	}
-
-	insertedRow << ");";
-
-	auto copiedString = insertedRow.str();
-	CDClientDatabase::ExecuteDML(copiedString);
-	fdb.seekg(prevPosition);
-}

dCommon/FdbToSqlite.h

@@ -1,49 +0,0 @@
-#ifndef __FDBTOSQLITE__H__
-#define __FDBTOSQLITE__H__
-
-#pragma once
-
-#include <cstdint>
-#include <iosfwd>
-#include <map>
-
-enum class eSqliteDataType : int32_t;
-
-namespace FdbToSqlite {
-	class Convert {
-	public:
-		Convert(std::string inputFile);
-
-		bool ConvertDatabase();
-
-		int32_t ReadInt32();
-
-		int64_t ReadInt64();
-
-		std::string ReadString();
-
-		int32_t SeekPointer();
-
-		std::string ReadColumnHeader();
-
-		void ReadTables(int32_t& numberOfTables);
-
-		std::string ReadColumns(int32_t& numberOfColumns);
-
-		void ReadRowHeader(std::string& tableName);
-
-		void ReadRows(int32_t& numberOfAllocatedRows, std::string& tableName);
-
-		void ReadRow(int32_t& rowid, int32_t& position, std::string& tableName);
-
-		void ReadRowInfo(std::string& tableName);
-
-		void ReadRowValues(int32_t& numberOfColumns, std::string& tableName);
-	private:
-		static std::map<eSqliteDataType, std::string> sqliteType;
-		std::string basePath{};
-		std::ifstream fdb{};
-	}; // class FdbToSqlite
-}; //! namespace FdbToSqlite
-
-#endif  //!__FDBTOSQLITE__H__

dCommon/Game.h

@@ -5,21 +5,22 @@
 class dServer;
 class dLogger;
 class InstanceManager;
+class dpWorld;
 class dChatFilter;
 class dConfig;
+class dLocale;
 class RakPeerInterface;
-class AssetManager;
 struct SystemAddress;
 
 namespace Game {
 	extern dLogger* logger;
 	extern dServer* server;
 	extern InstanceManager* im;
+	extern dpWorld* physicsWorld;
 	extern dChatFilter* chatFilter;
 	extern dConfig* config;
+	extern dLocale* locale;
 	extern std::mt19937 randomEngine;
 	extern RakPeerInterface* chatServer;
-	extern AssetManager* assetManager;
 	extern SystemAddress chatSysAddr;
-	extern bool shouldShutdown;
 }

dCommon/GeneralUtils.cpp

@@ -4,8 +4,6 @@
 #include <cstdint>
 #include <cassert>
 #include <algorithm>
-#include <filesystem>
-#include <map>
 
 template <typename T>
 inline size_t MinSize(size_t size, const std::basic_string_view<T>& string) {
@@ -52,7 +50,6 @@ bool _IsSuffixChar(uint8_t c) {
 
 bool GeneralUtils::_NextUTF8Char(std::string_view& slice, uint32_t& out) {
 	size_t rem = slice.length();
-	if (slice.empty()) return false;
 	const uint8_t* bytes = (const uint8_t*)&slice.front();
 	if (rem > 0) {
 		uint8_t first = bytes[0];
@@ -292,30 +289,51 @@ std::u16string GeneralUtils::ReadWString(RakNet::BitStream* inStream) {
 	return string;
 }
 
-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 (auto& t : std::filesystem::directory_iterator(folder)) {
-        auto filename = t.path().filename().string();
-        auto index = std::stoi(GeneralUtils::SplitString(filename, '_').at(0));
-        filenames.insert(std::make_pair(index, filename));
-	}
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
 
-	// Now sort the map by the oldest migration.
-	std::vector<std::string> sortedFiles{};
-    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++;
+std::vector<std::string> GeneralUtils::GetFileNamesFromFolder(const std::string& folder) {
+	std::vector<std::string> names;
+	std::string search_path = folder + "/*.*";
+	WIN32_FIND_DATA fd;
+	HANDLE hFind = ::FindFirstFile(search_path.c_str(), &fd);
+	if (hFind != INVALID_HANDLE_VALUE) {
+		do {
+			if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
+				names.push_back(fd.cFileName);
+			}
+		} while (::FindNextFile(hFind, &fd));
+		::FindClose(hFind);
 	}
-
-	return sortedFiles;
+	return names;
 }
+#else
+#include <stdio.h>
+#include <dirent.h>
+#include <sys/types.h>
+#include <iostream>
+#include <vector>
+#include <cstring>
+
+std::vector<std::string> GeneralUtils::GetFileNamesFromFolder(const std::string& folder) {
+	std::vector<std::string> names;
+	struct dirent* entry;
+	DIR* dir = opendir(folder.c_str());
+	if (dir == NULL) {
+		return names;
+	}
+
+	while ((entry = readdir(dir)) != NULL) {
+		std::string value(entry->d_name, strlen(entry->d_name));
+		if (value == "." || value == "..") {
+			continue;
+		}
+		names.push_back(value);
+	}
+
+	closedir(dir);
+
+	return names;
+}
+#endif

dCommon/GeneralUtils.h

@@ -12,9 +12,6 @@
 #include <BitStream.h>
 
 #include "Game.h"
-#include "dLogger.h"
-
-enum eInventoryType : uint32_t;
 
 /*!
   \file GeneralUtils.hpp
@@ -141,7 +138,7 @@ namespace GeneralUtils {
 
 	std::vector<std::string> SplitString(const std::string& str, char delimiter);
 
-	std::vector<std::string> GetSqlFileNamesFromFolder(const std::string& folder);
+	std::vector<std::string> GetFileNamesFromFolder(const std::string& folder);
 
 	template <typename T>
 	T Parse(const char* value);
@@ -176,11 +173,6 @@ namespace GeneralUtils {
 		return std::stoull(value);
 	}
 
-	template <>
-	inline eInventoryType Parse(const char* value) {
-		return static_cast<eInventoryType>(std::stoul(value));
-	}
-
 	template <typename T>
 	bool TryParse(const char* value, T& dst) {
 		try {

dCommon/Metrics.cpp

@@ -14,6 +14,9 @@ std::vector<MetricVariable> Metrics::m_Variables = {
 	MetricVariable::CPUTime,
 	MetricVariable::Sleep,
 	MetricVariable::Frame,
+#ifdef BUILD_VISUAL_DEBUGGER
+	MetricVariable::VisualDebugger,
+#endif
 };
 
 void Metrics::AddMeasurement(MetricVariable variable, int64_t value) {
@@ -132,7 +135,10 @@ std::string Metrics::MetricVariableToString(MetricVariable variable) {
 		return "Frame";
 	case MetricVariable::Ghosting:
 		return "Ghosting";
-
+#ifdef BUILD_VISUAL_DEBUGGER
+	case MetricVariable::VisualDebugger:
+		return "VisualDebugger";
+#endif
 	default:
 		return "Invalid";
 	}

dCommon/Metrics.hpp

@@ -20,6 +20,9 @@ enum class MetricVariable : int32_t
 	CPUTime,
 	Sleep,
 	Frame,
+#ifdef BUILD_VISUAL_DEBUGGER
+	VisualDebugger
+#endif
 };
 
 struct Metric

dCommon/NiPoint3.cpp

@@ -80,13 +80,13 @@ float NiPoint3::SquaredLength(void) const {
 }
 
 //! Returns the dot product of the vector dotted with another vector
-float NiPoint3::DotProduct(const Vector3& vec) const {
+float NiPoint3::DotProduct(const NiPoint3& vec) const {
 	return ((this->x * vec.x) + (this->y * vec.y) + (this->z * vec.z));
 }
 
 //! Returns the cross product of the vector crossed with another vector
-Vector3 NiPoint3::CrossProduct(const Vector3& vec) const {
-	return Vector3(((this->y * vec.z) - (this->z * vec.y)),
+NiPoint3 NiPoint3::CrossProduct(const NiPoint3& vec) const {
+	return NiPoint3(((this->y * vec.z) - (this->z * vec.y)),
 		((this->z * vec.x) - (this->x * vec.z)),
 		((this->x * vec.y) - (this->y * vec.x)));
 }
@@ -171,7 +171,7 @@ bool NiPoint3::IsWithinAxisAlignedBox(const NiPoint3& minPoint, const NiPoint3&
 
 //! Checks to see if the point (or vector) is within a sphere
 bool NiPoint3::IsWithinSpehere(const NiPoint3& sphereCenter, float radius) {
-	Vector3 diffVec = Vector3(x - sphereCenter.GetX(), y - sphereCenter.GetY(), z - sphereCenter.GetZ());
+	NiPoint3 diffVec = NiPoint3(x - sphereCenter.GetX(), y - sphereCenter.GetY(), z - sphereCenter.GetZ());
 	return (diffVec.SquaredLength() <= (radius * radius));
 }
 
@@ -226,7 +226,7 @@ NiPoint3 NiPoint3::MoveTowards(const NiPoint3& current, const NiPoint3& target,
 
 //This code is yoinked from the MS XNA code, so it should be right, even if it's horrible.
 NiPoint3 NiPoint3::RotateByQuaternion(const NiQuaternion& rotation) {
-	Vector3 vector;
+	NiPoint3 vector;
 	float num12 = rotation.x + rotation.x;
 	float num2 = rotation.y + rotation.y;
 	float num = rotation.z + rotation.z;

dCommon/NiPoint3.h

@@ -7,7 +7,6 @@
 
 class NiPoint3;
 class NiQuaternion;
-typedef NiPoint3 Vector3;       //!< The Vector3 class is technically the NiPoint3 class, but typedef'd for clarity in some cases
 
 //! A custom class the defines a point in space
 class NiPoint3 {
@@ -102,14 +101,14 @@ public:
 	  \param vec The second vector
 	  \return The dot product of the two vectors
 	 */
-	float DotProduct(const Vector3& vec) const;
+	float DotProduct(const NiPoint3& vec) const;
 
 	//! Returns the cross product of the vector crossed with another vector
 	/*!
 	  \param vec The second vector
 	  \return The cross product of the two vectors
 	 */
-	Vector3 CrossProduct(const Vector3& vec) const;
+	NiPoint3 CrossProduct(const NiPoint3& vec) const;
 
 	//! Unitize the vector
 	/*!

dCommon/NiQuaternion.cpp

@@ -72,22 +72,22 @@ void NiQuaternion::SetZ(float z) {
 // MARK: Member Functions
 
 //! Returns the forward vector from the quaternion
-Vector3 NiQuaternion::GetForwardVector(void) const {
-	return Vector3(2 * (x * z + w * y), 2 * (y * z - w * x), 1 - 2 * (x * x + y * y));
+NiPoint3 NiQuaternion::GetForwardVector(void) const {
+	return NiPoint3(2 * (x * z + w * y), 2 * (y * z - w * x), 1 - 2 * (x * x + y * y));
 }
 
 //! Returns the up vector from the quaternion
-Vector3 NiQuaternion::GetUpVector(void) const {
-	return Vector3(2 * (x * y - w * z), 1 - 2 * (x * x + z * z), 2 * (y * z + w * x));
+NiPoint3 NiQuaternion::GetUpVector(void) const {
+	return NiPoint3(2 * (x * y - w * z), 1 - 2 * (x * x + z * z), 2 * (y * z + w * x));
 }
 
 //! Returns the right vector from the quaternion
-Vector3 NiQuaternion::GetRightVector(void) const {
-	return Vector3(1 - 2 * (y * y + z * z), 2 * (x * y + w * z), 2 * (x * z - w * y));
+NiPoint3 NiQuaternion::GetRightVector(void) const {
+	return NiPoint3(1 - 2 * (y * y + z * z), 2 * (x * y + w * z), 2 * (x * z - w * y));
 }
 
-Vector3 NiQuaternion::GetEulerAngles() const {
-	Vector3 angles;
+NiPoint3 NiQuaternion::GetEulerAngles() const {
+	NiPoint3 angles;
 
 	// roll (x-axis rotation)
 	const float sinr_cosp = 2 * (w * x + y * z);
@@ -164,7 +164,7 @@ NiQuaternion NiQuaternion::LookAtUnlocked(const NiPoint3& sourcePoint, const NiP
 }
 
 //! Creates a Quaternion from a specific axis and angle relative to that axis
-NiQuaternion NiQuaternion::CreateFromAxisAngle(const Vector3& axis, float angle) {
+NiQuaternion NiQuaternion::CreateFromAxisAngle(const NiPoint3& axis, float angle) {
 	float halfAngle = angle * 0.5f;
 	float s = static_cast<float>(sin(halfAngle));
 

dCommon/NiQuaternion.h

@@ -9,7 +9,6 @@
  */
 
 class NiQuaternion;
-typedef NiQuaternion Quaternion;        //!< A typedef for a shorthand version of NiQuaternion
 
 //! A class that defines a rotation in space
 class NiQuaternion {
@@ -95,21 +94,21 @@ public:
 	/*!
 	  \return The forward vector of the quaternion
 	 */
-	Vector3 GetForwardVector(void) const;
+	NiPoint3 GetForwardVector(void) const;
 
 	//! Returns the up vector from the quaternion
 	/*!
 	  \return The up vector fo the quaternion
 	 */
-	Vector3 GetUpVector(void) const;
+	NiPoint3 GetUpVector(void) const;
 
 	//! Returns the right vector from the quaternion
 	/*!
 	  \return The right vector of the quaternion
 	 */
-	Vector3 GetRightVector(void) const;
+	NiPoint3 GetRightVector(void) const;
 
-	Vector3 GetEulerAngles() const;
+	NiPoint3 GetEulerAngles() const;
 
 
 	// MARK: Operators
@@ -145,7 +144,7 @@ public:
 	  \param angle The angle relative to this axis
 	  \return A quaternion created from the axis and angle
 	 */
-	static NiQuaternion CreateFromAxisAngle(const Vector3& axis, float angle);
+	static NiQuaternion CreateFromAxisAngle(const NiPoint3& axis, float angle);
 
 	static NiQuaternion FromEulerAngles(const NiPoint3& eulerAngles);
 };

dCommon/ZCompression.cpp

@@ -1,5 +1,7 @@
 #include "ZCompression.h"
 
+#ifndef _WIN32
+
 #include <zlib.h>
 
 namespace ZCompression {
@@ -8,34 +10,6 @@ namespace ZCompression {
 		return (nLenSrc + 6 + (n16kBlocks * 5));
 	}
 
-	int32_t GZipCompress(const uint8_t* abSrc, int32_t nLenSrc, uint8_t* abDst, int32_t nLenDst) {
-		z_stream stream;
-		stream.next_in = (Bytef*)abSrc;
-		stream.avail_in = nLenSrc;
-		stream.next_out = (Bytef*)abDst;
-		stream.avail_out = nLenDst;
-		stream.zalloc = Z_NULL;
-		stream.zfree = Z_NULL;
-		stream.opaque = Z_NULL;
-
-		int32_t nErr, nRet = -1;
-		nErr = deflateInit2(&stream, Z_DEFAULT_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8, Z_DEFAULT_STRATEGY);
-		if (nErr == Z_OK) {
-			nErr = deflate(&stream, Z_FINISH);
-			if (nErr == Z_STREAM_END) {
-				nRet = stream.total_out;
-			} else {
-				deflateEnd(&stream);
-				return nErr;
-			}
-		} else {
-			return nErr;
-		}
-
-		nErr = deflateEnd(&stream);
-		return (nErr == Z_OK) ? nRet : nErr;
-	}
-
 	int32_t Compress(const uint8_t* abSrc, int32_t nLenSrc, uint8_t* abDst, int32_t nLenDst) {
 		z_stream zInfo = { 0 };
 		zInfo.total_in = zInfo.avail_in = nLenSrc;
@@ -53,6 +27,7 @@ namespace ZCompression {
 		}
 		deflateEnd(&zInfo);    // zlib function
 		return(nRet);
+
 	}
 
 	int32_t Decompress(const uint8_t* abSrc, int32_t nLenSrc, uint8_t* abDst, int32_t nLenDst, int32_t& nErr) {
@@ -73,6 +48,26 @@ namespace ZCompression {
 		}
 		inflateEnd(&zInfo); // zlib function
 		return(nRet);
+
+		/*
+		z_stream zInfo = { 0 };
+		zInfo.total_in = zInfo.avail_in = nLenSrc;
+		zInfo.total_out = zInfo.avail_out = nLenDst;
+		zInfo.next_in = const_cast<Bytef*>(abSrc);
+		zInfo.next_out = const_cast<Bytef*>(abDst);
+
+		int nRet = -1;
+		nErr = inflateInit(&zInfo);               // zlib function
+		if (nErr == Z_OK) {
+			nErr = inflate(&zInfo, Z_FINISH);     // zlib function
+			if (nErr == Z_STREAM_END) {
+				nRet = zInfo.total_out;
+			}
+		}
+		inflateEnd(&zInfo);   // zlib function
+		return(nRet); // -1 or len of output
+		*/
 	}
 }
 
+#endif

dCommon/ZCompression.h

@@ -2,18 +2,16 @@
 
 #include <cstdint>
 
+#include "dPlatforms.h"
+
+#ifndef DARKFLAME_PLATFORM_WIN32
+
 namespace ZCompression {
 	int32_t GetMaxCompressedLength(int32_t nLenSrc);
 
-	int32_t GZipCompress(const uint8_t* abSrc, int32_t nLenSrc, uint8_t* abDst, int32_t nLenDst);
 	int32_t Compress(const uint8_t* abSrc, int32_t nLenSrc, uint8_t* abDst, int32_t nLenDst);
 
 	int32_t Decompress(const uint8_t* abSrc, int32_t nLenSrc, uint8_t* abDst, int32_t nLenDst, int32_t& nErr);
-
-	/**
-	 * @brief Max size of an inflated sd0 zlib chunk
-	 *
-	 */
-	constexpr uint32_t MAX_SD0_CHUNK_SIZE = 1024 * 256;
 }
 
+#endif

dCommon/dClient/AssetManager.cpp

@@ -1,207 +0,0 @@
-#include <filesystem>
-
-#include "AssetManager.h"
-#include "Game.h"
-#include "dLogger.h"
-
-#include <zlib.h>
-
-AssetManager::AssetManager(const std::filesystem::path& path) {
-	if (!std::filesystem::is_directory(path)) {
-		throw std::runtime_error("Attempted to load asset bundle (" + path.string() + ") however it is not a valid directory.");
-	}
-
-	m_Path = path;
-
-	if (std::filesystem::exists(m_Path / "client") && std::filesystem::exists(m_Path / "versions")) {
-		m_AssetBundleType = eAssetBundleType::Packed;
-
-		m_RootPath = m_Path;
-		m_ResPath = (m_Path / "client" / "res");
-	} else if (std::filesystem::exists(m_Path / ".." / "versions") && std::filesystem::exists(m_Path / "res")) {
-		m_AssetBundleType = eAssetBundleType::Packed;
-
-		m_RootPath = (m_Path / "..");
-		m_ResPath = (m_Path / "res");
-	} else if (std::filesystem::exists(m_Path / "pack") && std::filesystem::exists(m_Path / ".." / ".." / "versions")) {
-		m_AssetBundleType = eAssetBundleType::Packed;
-
-		m_RootPath = (m_Path / ".." / "..");
-		m_ResPath = m_Path;
-	} else if ((std::filesystem::exists(m_Path / "res" / "cdclient.fdb") || std::filesystem::exists(m_Path / "res" / "CDServer.sqlite")) && !std::filesystem::exists(m_Path / "res" / "pack")) {
-		m_AssetBundleType = eAssetBundleType::Unpacked;
-
-		m_ResPath = (m_Path / "res");
-	} else if ((std::filesystem::exists(m_Path / "cdclient.fdb") || std::filesystem::exists(m_Path / "CDServer.sqlite")) && !std::filesystem::exists(m_Path / "pack")) {
-		m_AssetBundleType = eAssetBundleType::Unpacked;
-
-		m_ResPath = m_Path;
-	}
-
-	if (m_AssetBundleType == eAssetBundleType::None) {
-		throw std::runtime_error("Failed to identify client type, cannot read client data.");
-	}
-
-	switch (m_AssetBundleType) {
-		case eAssetBundleType::Packed: {
-			this->LoadPackIndex();
-
-			this->UnpackRequiredAssets();
-
-			break;
-		}
-	}
-}
-
-void AssetManager::LoadPackIndex() {
-	m_PackIndex = new PackIndex(m_RootPath);
-}
-
-std::filesystem::path AssetManager::GetResPath() {
-	return m_ResPath;
-}
-
-eAssetBundleType AssetManager::GetAssetBundleType() {
-	return m_AssetBundleType;
-}
-
-bool AssetManager::HasFile(const char* name) {
-	auto fixedName = std::string(name);
-	std::transform(fixedName.begin(), fixedName.end(), fixedName.begin(), [](uint8_t c) { return std::tolower(c); });
-
-	// Special case for unpacked client have BrickModels in upper case
-	if (this->m_AssetBundleType == eAssetBundleType::Unpacked) GeneralUtils::ReplaceInString(fixedName, "brickmodels", "BrickModels");
-
-	std::replace(fixedName.begin(), fixedName.end(), '\\', '/');
-	if (std::filesystem::exists(m_ResPath / fixedName)) return true;
-
-	if (this->m_AssetBundleType == eAssetBundleType::Unpacked) return false;
-
-	std::replace(fixedName.begin(), fixedName.end(), '/', '\\');
-	if (fixedName.rfind("client\\res\\", 0) != 0) fixedName = "client\\res\\" + fixedName;
-
-	uint32_t crc = crc32b(0xFFFFFFFF, (uint8_t*)fixedName.c_str(), fixedName.size());
-	crc = crc32b(crc, (Bytef*)"\0\0\0\0", 4);
-
-	for (const auto& item : this->m_PackIndex->GetPackFileIndices()) {
-		if (item.m_Crc == crc) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
-bool AssetManager::GetFile(const char* name, char** data, uint32_t* len) {
-	auto fixedName = std::string(name);
-	std::transform(fixedName.begin(), fixedName.end(), fixedName.begin(), [](uint8_t c) { return std::tolower(c); });
-	std::replace(fixedName.begin(), fixedName.end(), '\\', '/'); // On the off chance someone has the wrong slashes, force forward slashes
-
-	// Special case for unpacked client have BrickModels in upper case
-	if (this->m_AssetBundleType == eAssetBundleType::Unpacked) GeneralUtils::ReplaceInString(fixedName, "brickmodels", "BrickModels");
-
-	if (std::filesystem::exists(m_ResPath / fixedName)) {
-		FILE* file;
-#ifdef _WIN32
-		fopen_s(&file, (m_ResPath / fixedName).string().c_str(), "rb");
-#elif __APPLE__
-		// macOS has 64bit file IO by default
-		file = fopen((m_ResPath / fixedName).string().c_str(), "rb");
-#else
-		file = fopen64((m_ResPath / fixedName).string().c_str(), "rb");
-#endif
-		fseek(file, 0, SEEK_END);
-		*len = ftell(file);
-		*data = (char*)malloc(*len);
-		fseek(file, 0, SEEK_SET);
-		fread(*data, sizeof(uint8_t), *len, file);
-		fclose(file);
-
-		return true;
-	}
-
-	if (this->m_AssetBundleType == eAssetBundleType::Unpacked) return false;
-
-	// The crc in side of the pack always uses backslashes, so we need to convert them again...
-	std::replace(fixedName.begin(), fixedName.end(), '/', '\\');
-	if (fixedName.rfind("client\\res\\", 0) != 0) {
-		fixedName = "client\\res\\" + fixedName;
-	}
-	int32_t packIndex = -1;
-	uint32_t crc = crc32b(0xFFFFFFFF, (uint8_t*)fixedName.c_str(), fixedName.size());
-	crc = crc32b(crc, (Bytef*)"\0\0\0\0", 4);
-
-	for (const auto& item : this->m_PackIndex->GetPackFileIndices()) {
-		if (item.m_Crc == crc) {
-			packIndex = item.m_PackFileIndex;
-			crc = item.m_Crc;
-			break;
-		}
-	}
-
-	if (packIndex == -1 || !crc) {
-		return false;
-	}
-
-	auto packs = this->m_PackIndex->GetPacks();
-	auto* pack = packs.at(packIndex);
-
-	bool success = pack->ReadFileFromPack(crc, data, len);
-
-	return success;
-}
-
-AssetMemoryBuffer AssetManager::GetFileAsBuffer(const char* name) {
-	char* buf;
-	uint32_t len;
-
-	bool success = this->GetFile(name, &buf, &len);
-
-	return AssetMemoryBuffer(buf, len, success);
-}
-
-void AssetManager::UnpackRequiredAssets() {
-	if (std::filesystem::exists(m_ResPath / "cdclient.fdb")) return;
-
-	char* data;
-	uint32_t size;
-
-	bool success = this->GetFile("cdclient.fdb", &data, &size);
-
-	if (!success) {
-		Game::logger->Log("AssetManager", "Failed to extract required files from the packs.");
-
-		delete data;
-
-		return;
-	}
-
-	std::ofstream cdclientOutput(m_ResPath / "cdclient.fdb", std::ios::out | std::ios::binary);
-	cdclientOutput.write(data, size);
-	cdclientOutput.close();
-
-	delete data;
-
-	return;
-}
-
-uint32_t AssetManager::crc32b(uint32_t base, uint8_t* message, size_t l) {
-	size_t i, j;
-	uint32_t crc, msb;
-
-	crc = base;
-	for (i = 0; i < l; i++) {
-		// xor next byte to upper bits of crc
-		crc ^= (((unsigned int)message[i]) << 24);
-		for (j = 0; j < 8; j++) { // Do eight times.
-			msb = crc >> 31;
-			crc <<= 1;
-			crc ^= (0 - msb) & 0x04C11DB7;
-		}
-	}
-	return crc; // don't complement crc on output
-}
-
-AssetManager::~AssetManager() {
-	delete m_PackIndex;
-}

dCommon/dClient/AssetManager.h

@@ -1,78 +0,0 @@
-#pragma once
-
-#include <string>
-#include <vector>
-#include <unordered_map>
-#include <filesystem>
-
-#include "Pack.h"
-#include "PackIndex.h"
-
-enum class eAssetBundleType {
-	None,
-	Unpacked,
-	Packed
-};
-
-struct AssetMemoryBuffer : std::streambuf {
-	char* m_Base;
-	bool m_Success;
-
-	AssetMemoryBuffer(char* base, std::ptrdiff_t n, bool success) {
-		m_Base = base;
-		m_Success = success;
-		if (!m_Success) return;
-		this->setg(base, base, base + n);
-	}
-
-	pos_type seekpos(pos_type sp, std::ios_base::openmode which) override {
-		return seekoff(sp - pos_type(off_type(0)), std::ios_base::beg, which);
-	}
-
-	pos_type seekoff(off_type off,
-		std::ios_base::seekdir dir,
-		std::ios_base::openmode which = std::ios_base::in) override {
-		if (dir == std::ios_base::cur)
-			gbump(off);
-		else if (dir == std::ios_base::end)
-			setg(eback(), egptr() + off, egptr());
-		else if (dir == std::ios_base::beg)
-			setg(eback(), eback() + off, egptr());
-		return gptr() - eback();
-	}
-
-	void close() {
-		delete m_Base;
-	}
-};
-
-class AssetManager {
-public:
-	AssetManager(const std::filesystem::path& path);
-	~AssetManager();
-
-	std::filesystem::path GetResPath();
-	eAssetBundleType GetAssetBundleType();
-
-	bool HasFile(const char* name);
-	bool GetFile(const char* name, char** data, uint32_t* len);
-	AssetMemoryBuffer GetFileAsBuffer(const char* name);
-
-private:
-	void LoadPackIndex();
-	void UnpackRequiredAssets();
-
-	// Modified crc algorithm (mpeg2)
-	// Reference: https://stackoverflow.com/questions/54339800/how-to-modify-crc-32-to-crc-32-mpeg-2
-	inline uint32_t crc32b(uint32_t base, uint8_t* message, size_t l);
-
-	bool m_SuccessfullyLoaded;
-
-	std::filesystem::path m_Path;
-	std::filesystem::path m_RootPath;
-	std::filesystem::path m_ResPath;
-
-	eAssetBundleType m_AssetBundleType = eAssetBundleType::None;
-
-	PackIndex* m_PackIndex;
-};

dCommon/dClient/CMakeLists.txt

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

dCommon/dClient/Pack.cpp

@@ -1,119 +0,0 @@
-#include "Pack.h"
-
-#include "BinaryIO.h"
-#include "ZCompression.h"
-
-Pack::Pack(const std::filesystem::path& filePath) {
-	m_FilePath = filePath;
-
-	if (!std::filesystem::exists(filePath)) {
-		return;
-	}
-
-	m_FileStream = std::ifstream(filePath, std::ios::in | std::ios::binary);
-
-	m_FileStream.read(m_Version, 7);
-
-	m_FileStream.seekg(-8, std::ios::end); // move file pointer to 8 bytes before the end (location of the address of the record count)
-
-	uint32_t recordCountPos = 0;
-	BinaryIO::BinaryRead<uint32_t>(m_FileStream, recordCountPos);
-
-	m_FileStream.seekg(recordCountPos, std::ios::beg);
-
-	BinaryIO::BinaryRead<uint32_t>(m_FileStream, m_RecordCount);
-
-	for (int i = 0; i < m_RecordCount; i++) {
-		PackRecord record;
-		BinaryIO::BinaryRead<PackRecord>(m_FileStream, record);
-
-		m_Records.push_back(record);
-	}
-
-	m_FileStream.close();
-}
-
-bool Pack::HasFile(uint32_t crc) {
-	for (const auto& record : m_Records) {
-		if (record.m_Crc == crc) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
-bool Pack::ReadFileFromPack(uint32_t crc, char** data, uint32_t* len) {
-	// Time for some wacky C file reading for speed reasons
-
-	PackRecord pkRecord{};
-
-	for (const auto& record : m_Records) {
-		if (record.m_Crc == crc) {
-			pkRecord = record;
-			break;
-		}
-	}
-
-	if (pkRecord.m_Crc == 0) return false;
-
-	size_t pos = 0;
-	pos += pkRecord.m_FilePointer;
-
-	bool isCompressed = (pkRecord.m_IsCompressed & 0xff) > 0;
-	auto inPackSize = isCompressed ? pkRecord.m_CompressedSize : pkRecord.m_UncompressedSize;
-
-	FILE* file;
-#ifdef _WIN32
-	fopen_s(&file, m_FilePath.string().c_str(), "rb");
-#elif __APPLE__
-	// macOS has 64bit file IO by default
-	file = fopen(m_FilePath.string().c_str(), "rb");
-#else
-	file = fopen64(m_FilePath.string().c_str(), "rb");
-#endif
-
-	fseek(file, pos, SEEK_SET);
-
-	if (!isCompressed) {
-		char* tempData = (char*)malloc(pkRecord.m_UncompressedSize);
-		fread(tempData, sizeof(uint8_t), pkRecord.m_UncompressedSize, file);
-
-		*data = tempData;
-		*len = pkRecord.m_UncompressedSize;
-		fclose(file);
-
-		return true;
-	}
-
-	pos += 5; // skip header
-
-	fseek(file, pos, SEEK_SET);
-
-	char* decompressedData = (char*)malloc(pkRecord.m_UncompressedSize);
-	uint32_t currentReadPos = 0;
-
-	while (true) {
-		if (currentReadPos >= pkRecord.m_UncompressedSize) break;
-
-		uint32_t size;
-		fread(&size, sizeof(uint32_t), 1, file);
-		pos += 4; // Move pointer position 4 to the right
-
-		char* chunk = (char*)malloc(size);
-		fread(chunk, sizeof(int8_t), size, file);
-		pos += size; // Move pointer position the amount of bytes read to the right
-
-		int32_t err;
-		currentReadPos += ZCompression::Decompress((uint8_t*)chunk, size, reinterpret_cast<uint8_t*>(decompressedData + currentReadPos), ZCompression::MAX_SD0_CHUNK_SIZE, err);
-
-		free(chunk);
-	}
-
-	*data = decompressedData;
-	*len = pkRecord.m_UncompressedSize;
-
-	fclose(file);
-
-	return true;
-}

dCommon/dClient/Pack.h

@@ -1,38 +0,0 @@
-#pragma once
-
-#include <vector>
-#include <string>
-#include <filesystem>
-
-#pragma pack(push, 1)
-struct PackRecord {
-	uint32_t m_Crc;
-	int32_t m_LowerCrc;
-	int32_t m_UpperCrc;
-	uint32_t m_UncompressedSize;
-	char m_UncompressedHash[32];
-	uint32_t m_Padding1;
-	uint32_t m_CompressedSize;
-	char m_CompressedHash[32];
-	uint32_t m_Padding2;
-	uint32_t m_FilePointer;
-	uint32_t m_IsCompressed; // u32 bool
-};
-#pragma pack(pop)
-
-class Pack {
-public:
-	Pack(const std::filesystem::path& filePath);
-	~Pack() = default;
-
-	bool HasFile(uint32_t crc);
-	bool ReadFileFromPack(uint32_t crc, char** data, uint32_t* len);
-private:
-	std::ifstream m_FileStream;
-	std::filesystem::path m_FilePath;
-
-	char m_Version[7];
-
-	uint32_t m_RecordCount;
-	std::vector<PackRecord> m_Records;
-};

dCommon/dClient/PackIndex.cpp

@@ -1,54 +0,0 @@
-#include "PackIndex.h"
-#include "BinaryIO.h"
-#include "Game.h"
-#include "dLogger.h"
-
-PackIndex::PackIndex(const std::filesystem::path& filePath) {
-	m_FileStream = std::ifstream(filePath / "versions" / "primary.pki", std::ios::in | std::ios::binary);
-
-	BinaryIO::BinaryRead<uint32_t>(m_FileStream, m_Version);
-	BinaryIO::BinaryRead<uint32_t>(m_FileStream, m_PackPathCount);
-
-	for (int i = 0; i < m_PackPathCount; i++) {
-		uint32_t stringLen = 0;
-		BinaryIO::BinaryRead<uint32_t>(m_FileStream, stringLen);
-
-		std::string path;
-
-		for (int j = 0; j < stringLen; j++) {
-			char inChar;
-			BinaryIO::BinaryRead<char>(m_FileStream, inChar);
-
-			path += inChar;
-		}
-
-		m_PackPaths.push_back(path);
-	}
-
-	BinaryIO::BinaryRead<uint32_t>(m_FileStream, m_PackFileIndexCount);
-
-	for (int i = 0; i < m_PackFileIndexCount; i++) {
-		PackFileIndex packFileIndex;
-		BinaryIO::BinaryRead<PackFileIndex>(m_FileStream, packFileIndex);
-
-		m_PackFileIndices.push_back(packFileIndex);
-	}
-
-	Game::logger->Log("PackIndex", "Loaded pack catalog with %i pack files and %i files", m_PackPaths.size(), m_PackFileIndices.size());
-
-	for (auto& item : m_PackPaths) {
-		std::replace(item.begin(), item.end(), '\\', '/');
-
-		auto* pack = new Pack(filePath / item);
-
-		m_Packs.push_back(pack);
-	}
-
-	m_FileStream.close();
-}
-
-PackIndex::~PackIndex() {
-	for (const auto* item : m_Packs) {
-		delete item;
-	}
-}

dCommon/dClient/PackIndex.h

@@ -1,40 +0,0 @@
-#pragma once
-
-#include <cstdint>
-
-#include <string>
-#include <vector>
-#include <filesystem>
-
-#include "Pack.h"
-
-#pragma pack(push, 1)
-struct PackFileIndex {
-	uint32_t m_Crc;
-	int32_t m_LowerCrc;
-	int32_t m_UpperCrc;
-	uint32_t m_PackFileIndex;
-	uint32_t m_IsCompressed; // u32 bool?
-};
-#pragma pack(pop)
-
-class PackIndex {
-public:
-	PackIndex(const std::filesystem::path& filePath);
-	~PackIndex();
-
-	const std::vector<std::string>& GetPackPaths() { return m_PackPaths; }
-	const std::vector<PackFileIndex>& GetPackFileIndices() { return m_PackFileIndices; }
-	const std::vector<Pack*>& GetPacks() { return m_Packs; }
-private:
-	std::ifstream m_FileStream;
-
-	uint32_t m_Version;
-
-	uint32_t m_PackPathCount;
-	std::vector<std::string> m_PackPaths;
-	uint32_t m_PackFileIndexCount;
-	std::vector<PackFileIndex> m_PackFileIndices;
-
-	std::vector<Pack*> m_Packs;
-};

dCommon/dCommonVars.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef __DCOMMONVARS__H__
-#define __DCOMMONVARS__H__
-
 #include <cstdint>
 #include <string>
 #include <set>
@@ -33,8 +30,6 @@ 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;
-typedef uint32_t BEHAVIORSTATE;
 
 typedef int32_t PetTamingPiece;             //!< Pet Taming Pieces
 
@@ -53,7 +48,9 @@ const uint64_t LWOZONEID_INVALID = 0;       //!< Invalid LWOZONEID
 
 typedef std::set<LWOOBJID> TSetObjID;
 
-const float PI = 3.14159f;
+#ifndef PI
+#define PI 3.14159265358979323846f
+#endif
 
 #if defined(__unix) || defined(__APPLE__)
 //For Linux:
@@ -427,6 +424,25 @@ enum class UseItemResponse : uint32_t {
 	MountsNotAllowed
 };
 
+/**
+ * Represents the different types of inventories an entity may have
+ */
+enum eInventoryType : uint32_t {
+	ITEMS = 0,
+	VAULT_ITEMS,
+	BRICKS,
+	TEMP_ITEMS = 4,
+	MODELS,
+	TEMP_MODELS,
+	BEHAVIORS,
+	PROPERTY_DEEDS,
+	VENDOR_BUYBACK = 11,
+	HIDDEN = 12, //Used for missional items
+	VAULT_MODELS = 14,
+	ITEM_SETS, //internal
+	INVALID // made up, for internal use!!!
+};
+
 enum eRebuildState : uint32_t {
 	REBUILD_OPEN,
 	REBUILD_COMPLETED = 2,
@@ -540,7 +556,6 @@ enum ePlayerFlags {
 	ENTER_BBB_FROM_PROPERTY_EDIT_CONFIRMATION_DIALOG = 64,
 	AG_FIRST_COMBAT_COMPLETE = 65,
 	AG_COMPLETE_BOB_MISSION = 66,
-	IS_NEWS_SCREEN_VISIBLE = 114,
 	NJ_GARMADON_CINEMATIC_SEEN = 125,
 	ELEPHANT_PET_3050 = 801,
 	CAT_PET_3054 = 802,
@@ -635,5 +650,3 @@ inline T const& clamp(const T& val, const T& low, const T& high) {
 
 	return val;
 }
-
-#endif  //!__DCOMMONVARS__H__

dCommon/dConfig.cpp

@@ -1,53 +1,45 @@
 #include "dConfig.h"
-
 #include <sstream>
 
-#include "BinaryPathFinder.h"
-#include "GeneralUtils.h"
-
 dConfig::dConfig(const std::string& filepath) {
-	m_ConfigFilePath = filepath;
-	LoadConfig();
-}
-
-void dConfig::LoadConfig() {
-	std::ifstream in(BinaryPathFinder::GetBinaryDir() / m_ConfigFilePath);
+	m_EmptyString = "";
+	std::ifstream in(filepath);
 	if (!in.good()) return;
 
-	std::string line{};
+	std::string line;
 	while (std::getline(in, line)) {
-		if (!line.empty() && line.front() != '#') ProcessLine(line);
-	}
-
-	std::ifstream sharedConfig(BinaryPathFinder::GetBinaryDir() / "sharedconfig.ini", std::ios::in);
-	if (!sharedConfig.good()) return;
-
-	line.clear();
-	while (std::getline(sharedConfig, line)) {
-		if (!line.empty() && line.front() != '#') ProcessLine(line);
+		if (line.length() > 0) {
+			if (line[0] != '#') ProcessLine(line);
+		}
 	}
 }
 
-void dConfig::ReloadConfig() {
-	this->m_ConfigValues.clear();
-	LoadConfig();
+dConfig::~dConfig(void) {
 }
 
 const std::string& dConfig::GetValue(std::string key) {
-	return this->m_ConfigValues[key];
+	for (size_t i = 0; i < m_Keys.size(); ++i) {
+		if (m_Keys[i] == key) return m_Values[i];
+	}
+
+	return m_EmptyString;
 }
 
 void dConfig::ProcessLine(const std::string& line) {
-	auto splitLine = GeneralUtils::SplitString(line, '=');
+	std::stringstream ss(line);
+	std::string segment;
+	std::vector<std::string> seglist;
 
-	if (splitLine.size() != 2) return;
+	while (std::getline(ss, segment, '=')) {
+		seglist.push_back(segment);
+	}
+
+	if (seglist.size() != 2) return;
 
 	//Make sure that on Linux, we remove special characters:
-	auto& key = splitLine.at(0);
-	auto& value = splitLine.at(1);
-	if (!value.empty() && value.at(value.size() - 1) == '\r') value.erase(value.size() - 1);
+	if (!seglist[1].empty() && seglist[1][seglist[1].size() - 1] == '\r')
+		seglist[1].erase(seglist[1].size() - 1);
 
-	if (this->m_ConfigValues.find(key) != this->m_ConfigValues.end()) return;
-
-	this->m_ConfigValues.insert(std::make_pair(key, value));
+	m_Keys.push_back(seglist[0]);
+	m_Values.push_back(seglist[1]);
 }

dCommon/dConfig.h

@@ -1,34 +1,20 @@
 #pragma once
 #include <fstream>
-#include <map>
 #include <string>
+#include <vector>
 
 class dConfig {
 public:
 	dConfig(const std::string& filepath);
+	~dConfig(void);
 
-	/**
-	 * Gets the specified key from the config.  Returns an empty string if the value is not found.
-	 *
-	 * @param key Key to find
-	 * @return The keys value in the config
-	 */
 	const std::string& GetValue(std::string key);
 
-	/**
-	 * Loads the config from a file
-	 */
-	void LoadConfig();
-
-	/**
-	 * Reloads the config file to reset values
-	 */
-	void ReloadConfig();
-
 private:
 	void ProcessLine(const std::string& line);
 
 private:
-	std::map<std::string, std::string> m_ConfigValues;
-	std::string m_ConfigFilePath;
+	std::vector<std::string> m_Keys;
+	std::vector<std::string> m_Values;
+	std::string m_EmptyString;
 };

dCommon/dEnums/eCharacterVersion.h

@@ -1,21 +0,0 @@
-#pragma once
-
-#ifndef __ECHARACTERVERSION__H__
-#define __ECHARACTERVERSION__H__
-
-#include <cstdint>
-
-enum class eCharacterVersion : uint32_t {
-// Versions from the live game
-	RELEASE = 0, // Initial release of the game
-	LIVE, // Fixes for the 1.9 release bug fixes for missions leading up to joining a faction
-// New versions for DLU fixes
-	// Fixes the "Joined a faction" player flag not being set properly
-	PLAYER_FACTION_FLAGS,
-	// Fixes vault size value
-	VAULT_SIZE,
-	// Fixes speed base value in level component
-	UP_TO_DATE, // will become SPEED_BASE
-};
-
-#endif  //!__ECHARACTERVERSION__H__

dCommon/dEnums/eInventoryType.h

@@ -1,59 +0,0 @@
-#pragma once
-
-#ifndef __EINVENTORYTYPE__H__
-#define __EINVENTORYTYPE__H__
-
-#include <cstdint>
-static const uint8_t NUMBER_OF_INVENTORIES = 17;
-/**
- * Represents the different types of inventories an entity may have
- */
-enum eInventoryType : uint32_t {
-	ITEMS = 0,
-	VAULT_ITEMS,
-	BRICKS,
-	MODELS_IN_BBB,
-	TEMP_ITEMS,
-	MODELS,
-	TEMP_MODELS,
-	BEHAVIORS,
-	PROPERTY_DEEDS,
-	BRICKS_IN_BBB,
-	VENDOR,
-	VENDOR_BUYBACK,
-	QUEST, //Used for mission items
-	DONATION,
-	VAULT_MODELS,
-	ITEM_SETS, //internal, technically this is BankBehaviors.
-	INVALID // made up, for internal use!!!, Technically this called the ALL inventory.
-};
-
-class InventoryType {
-public:
-	static const char* InventoryTypeToString(eInventoryType inventory) {
-		const char* eInventoryTypeTable[NUMBER_OF_INVENTORIES] = {
-				"ITEMS",
-				"VAULT_ITEMS",
-				"BRICKS",
-				"MODELS_IN_BBB",
-				"TEMP_ITEMS",
-				"MODELS",
-				"TEMP_MODELS",
-				"BEHAVIORS",
-				"PROPERTY_DEEDS",
-				"BRICKS_IN_BBB",
-				"VENDOR",
-				"VENDOR_BUYBACK",
-				"QUEST", //Used for mission items
-				"DONATION",
-				"VAULT_MODELS",
-				"ITEM_SETS", //internal, technically this is BankBehaviors.
-				"INVALID" // made up, for internal use!!!, Technically this called the ALL inventory.
-		};
-
-		if (inventory > NUMBER_OF_INVENTORIES - 1) return nullptr;
-		return eInventoryTypeTable[inventory];
-	};
-};
-
-#endif  //!__EINVENTORYTYPE__H__

dCommon/dEnums/eSqliteDataType.h

@@ -1,16 +0,0 @@
-#ifndef __ESQLITEDATATYPE__H__
-#define __ESQLITEDATATYPE__H__
-
-#include <cstdint>
-
-enum class eSqliteDataType : int32_t {
-	NONE = 0,
-	INT32,
-	REAL = 3,
-	TEXT_4,
-	INT_BOOL,
-	INT64,
-	TEXT_8 = 8
-};
-
-#endif  //!__ESQLITEDATATYPE__H__

dCommon/eAninmationFlags.h

@@ -6,7 +6,7 @@
 #include <cstdint>
 
 enum class eAnimationFlags : uint32_t {
-	IDLE_NONE = 0,
+	IDLE_INVALID = 0, // made up, for internal use!!!
 	IDLE_BASIC,
 	IDLE_SWIM,
 	IDLE_CARRY,

dCommon/eBlueprintSaveResponseType.h

@@ -1,26 +0,0 @@
-#pragma once
-
-#ifndef __EBLUEPRINTSAVERESPONSETYPE__H__
-#define __EBLUEPRINTSAVERESPONSETYPE__H__
-
-#include <cstdint>
-
-enum class eBlueprintSaveResponseType : uint32_t {
-    EverythingWorked = 0,
-    SaveCancelled,
-    CantBeginTransaction,
-    SaveBlueprintFailed,
-    SaveUgobjectFailed,
-    CantEndTransaction,
-    SaveFilesFailed,
-    BadInput,
-    NotEnoughBricks,
-    InventoryFull,
-    ModelGenerationFailed,
-    PlacementFailed,
-    GmLevelInsufficient,
-    WaitForPreviousSave,
-    FindMatchesFailed
-};
-
-#endif  //!__EBLUEPRINTSAVERESPONSETYPE__H__

dDatabase/CDClientDatabase.cpp

@@ -14,11 +14,6 @@ CppSQLite3Query CDClientDatabase::ExecuteQuery(const std::string& query) {
 	return conn->execQuery(query.c_str());
 }
 
-//! Updates the CDClient file with Data Manipulation Language (DML) commands.
-int CDClientDatabase::ExecuteDML(const std::string& query) {
-	return conn->execDML(query.c_str());
-}
-
 //! Makes prepared statements
 CppSQLite3Statement CDClientDatabase::CreatePreppedStmt(const std::string& query) {
 	return conn->compileStatement(query.c_str());

dDatabase/CDClientDatabase.h

@@ -40,14 +40,6 @@ namespace CDClientDatabase {
 	 */
 	CppSQLite3Query ExecuteQuery(const std::string& query);
 
-	//! Updates the CDClient file with Data Manipulation Language (DML) commands.
-	/*!
-	  \param query The DML command to run.  DML command can be multiple queries in one string but only
-		the last one will return its number of updated rows.
-	  \return The number of updated rows.
-	*/
-	int ExecuteDML(const std::string& query);
-
 	//! Queries the CDClient and parses arguments
 	/*!
 	  \param query The query with formatted arguments

dDatabase/Database.cpp

@@ -14,6 +14,8 @@ std::string Database::database;
 void Database::Connect(const string& host, const string& database, const string& username, const string& password) {
 
 	//To bypass debug issues:
+	std::string newHost = "tcp://" + host;
+	const char* szHost = newHost.c_str();
 	const char* szDatabase = database.c_str();
 	const char* szUsername = username.c_str();
 	const char* szPassword = password.c_str();
@@ -21,24 +23,7 @@ void Database::Connect(const string& host, const string& database, const string&
 	driver = sql::mariadb::get_driver_instance();
 
 	sql::Properties properties;
-	// The mariadb connector is *supposed* to handle unix:// and pipe:// prefixes to hostName, but there are bugs where
-	// 1) it tries to parse a database from the connection string (like in tcp://localhost:3001/darkflame) based on the
-	//    presence of a /
-	// 2) even avoiding that, the connector still assumes you're connecting with a tcp socket
-	// So, what we do in the presence of a unix socket or pipe is to set the hostname to the protocol and localhost,
-	// which avoids parsing errors while still ensuring the correct connection type is used, and then setting the appropriate
-	// property manually (which the URL parsing fails to do)
-	const std::string UNIX_PROTO = "unix://";
-	const std::string PIPE_PROTO = "pipe://";
-    if (host.find(UNIX_PROTO) == 0) {
-		properties["hostName"] = "unix://localhost";
-		properties["localSocket"] = host.substr(UNIX_PROTO.length()).c_str();
-    } else if (host.find(PIPE_PROTO) == 0) {
-		properties["hostName"] = "pipe://localhost";
-		properties["pipe"] = host.substr(PIPE_PROTO.length()).c_str();
-    } else {
-		properties["hostName"] = host.c_str();
-    }
+	properties["hostName"] = szHost;
 	properties["user"] = szUsername;
 	properties["password"] = szPassword;
 	properties["autoReconnect"] = "true";
@@ -50,14 +35,8 @@ void Database::Connect(const string& host, const string& database, const string&
 }
 
 void Database::Connect() {
-	// `connect(const Properties& props)` segfaults in windows debug, but
-	// `connect(const SQLString& host, const SQLString& user, const SQLString& pwd)` doesn't handle pipes/unix sockets correctly
-	if (Database::props.find("localSocket") != Database::props.end() || Database::props.find("pipe") != Database::props.end()) {
-		con = driver->connect(Database::props);
-	} else {
-		con = driver->connect(Database::props["hostName"].c_str(), Database::props["user"].c_str(), Database::props["password"].c_str());
-	}
-	con->setSchema(Database::database.c_str());
+	con = driver->connect(Database::props);
+	con->setSchema(Database::database);
 }
 
 void Database::Destroy(std::string source, bool log) {
@@ -104,15 +83,3 @@ sql::PreparedStatement* Database::CreatePreppedStmt(const std::string& query) {
 void Database::Commit() {
 	Database::con->commit();
 }
-
-bool Database::GetAutoCommit() {
-	// TODO This should not just access a pointer.  A future PR should update this
-	// to check for null and throw an error if the connection is not valid.
-	return con->getAutoCommit();
-}
-
-void Database::SetAutoCommit(bool value) {
-	// TODO This should not just access a pointer.  A future PR should update this
-	// to check for null and throw an error if the connection is not valid.
-	Database::con->setAutoCommit(value);
-}

dDatabase/Database.h

@@ -23,8 +23,6 @@ public:
 	static sql::Statement* CreateStmt();
 	static sql::PreparedStatement* CreatePreppedStmt(const std::string& query);
 	static void Commit();
-	static bool GetAutoCommit();
-	static void SetAutoCommit(bool value);
 
 	static std::string GetDatabase() { return database; }
 	static sql::Properties GetProperties() { return props; }

dDatabase/MigrationRunner.cpp

@@ -1,20 +1,65 @@
 #include "MigrationRunner.h"
 
-#include "BrickByBrickFix.h"
-#include "CDClientDatabase.h"
-#include "Database.h"
-#include "Game.h"
 #include "GeneralUtils.h"
-#include "dLogger.h"
-#include "BinaryPathFinder.h"
 
-#include <istream>
+#include <fstream>
+#include <algorithm>
+#include <thread>
 
-Migration LoadMigration(std::string path) {
+void MigrationRunner::RunMigrations() {
+	auto stmt = Database::CreatePreppedStmt("CREATE TABLE IF NOT EXISTS migration_history (name TEXT NOT NULL, date TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP());");
+	stmt->executeQuery();
+	delete stmt;
+
+	sql::SQLString finalSQL = "";
+	Migration checkMigration{};
+
+	for (const auto& entry : GeneralUtils::GetFileNamesFromFolder("./migrations/")) {
+		auto migration = LoadMigration(entry);
+
+		if (migration.data.empty()) {
+			continue;
+		}
+
+		checkMigration = migration;
+
+		stmt = Database::CreatePreppedStmt("SELECT name FROM migration_history WHERE name = ?;");
+		stmt->setString(1, migration.name);
+		auto res = stmt->executeQuery();
+		bool doExit = res->next();
+		delete res;
+		delete stmt;
+		if (doExit) continue;
+
+		Game::logger->Log("MigrationRunner", "Running migration: %s", migration.name.c_str());
+
+		finalSQL.append(migration.data);
+		finalSQL.append('\n');
+
+		stmt = Database::CreatePreppedStmt("INSERT INTO migration_history (name) VALUES (?);");
+		stmt->setString(1, entry);
+		stmt->execute();
+		delete stmt;
+	}
+
+	if (!finalSQL.empty()) {
+		try {
+			auto simpleStatement = Database::CreateStmt();
+			simpleStatement->execute(finalSQL);
+			delete simpleStatement;
+		} catch (sql::SQLException e) {
+			Game::logger->Log("MigrationRunner", "Encountered error running migration: %s", e.what());
+		}
+	}
+}
+
+Migration MigrationRunner::LoadMigration(std::string path) {
 	Migration migration{};
-	std::ifstream file(BinaryPathFinder::GetBinaryDir() / "migrations/" / path);
+	std::ifstream file("./migrations/" + path);
 
 	if (file.is_open()) {
+		std::hash<std::string> hash;
+
 		std::string line;
 		std::string total = "";
 
@@ -30,129 +75,3 @@ Migration LoadMigration(std::string path) {
 
 	return migration;
 }
-
-void MigrationRunner::RunMigrations() {
-	auto* stmt = Database::CreatePreppedStmt("CREATE TABLE IF NOT EXISTS migration_history (name TEXT NOT NULL, date TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP());");
-	stmt->execute();
-	delete stmt;
-
-	sql::SQLString finalSQL = "";
-	bool runSd0Migrations = false;
-	for (const auto& entry : GeneralUtils::GetSqlFileNamesFromFolder((BinaryPathFinder::GetBinaryDir() / "./migrations/dlu/").string())) {
-		auto migration = LoadMigration("dlu/" + entry);
-
-		if (migration.data.empty()) {
-			continue;
-		}
-
-		stmt = Database::CreatePreppedStmt("SELECT name FROM migration_history WHERE name = ?;");
-		stmt->setString(1, migration.name.c_str());
-		auto* res = stmt->executeQuery();
-		bool doExit = res->next();
-		delete res;
-		delete stmt;
-		if (doExit) continue;
-
-		Game::logger->Log("MigrationRunner", "Running migration: %s", migration.name.c_str());
-		if (migration.name == "5_brick_model_sd0.sql") {
-			runSd0Migrations = true;
-		} else {
-			finalSQL.append(migration.data.c_str());
-		}
-
-		stmt = Database::CreatePreppedStmt("INSERT INTO migration_history (name) VALUES (?);");
-		stmt->setString(1, migration.name.c_str());
-		stmt->execute();
-		delete stmt;
-	}
-
-	if (finalSQL.empty() && !runSd0Migrations) {
-		Game::logger->Log("MigrationRunner", "Server database is up to date.");
-		return;
-	}
-
-	if (!finalSQL.empty()) {
-		auto migration = GeneralUtils::SplitString(static_cast<std::string>(finalSQL), ';');
-		std::unique_ptr<sql::Statement> simpleStatement(Database::CreateStmt());
-		for (auto& query : migration) {
-			try {
-				if (query.empty()) continue;
-				simpleStatement->execute(query.c_str());
-			} catch (sql::SQLException& e) {
-				Game::logger->Log("MigrationRunner", "Encountered error running migration: %s", e.what());
-			}
-		}
-	}
-
-	// Do this last on the off chance none of the other migrations have been run yet.
-	if (runSd0Migrations) {
-		uint32_t numberOfUpdatedModels = BrickByBrickFix::UpdateBrickByBrickModelsToSd0();
-		Game::logger->Log("MasterServer", "%i models were updated from zlib to sd0.", numberOfUpdatedModels);
-		uint32_t numberOfTruncatedModels = BrickByBrickFix::TruncateBrokenBrickByBrickXml();
-		Game::logger->Log("MasterServer", "%i models were truncated from the database.", numberOfTruncatedModels);
-	}
-}
-
-void MigrationRunner::RunSQLiteMigrations() {
-	auto cdstmt = CDClientDatabase::CreatePreppedStmt("CREATE TABLE IF NOT EXISTS migration_history (name TEXT NOT NULL, date TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP);");
-	cdstmt.execQuery().finalize();
-	cdstmt.finalize();
-
-	auto* stmt = Database::CreatePreppedStmt("CREATE TABLE IF NOT EXISTS migration_history (name TEXT NOT NULL, date TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP());");
-	stmt->execute();
-	delete stmt;
-
-	for (const auto& entry : GeneralUtils::GetSqlFileNamesFromFolder((BinaryPathFinder::GetBinaryDir() / "migrations/cdserver/").string())) {
-		auto migration = LoadMigration("cdserver/" + entry);
-
-		if (migration.data.empty()) continue;
-
-		// Check if there is an entry in the migration history table on the cdclient database.
-		cdstmt = CDClientDatabase::CreatePreppedStmt("SELECT name FROM migration_history WHERE name = ?;");
-		cdstmt.bind((int32_t) 1, migration.name.c_str());
-		auto cdres = cdstmt.execQuery();
-		bool doExit = !cdres.eof();
-		cdres.finalize();
-		cdstmt.finalize();
-
-		if (doExit) continue;
-
-		// Check first if there is entry in the migration history table on the main database.
-		stmt = Database::CreatePreppedStmt("SELECT name FROM migration_history WHERE name = ?;");
-		stmt->setString(1, migration.name.c_str());
-		auto* res = stmt->executeQuery();
-		doExit = res->next();
-		delete res;
-		delete stmt;
-		if (doExit) {
-			// Insert into cdclient database if there is an entry in the main database but not the cdclient database.
-			cdstmt = CDClientDatabase::CreatePreppedStmt("INSERT INTO migration_history (name) VALUES (?);");
-			cdstmt.bind((int32_t) 1, migration.name.c_str());
-			cdstmt.execQuery().finalize();
-			cdstmt.finalize();
-			continue;
-		}
-
-		// Doing these 1 migration at a time since one takes a long time and some may think it is crashing.
-		// This will at the least guarentee that the full migration needs to be run in order to be counted as "migrated".
-		Game::logger->Log("MigrationRunner", "Executing migration: %s.  This may take a while.  Do not shut down server.", migration.name.c_str());
-		CDClientDatabase::ExecuteQuery("BEGIN TRANSACTION;");
-		for (const auto& dml : GeneralUtils::SplitString(migration.data, ';')) {
-			if (dml.empty()) continue;
-			try {
-				CDClientDatabase::ExecuteDML(dml.c_str());
-			} catch (CppSQLite3Exception& e) {
-				Game::logger->Log("MigrationRunner", "Encountered error running DML command: (%i) : %s", e.errorCode(), e.errorMessage());
-			}
-		}
-
-		// Insert into cdclient database.
-		cdstmt = CDClientDatabase::CreatePreppedStmt("INSERT INTO migration_history (name) VALUES (?);");
-		cdstmt.bind((int32_t) 1, migration.name.c_str());
-		cdstmt.execQuery().finalize();
-		cdstmt.finalize();
-		CDClientDatabase::ExecuteQuery("COMMIT;");
-	}
-
-	Game::logger->Log("MigrationRunner", "CDServer database is up to date.");
-}

dDatabase/MigrationRunner.h

@@ -1,13 +1,19 @@
 #pragma once
 
-#include <string>
+#include "Database.h"
+
+#include "dCommonVars.h"
+#include "Game.h"
+#include "dCommonVars.h"
+#include "dLogger.h"
 
 struct Migration {
 	std::string data;
 	std::string name;
 };
 
-namespace MigrationRunner {
-	void RunMigrations();
-	void RunSQLiteMigrations();
+class MigrationRunner {
+public:
+	static void RunMigrations();
+	static Migration LoadMigration(std::string path);
 };

dGame/CMakeLists.txt

@@ -44,19 +44,13 @@ foreach(file ${DGAME_DMISSION_SOURCES})
 	set(DGAME_SOURCES ${DGAME_SOURCES} "dMission/${file}")
 endforeach()
 
-add_subdirectory(dPropertyBehaviors)
-
-foreach(file ${DGAME_DPROPERTYBEHAVIORS_SOURCES})
-	set(DGAME_SOURCES ${DGAME_SOURCES} "dPropertyBehaviors/${file}")
-endforeach()
-
 add_subdirectory(dUtilities)
 
 foreach(file ${DGAME_DUTILITIES_SOURCES})
 	set(DGAME_SOURCES ${DGAME_SOURCES} "dUtilities/${file}")
 endforeach()
 
-foreach(file ${DSCRIPTS_SOURCES})
+foreach(file ${DSCRIPT_SOURCES})
 	set(DGAME_SOURCES ${DGAME_SOURCES} "${PROJECT_SOURCE_DIR}/dScripts/${file}")
 endforeach()
 

dGame/Character.cpp

@@ -15,7 +15,6 @@
 #include "Zone.h"
 #include "ChatPackets.h"
 #include "Inventory.h"
-#include "InventoryComponent.h"
 
 Character::Character(uint32_t id, User* parentUser) {
 	//First load the name, etc:
@@ -265,17 +264,14 @@ void Character::DoQuickXMLDataParse() {
 	if (flags) {
 		auto* currentChild = flags->FirstChildElement();
 		while (currentChild) {
+			uint32_t index = 0;
+			uint64_t value = 0;
 			const auto* temp = currentChild->Attribute("v");
-			const auto* id = currentChild->Attribute("id");
-			if (temp && id) {
-				uint32_t index = 0;
-				uint64_t value = 0;
 
-				index = std::stoul(id);
-				value = std::stoull(temp);
+			index = std::stoul(currentChild->Attribute("id"));
+			value = std::stoull(temp);
 
-				m_PlayerFlags.insert(std::make_pair(index, value));
-			}
+			m_PlayerFlags.insert(std::make_pair(index, value));
 			currentChild = currentChild->NextSiblingElement();
 		}
 	}
@@ -355,13 +351,6 @@ void Character::SaveXMLToDatabase() {
 		flags->LinkEndChild(f);
 	}
 
-	// Prevents the news feed from showing up on world transfers
-	if (GetPlayerFlag(ePlayerFlags::IS_NEWS_SCREEN_VISIBLE)) {
-		auto* s = m_Doc->NewElement("s");
-		s->SetAttribute("si", ePlayerFlags::IS_NEWS_SCREEN_VISIBLE);
-		flags->LinkEndChild(s);
-	}
-
 	SaveXmlRespawnCheckpoints();
 
 	//Call upon the entity to update our xmlDoc:
@@ -372,31 +361,6 @@ void Character::SaveXMLToDatabase() {
 
 	m_OurEntity->UpdateXMLDoc(m_Doc);
 
-	WriteToDatabase();
-
-	//For metrics, log the time it took to save:
-	auto end = std::chrono::system_clock::now();
-	std::chrono::duration<double> elapsed = end - start;
-	Game::logger->Log("Character", "Saved character to Database in: %fs", elapsed.count());
-}
-
-void Character::SetIsNewLogin() {
-	// If we dont have a flag element, then we cannot have a s element as a child of flag.
-	auto* flags = m_Doc->FirstChildElement("obj")->FirstChildElement("flag");
-	if (!flags) return;
-
-	auto* currentChild = flags->FirstChildElement();
-	while (currentChild) {
-		if (currentChild->Attribute("si")) {
-			flags->DeleteChild(currentChild);
-			Game::logger->Log("Character", "Removed isLoggedIn flag from character %i, saving character to database", GetID());
-			WriteToDatabase();
-		}
-		currentChild = currentChild->NextSiblingElement();
-	}
-}
-
-void Character::WriteToDatabase() {
 	//Dump our xml into m_XMLData:
 	auto* printer = new tinyxml2::XMLPrinter(0, true, 0);
 	m_Doc->Print(printer);
@@ -408,6 +372,12 @@ void Character::WriteToDatabase() {
 	stmt->setUInt(2, m_ID);
 	stmt->execute();
 	delete stmt;
+
+	//For metrics, log the time it took to save:
+	auto end = std::chrono::system_clock::now();
+	std::chrono::duration<double> elapsed = end - start;
+	Game::logger->Log("Character", "Saved character to Database in: %fs", elapsed.count());
+
 	delete printer;
 }
 

dGame/Character.h

@@ -23,10 +23,6 @@ public:
 	Character(uint32_t id, User* parentUser);
 	~Character();
 
-	/**
-	 * Write the current m_Doc to the database for saving.
-	 */
-	void WriteToDatabase();
 	void SaveXMLToDatabase();
 	void UpdateFromDatabase();
 
@@ -36,15 +32,6 @@ public:
 	const std::string& GetXMLData() const { return m_XMLData; }
 	tinyxml2::XMLDocument* GetXMLDoc() const { return m_Doc; }
 
-	/**
-	 * Out of abundance of safety and clarity of what this saves, this is its own function.
-	 *
-	 * Clears the s element from the flag element and saves the xml to the database.  Used to prevent the news
-	 * feed from showing up on world transfers.
-	 *
-	 */
-	void SetIsNewLogin();
-
 	/**
 	 * Gets the database ID of the character
 	 * @return the database ID of the character
@@ -440,7 +427,7 @@ public:
 
 	/**
 	 * @brief Get the flying state
-	 * @return value of the flying state
+	 * @return value of the flying state 
 	*/
 	bool GetIsFlying() { return m_IsFlying; }
 

dGame/Entity.cpp

@@ -317,6 +317,15 @@ void Entity::Initialize() {
 		m_Components.insert(std::make_pair(COMPONENT_TYPE_SOUND_TRIGGER, comp));
 	}
 
+	//Check to see if we have a moving platform component:
+	//Which, for some reason didn't get added to the ComponentsRegistry so we have to check for a path manually here.
+	std::string attachedPath = GetVarAsString(u"attached_path");
+
+	if (!attachedPath.empty() || compRegistryTable->GetByIDAndType(m_TemplateID, COMPONENT_TYPE_MOVING_PLATFORM, -1) != -1) {
+		MovingPlatformComponent* plat = new MovingPlatformComponent(this, attachedPath);
+		m_Components.insert(std::make_pair(COMPONENT_TYPE_MOVING_PLATFORM, plat));
+	}
+
 	//Also check for the collectible id:
 	m_CollectibleID = GetVarAs<int32_t>(u"collectible_id");
 
@@ -454,7 +463,7 @@ void Entity::Initialize() {
 	 */
 
 	CDScriptComponentTable* scriptCompTable = CDClientManager::Instance()->GetTable<CDScriptComponentTable>("ScriptComponent");
-	int32_t scriptComponentID = compRegistryTable->GetByIDAndType(m_TemplateID, COMPONENT_TYPE_SCRIPT, -1);
+	int scriptComponentID = compRegistryTable->GetByIDAndType(m_TemplateID, COMPONENT_TYPE_SCRIPT);
 
 	std::string scriptName = "";
 	bool client = false;
@@ -496,7 +505,7 @@ void Entity::Initialize() {
 		scriptName = customScriptServer;
 	}
 
-	if (!scriptName.empty() || client || m_Character || scriptComponentID >= 0) {
+	if (!scriptName.empty() || client || m_Character) {
 		m_Components.insert(std::make_pair(COMPONENT_TYPE_SCRIPT, new ScriptComponent(this, scriptName, true, client && scriptName.empty())));
 	}
 
@@ -687,26 +696,6 @@ void Entity::Initialize() {
 		m_Components.insert(std::make_pair(COMPONENT_TYPE_MOVEMENT_AI, new MovementAIComponent(this, moveInfo)));
 	}
 
-	std::string pathName = GetVarAsString(u"attached_path");
-	const Path* path = dZoneManager::Instance()->GetZone()->GetPath(pathName);
-
-	//Check to see if we have an attached path and add the appropiate component to handle it:
-	if (path){
-		// if we have a moving platform path, then we need a moving platform component
-		if (path->pathType == PathType::MovingPlatform) {
-			MovingPlatformComponent* plat = new MovingPlatformComponent(this, pathName);
-			m_Components.insert(std::make_pair(COMPONENT_TYPE_MOVING_PLATFORM, plat));
-		// else if we are a movement path
-		} /*else if (path->pathType == PathType::Movement) {
-			auto movementAIcomp = GetComponent<MovementAIComponent>();
-			if (movementAIcomp){
-				// TODO: set path in existing movementAIComp
-			} else {
-				// TODO: create movementAIcomp and set path
-			}
-		}*/
-	}
-
 	int proximityMonitorID = compRegistryTable->GetByIDAndType(m_TemplateID, COMPONENT_TYPE_PROXIMITY_MONITOR);
 	if (proximityMonitorID > 0) {
 		CDProximityMonitorComponentTable* proxCompTable = CDClientManager::Instance()->GetTable<CDProximityMonitorComponentTable>("ProximityMonitorComponent");
@@ -769,8 +758,8 @@ no_ghosting:
 		auto* controllablePhysicsComponent = GetComponent<ControllablePhysicsComponent>();
 		auto* levelComponent = GetComponent<LevelProgressionComponent>();
 
-		if (controllablePhysicsComponent && levelComponent) {
-			controllablePhysicsComponent->SetSpeedMultiplier(levelComponent->GetSpeedBase() / 500.0f);
+		if (controllablePhysicsComponent != nullptr && levelComponent->GetLevel() >= 20) {
+			controllablePhysicsComponent->SetSpeedMultiplier(525.0f / 500.0f);
 		}
 	}
 }

dGame/LeaderboardManager.cpp

@@ -7,7 +7,6 @@
 #include "GameMessages.h"
 #include "dLogger.h"
 #include "dConfig.h"
-#include "CDClientManager.h"
 
 Leaderboard::Leaderboard(uint32_t gameID, uint32_t infoType, bool weekly, std::vector<LeaderboardEntry> entries,
 	LWOOBJID relatedPlayer, LeaderboardType leaderboardType) {

dGame/TradingManager.cpp

@@ -103,7 +103,6 @@ void Trade::SetAccepted(LWOOBJID participant, bool value) {
 		}
 
 		Complete();
-		TradingManager::Instance()->CancelTrade(m_TradeId);
 	}
 }
 
@@ -122,59 +121,33 @@ void Trade::Complete() {
 
 	if (inventoryA == nullptr || inventoryB == nullptr || characterA == nullptr || characterB == nullptr || missionsA == nullptr || missionsB == nullptr) return;
 
-	// First verify both players have the coins and items requested for the trade.
-	if (characterA->GetCoins() < m_CoinsA || characterB->GetCoins() < m_CoinsB) {
-		Game::logger->Log("TradingManager", "Possible coin trade cheating attempt! Aborting trade.");
-		return;
-	}
-
-	for (const auto& tradeItem : m_ItemsA) {
-		auto* itemToRemove = inventoryA->FindItemById(tradeItem.itemId);
-		if (itemToRemove) {
-			if (itemToRemove->GetCount() < tradeItem.itemCount) {
-				Game::logger->Log("TradingManager", "Possible cheating attempt from %s in trading!!! Aborting trade", characterA->GetName().c_str());
-				return;
-			}
-		} else {
-			Game::logger->Log("TradingManager", "Possible cheating attempt from %s in trading due to item not being available!!!", characterA->GetName().c_str());
-			return;
-		}
-	}
-
-	for (const auto& tradeItem : m_ItemsB) {
-		auto* itemToRemove = inventoryB->FindItemById(tradeItem.itemId);
-		if (itemToRemove) {
-			if (itemToRemove->GetCount() < tradeItem.itemCount) {
-				Game::logger->Log("TradingManager", "Possible cheating attempt from %s in trading!!! Aborting trade", characterB->GetName().c_str());
-				return;
-			}
-		} else {
-			Game::logger->Log("TradingManager", "Possible cheating attempt from %s in trading due to item not being available!!!  Aborting trade", characterB->GetName().c_str());
-			return;
-		}
-	}
-
-	// Now actually do the trade.
 	characterA->SetCoins(characterA->GetCoins() - m_CoinsA + m_CoinsB, eLootSourceType::LOOT_SOURCE_TRADE);
 	characterB->SetCoins(characterB->GetCoins() - m_CoinsB + m_CoinsA, eLootSourceType::LOOT_SOURCE_TRADE);
 
 	for (const auto& tradeItem : m_ItemsA) {
-		auto* itemToRemove = inventoryA->FindItemById(tradeItem.itemId);
-		if (itemToRemove) itemToRemove->SetCount(itemToRemove->GetCount() - tradeItem.itemCount);
+		inventoryA->RemoveItem(tradeItem.itemLot, tradeItem.itemCount, INVALID, true);
+
 		missionsA->Progress(MissionTaskType::MISSION_TASK_TYPE_ITEM_COLLECTION, tradeItem.itemLot, LWOOBJID_EMPTY, "", -tradeItem.itemCount);
+	}
+
+	for (const auto& tradeItem : m_ItemsB) {
+		inventoryB->RemoveItem(tradeItem.itemLot, tradeItem.itemCount, INVALID, true);
+
+		missionsB->Progress(MissionTaskType::MISSION_TASK_TYPE_ITEM_COLLECTION, tradeItem.itemLot, LWOOBJID_EMPTY, "", -tradeItem.itemCount);
+	}
+
+	for (const auto& tradeItem : m_ItemsA) {
 		inventoryB->AddItem(tradeItem.itemLot, tradeItem.itemCount, eLootSourceType::LOOT_SOURCE_TRADE);
 	}
 
 	for (const auto& tradeItem : m_ItemsB) {
-		auto* itemToRemove = inventoryB->FindItemById(tradeItem.itemId);
-		if (itemToRemove) itemToRemove->SetCount(itemToRemove->GetCount() - tradeItem.itemCount);
-		missionsB->Progress(MissionTaskType::MISSION_TASK_TYPE_ITEM_COLLECTION, tradeItem.itemLot, LWOOBJID_EMPTY, "", -tradeItem.itemCount);
 		inventoryA->AddItem(tradeItem.itemLot, tradeItem.itemCount, eLootSourceType::LOOT_SOURCE_TRADE);
 	}
 
+	TradingManager::Instance()->CancelTrade(m_TradeId);
+
 	characterA->SaveXMLToDatabase();
 	characterB->SaveXMLToDatabase();
-	return;
 }
 
 void Trade::Cancel() {

dGame/UserManager.cpp

@@ -20,8 +20,6 @@
 #include "Entity.h"
 #include "EntityManager.h"
 #include "SkillComponent.h"
-#include "AssetManager.h"
-#include "CDClientDatabase.h"
 
 UserManager* UserManager::m_Address = nullptr;
 
@@ -34,59 +32,43 @@ inline void StripCR(std::string& str) {
 }
 
 void UserManager::Initialize() {
+	std::string firstNamePath = "./res/names/minifigname_first.txt";
+	std::string middleNamePath = "./res/names/minifigname_middle.txt";
+	std::string lastNamePath = "./res/names/minifigname_last.txt";
 	std::string line;
 
-	AssetMemoryBuffer fnBuff = Game::assetManager->GetFileAsBuffer("names/minifigname_first.txt");
-	if (!fnBuff.m_Success) {
-		Game::logger->Log("UserManager", "Failed to load %s", (Game::assetManager->GetResPath() / "names/minifigname_first.txt").string().c_str());
-		throw std::runtime_error("Aborting initialization due to missing minifigure name file.");
-	}
-	std::istream fnStream = std::istream(&fnBuff);
-	while (std::getline(fnStream, line, '\n')) {
+	std::fstream fnFile(firstNamePath, std::ios::in);
+	std::fstream mnFile(middleNamePath, std::ios::in);
+	std::fstream lnFile(lastNamePath, std::ios::in);
+
+	while (std::getline(fnFile, line, '\n')) {
 		std::string name = line;
 		StripCR(name);
 		m_FirstNames.push_back(name);
 	}
-	fnBuff.close();
 
-	AssetMemoryBuffer mnBuff = Game::assetManager->GetFileAsBuffer("names/minifigname_middle.txt");
-	if (!mnBuff.m_Success) {
-		Game::logger->Log("UserManager", "Failed to load %s", (Game::assetManager->GetResPath() / "names/minifigname_middle.txt").string().c_str());
-		throw std::runtime_error("Aborting initialization due to missing minifigure name file.");
-	}
-	std::istream mnStream = std::istream(&mnBuff);
-	while (std::getline(mnStream, line, '\n')) {
+	while (std::getline(mnFile, line, '\n')) {
 		std::string name = line;
 		StripCR(name);
 		m_MiddleNames.push_back(name);
 	}
-	mnBuff.close();
 
-	AssetMemoryBuffer lnBuff = Game::assetManager->GetFileAsBuffer("names/minifigname_last.txt");
-	if (!lnBuff.m_Success) {
-		Game::logger->Log("UserManager", "Failed to load %s", (Game::assetManager->GetResPath() / "names/minifigname_last.txt").string().c_str());
-		throw std::runtime_error("Aborting initialization due to missing minifigure name file.");
-	}
-	std::istream lnStream = std::istream(&lnBuff);
-	while (std::getline(lnStream, line, '\n')) {
+	while (std::getline(lnFile, line, '\n')) {
 		std::string name = line;
 		StripCR(name);
 		m_LastNames.push_back(name);
 	}
-	lnBuff.close();
+
+	fnFile.close();
+	mnFile.close();
+	lnFile.close();
 
 	//Load our pre-approved names:
-	AssetMemoryBuffer chatListBuff = Game::assetManager->GetFileAsBuffer("chatplus_en_us.txt");
-	if (!chatListBuff.m_Success) {
-		Game::logger->Log("UserManager", "Failed to load %s", (Game::assetManager->GetResPath() / "chatplus_en_us.txt").string().c_str());
-		throw std::runtime_error("Aborting initialization due to missing chat whitelist file.");
-	}
-	std::istream chatListStream = std::istream(&chatListBuff);
-	while (std::getline(chatListStream, line, '\n')) {
+	std::fstream chatList("./res/chatplus_en_us.txt", std::ios::in);
+	while (std::getline(chatList, line, '\n')) {
 		StripCR(line);
 		m_PreapprovedNames.push_back(line);
 	}
-	chatListBuff.close();
 }
 
 UserManager::~UserManager() {
@@ -228,7 +210,6 @@ void UserManager::RequestCharacterList(const SystemAddress& sysAddr) {
 		while (res->next()) {
 			LWOOBJID objID = res->getUInt64(1);
 			Character* character = new Character(uint32_t(objID), u);
-			character->SetIsNewLogin();
 			chars.push_back(character);
 		}
 	}

dGame/dBehaviors/AirMovementBehavior.cpp

@@ -2,16 +2,11 @@
 #include "BehaviorBranchContext.h"
 #include "BehaviorContext.h"
 #include "EntityManager.h"
-#include "Game.h"
-#include "dLogger.h"
 
 void AirMovementBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
-	uint32_t handle{};
+	uint32_t handle;
 
-	if (!bitStream->Read(handle)) {
-		Game::logger->Log("AirMovementBehavior", "Unable to read handle from bitStream, aborting Handle! %i", bitStream->GetNumberOfUnreadBits());
-		return;
-	}
+	bitStream->Read(handle);
 
 	context->RegisterSyncBehavior(handle, this, branch);
 }
@@ -22,20 +17,14 @@ void AirMovementBehavior::Calculate(BehaviorContext* context, RakNet::BitStream*
 	bitStream->Write(handle);
 }
 
-void AirMovementBehavior::Sync(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
-	uint32_t behaviorId{};
+void AirMovementBehavior::Sync(BehaviorContext* context, RakNet::BitStream* bit_stream, BehaviorBranchContext branch) {
+	uint32_t behaviorId;
 
-	if (!bitStream->Read(behaviorId)) {
-		Game::logger->Log("AirMovementBehavior", "Unable to read behaviorId from bitStream, aborting Sync! %i", bitStream->GetNumberOfUnreadBits());
-		return;
-	}
+	bit_stream->Read(behaviorId);
 
-	LWOOBJID target{};
+	LWOOBJID target;
 
-	if (!bitStream->Read(target)) {
-		Game::logger->Log("AirMovementBehavior", "Unable to read target from bitStream, aborting Sync! %i", bitStream->GetNumberOfUnreadBits());
-		return;
-	}
+	bit_stream->Read(target);
 
 	auto* behavior = CreateBehavior(behaviorId);
 
@@ -43,7 +32,7 @@ void AirMovementBehavior::Sync(BehaviorContext* context, RakNet::BitStream* bitS
 		branch.target = target;
 	}
 
-	behavior->Handle(context, bitStream, branch);
+	behavior->Handle(context, bit_stream, branch);
 }
 
 void AirMovementBehavior::Load() {

dGame/dBehaviors/AirMovementBehavior.h

@@ -16,7 +16,7 @@ public:
 
 	void Calculate(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) override;
 
-	void Sync(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) override;
+	void Sync(BehaviorContext* context, RakNet::BitStream* bit_stream, BehaviorBranchContext branch) override;
 
 	void Load() override;
 };

dGame/dBehaviors/AreaOfEffectBehavior.cpp

@@ -9,16 +9,11 @@
 #include "BehaviorContext.h"
 #include "RebuildComponent.h"
 #include "DestroyableComponent.h"
-#include "Game.h"
-#include "dLogger.h"
 
 void AreaOfEffectBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
-	uint32_t targetCount{};
+	uint32_t targetCount;
 
-	if (!bitStream->Read(targetCount)) {
-		Game::logger->Log("AreaOfEffectBehavior", "Unable to read targetCount from bitStream, aborting Handle! %i", bitStream->GetNumberOfUnreadBits());
-		return;
-	}
+	bitStream->Read(targetCount);
 
 	if (targetCount > this->m_maxTargets) {
 		return;
@@ -29,12 +24,9 @@ void AreaOfEffectBehavior::Handle(BehaviorContext* context, RakNet::BitStream* b
 	targets.reserve(targetCount);
 
 	for (auto i = 0u; i < targetCount; ++i) {
-		LWOOBJID target{};
+		LWOOBJID target;
 
-		if (!bitStream->Read(target)) {
-			Game::logger->Log("AreaOfEffectBehavior", "failed to read in target %i from bitStream, aborting target Handle!", i);
-			return;
-		};
+		bitStream->Read(target);
 
 		targets.push_back(target);
 	}
@@ -62,7 +54,7 @@ void AreaOfEffectBehavior::Calculate(BehaviorContext* context, RakNet::BitStream
 	auto* presetTarget = EntityManager::Instance()->GetEntity(branch.target);
 
 	if (presetTarget != nullptr) {
-		if (this->m_radius * this->m_radius >= Vector3::DistanceSquared(reference, presetTarget->GetPosition())) {
+		if (this->m_radius * this->m_radius >= NiPoint3::DistanceSquared(reference, presetTarget->GetPosition())) {
 			targets.push_back(presetTarget);
 		}
 	}
@@ -98,7 +90,7 @@ void AreaOfEffectBehavior::Calculate(BehaviorContext* context, RakNet::BitStream
 			continue;
 		}
 
-		const auto distance = Vector3::DistanceSquared(reference, entity->GetPosition());
+		const auto distance = NiPoint3::DistanceSquared(reference, entity->GetPosition());
 
 		if (this->m_radius * this->m_radius >= distance && (this->m_maxTargets == 0 || targets.size() < this->m_maxTargets)) {
 			targets.push_back(entity);
@@ -106,8 +98,8 @@ void AreaOfEffectBehavior::Calculate(BehaviorContext* context, RakNet::BitStream
 	}
 
 	std::sort(targets.begin(), targets.end(), [reference](Entity* a, Entity* b) {
-		const auto aDistance = Vector3::DistanceSquared(a->GetPosition(), reference);
-		const auto bDistance = Vector3::DistanceSquared(b->GetPosition(), reference);
+		const auto aDistance = NiPoint3::DistanceSquared(a->GetPosition(), reference);
+		const auto bDistance = NiPoint3::DistanceSquared(b->GetPosition(), reference);
 
 		return aDistance > bDistance;
 		});

dGame/dBehaviors/AttackDelayBehavior.cpp

@@ -5,15 +5,12 @@
 #include "dLogger.h"
 
 void AttackDelayBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, const BehaviorBranchContext branch) {
-	uint32_t handle{};
+	uint32_t handle;
 
-	if (!bitStream->Read(handle)) {
-		Game::logger->Log("AttackDelayBehavior", "Unable to read handle from bitStream, aborting Handle! %i", bitStream->GetNumberOfUnreadBits());
-		return;
-	};
+	bitStream->Read(handle);
 
 	for (auto i = 0u; i < this->m_numIntervals; ++i) {
-		context->RegisterSyncBehavior(handle, this, branch, m_ignoreInterrupts);
+		context->RegisterSyncBehavior(handle, this, branch);
 	}
 }
 

dGame/dBehaviors/BasicAttackBehavior.cpp

@@ -14,65 +14,43 @@ void BasicAttackBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bi
 		auto* destroyableComponent = entity->GetComponent<DestroyableComponent>();
 		if (destroyableComponent != nullptr) {
 			PlayFx(u"onhit", entity->GetObjectID());
-			destroyableComponent->Damage(this->m_MaxDamage, context->originator, context->skillID);
+			destroyableComponent->Damage(this->m_maxDamage, context->originator, context->skillID);
 		}
 
-		this->m_OnSuccess->Handle(context, bitStream, branch);
+		this->m_onSuccess->Handle(context, bitStream, branch);
 
 		return;
 	}
 
 	bitStream->AlignReadToByteBoundary();
 
-	uint16_t allocatedBits{};
-	if (!bitStream->Read(allocatedBits) || allocatedBits == 0) {
-		Game::logger->LogDebug("BasicAttackBehavior", "No allocated bits");
-		return;
-	}
-	Game::logger->LogDebug("BasicAttackBehavior", "Number of allocated bits %i", allocatedBits);
+	uint16_t allocatedBits;
+	bitStream->Read(allocatedBits);
+
 	const auto baseAddress = bitStream->GetReadOffset();
-	bool isBlocked{};
-	bool isImmune{};
-	bool isSuccess{};
-
-	if (!bitStream->Read(isBlocked)) {
-		Game::logger->LogDebug("BasicAttackBehavior", "Unable to read isBlocked");
+	if (bitStream->ReadBit()) { // Blocked
 		return;
 	}
 
-	if (isBlocked) return;
-
-	if (!bitStream->Read(isImmune)) {
-		Game::logger->LogDebug("BasicAttackBehavior", "Unable to read isImmune");
+	if (bitStream->ReadBit()) { // Immune
 		return;
 	}
 
-	if (isImmune) return;
+	if (bitStream->ReadBit()) { // Success
+		uint32_t unknown;
+		bitStream->Read(unknown);
 
-	if (bitStream->Read(isSuccess) && isSuccess) { // Success
-		uint32_t unknown{};
-		if (!bitStream->Read(unknown)) {
-			Game::logger->LogDebug("BasicAttackBehavior", "Unable to read unknown");
-			return;
-		}
-
-		uint32_t damageDealt{};
-		if (!bitStream->Read(damageDealt)) {
-			Game::logger->LogDebug("BasicAttackBehavior", "Unable to read damageDealt");
-			return;
-		}
+		uint32_t damageDealt;
+		bitStream->Read(damageDealt);
 
 		// A value that's too large may be a cheating attempt, so we set it to MIN too
-		if (damageDealt > this->m_MaxDamage || damageDealt < this->m_MinDamage) {
-			damageDealt = this->m_MinDamage;
+		if (damageDealt > this->m_maxDamage || damageDealt < this->m_minDamage) {
+			damageDealt = this->m_minDamage;
 		}
 
 		auto* entity = EntityManager::Instance()->GetEntity(branch.target);
-		bool died{};
-		if (!bitStream->Read(died)) {
-			Game::logger->LogDebug("BasicAttackBehavior", "Unable to read died");
-			return;
-		}
+		bool died;
+		bitStream->Read(died);
 
 		if (entity != nullptr) {
 			auto* destroyableComponent = entity->GetComponent<DestroyableComponent>();
@@ -83,18 +61,15 @@ void BasicAttackBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bi
 		}
 	}
 
-	uint8_t successState{};
-	if (!bitStream->Read(successState)) {
-		Game::logger->LogDebug("BasicAttackBehavior", "Unable to read success state");
-		return;
-	}
+	uint8_t successState;
+	bitStream->Read(successState);
 
 	switch (successState) {
 	case 1:
-		this->m_OnSuccess->Handle(context, bitStream, branch);
+		this->m_onSuccess->Handle(context, bitStream, branch);
 		break;
 	default:
-		Game::logger->LogDebug("BasicAttackBehavior", "Unknown success state (%i)!", successState);
+		Game::logger->Log("BasicAttackBehavior", "Unknown success state (%i)!", successState);
 		break;
 	}
 
@@ -104,7 +79,7 @@ void BasicAttackBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bi
 void BasicAttackBehavior::Calculate(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
 	auto* self = EntityManager::Instance()->GetEntity(context->originator);
 	if (self == nullptr) {
-		Game::logger->LogDebug("BasicAttackBehavior", "Invalid self entity (%llu)!", context->originator);
+		Game::logger->Log("BasicAttackBehavior", "Invalid self entity (%llu)!", context->originator);
 		return;
 	}
 
@@ -124,7 +99,7 @@ void BasicAttackBehavior::Calculate(BehaviorContext* context, RakNet::BitStream*
 		uint32_t unknown3 = 0;
 		bitStream->Write(unknown3);
 
-		auto damage = this->m_MinDamage;
+		auto damage = this->m_minDamage;
 		auto* entity = EntityManager::Instance()->GetEntity(branch.target);
 
 		if (entity == nullptr) {
@@ -149,10 +124,10 @@ void BasicAttackBehavior::Calculate(BehaviorContext* context, RakNet::BitStream*
 
 	switch (successState) {
 	case 1:
-		this->m_OnSuccess->Calculate(context, bitStream, branch);
+		this->m_onSuccess->Calculate(context, bitStream, branch);
 		break;
 	default:
-		Game::logger->LogDebug("BasicAttackBehavior", "Unknown success state (%i)!", successState);
+		Game::logger->Log("BasicAttackBehavior", "Unknown success state (%i)!", successState);
 		break;
 	}
 
@@ -165,13 +140,11 @@ void BasicAttackBehavior::Calculate(BehaviorContext* context, RakNet::BitStream*
 }
 
 void BasicAttackBehavior::Load() {
-	this->m_MinDamage = GetInt("min damage");
-	if (this->m_MinDamage == 0) this->m_MinDamage = 1;
+	this->m_minDamage = GetInt("min damage");
+	if (this->m_minDamage == 0) this->m_minDamage = 1;
 
-	this->m_MaxDamage = GetInt("max damage");
-	if (this->m_MaxDamage == 0) this->m_MaxDamage = 1;
+	this->m_maxDamage = GetInt("max damage");
+	if (this->m_maxDamage == 0) this->m_maxDamage = 1;
 
-	this->m_OnSuccess = GetAction("on_success");
-
-	this->m_OnFailArmor = GetAction("on_fail_armor");
+	this->m_onSuccess = GetAction("on_success");
 }

dGame/dBehaviors/BasicAttackBehavior.h

@@ -4,6 +4,12 @@
 class BasicAttackBehavior final : public Behavior
 {
 public:
+	uint32_t m_minDamage;
+
+	uint32_t m_maxDamage;
+
+	Behavior* m_onSuccess;
+
 	explicit BasicAttackBehavior(const uint32_t behaviorId) : Behavior(behaviorId) {
 	}
 
@@ -12,12 +18,4 @@ public:
 	void Calculate(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) override;
 
 	void Load() override;
-private:
-	uint32_t m_MinDamage;
-
-	uint32_t m_MaxDamage;
-
-	Behavior* m_OnSuccess;
-
-	Behavior* m_OnFailArmor;
 };

dGame/dBehaviors/Behavior.cpp

@@ -42,7 +42,6 @@
 #include "SkillCastFailedBehavior.h"
 #include "SpawnBehavior.h"
 #include "ForceMovementBehavior.h"
-#include "RemoveBuffBehavior.h"
 #include "ImmunityBehavior.h"
 #include "InterruptBehavior.h"
 #include "PlayEffectBehavior.h"
@@ -60,7 +59,6 @@
 #include "SpeedBehavior.h"
 #include "DamageReductionBehavior.h"
 #include "JetPackBehavior.h"
-#include "ChangeIdleFlagsBehavior.h"
 
  //CDClient includes
 #include "CDBehaviorParameterTable.h"
@@ -197,9 +195,7 @@ Behavior* Behavior::CreateBehavior(const uint32_t behaviorId) {
 		behavior = new SkillCastFailedBehavior(behaviorId);
 		break;
 	case BehaviorTemplates::BEHAVIOR_IMITATION_SKUNK_STINK: break;
-	case BehaviorTemplates::BEHAVIOR_CHANGE_IDLE_FLAGS:
-		behavior = new ChangeIdleFlagsBehavior(behaviorId);
-		break;
+	case BehaviorTemplates::BEHAVIOR_CHANGE_IDLE_FLAGS: break;
 	case BehaviorTemplates::BEHAVIOR_APPLY_BUFF:
 		behavior = new ApplyBuffBehavior(behaviorId);
 		break;
@@ -230,9 +226,7 @@ Behavior* Behavior::CreateBehavior(const uint32_t behaviorId) {
 		break;
 	case BehaviorTemplates::BEHAVIOR_ALTER_CHAIN_DELAY: break;
 	case BehaviorTemplates::BEHAVIOR_CAMERA: break;
-	case BehaviorTemplates::BEHAVIOR_REMOVE_BUFF:
-		behavior = new RemoveBuffBehavior(behaviorId);
-		break;
+	case BehaviorTemplates::BEHAVIOR_REMOVE_BUFF: break;
 	case BehaviorTemplates::BEHAVIOR_GRAB: break;
 	case BehaviorTemplates::BEHAVIOR_MODULAR_BUILD: break;
 	case BehaviorTemplates::BEHAVIOR_NPC_COMBAT_SKILL:

dGame/dBehaviors/BehaviorContext.cpp

@@ -45,13 +45,12 @@ uint32_t BehaviorContext::GetUniqueSkillId() const {
 }
 
 
-void BehaviorContext::RegisterSyncBehavior(const uint32_t syncId, Behavior* behavior, const BehaviorBranchContext& branchContext, bool ignoreInterrupts) {
+void BehaviorContext::RegisterSyncBehavior(const uint32_t syncId, Behavior* behavior, const BehaviorBranchContext& branchContext) {
 	auto entry = BehaviorSyncEntry();
 
 	entry.handle = syncId;
 	entry.behavior = behavior;
 	entry.branchContext = branchContext;
-	entry.ignoreInterrupts = ignoreInterrupts;
 
 	this->syncEntries.push_back(entry);
 }

dGame/dBehaviors/BehaviorContext.h

@@ -80,7 +80,7 @@ struct BehaviorContext
 
 	uint32_t GetUniqueSkillId() const;
 
-	void RegisterSyncBehavior(uint32_t syncId, Behavior* behavior, const BehaviorBranchContext& branchContext, bool ignoreInterrupts = false);
+	void RegisterSyncBehavior(uint32_t syncId, Behavior* behavior, const BehaviorBranchContext& branchContext);
 
 	void RegisterTimerBehavior(Behavior* behavior, const BehaviorBranchContext& branchContext, LWOOBJID second = LWOOBJID_EMPTY);
 

dGame/dBehaviors/CMakeLists.txt

@@ -12,7 +12,6 @@ set(DGAME_DBEHAVIORS_SOURCES "AirMovementBehavior.cpp"
 	"BuffBehavior.cpp"
 	"CarBoostBehavior.cpp"
 	"ChainBehavior.cpp"
-	"ChangeIdleFlagsBehavior.cpp"
 	"ChangeOrientationBehavior.cpp"
 	"ChargeUpBehavior.cpp"
 	"ClearTargetBehavior.cpp"
@@ -35,7 +34,6 @@ set(DGAME_DBEHAVIORS_SOURCES "AirMovementBehavior.cpp"
 	"PlayEffectBehavior.cpp"
 	"ProjectileAttackBehavior.cpp"
 	"PullToPointBehavior.cpp"
-	"RemoveBuffBehavior.cpp"
 	"RepairBehavior.cpp"
 	"SkillCastFailedBehavior.cpp"
 	"SkillEventBehavior.cpp"

dGame/dBehaviors/ChainBehavior.cpp

@@ -4,19 +4,14 @@
 #include "dLogger.h"
 
 void ChainBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, const BehaviorBranchContext branch) {
-	uint32_t chainIndex{};
+	uint32_t chain_index;
 
-	if (!bitStream->Read(chainIndex)) {
-		Game::logger->Log("ChainBehavior", "Unable to read chainIndex from bitStream, aborting Handle! %i", bitStream->GetNumberOfUnreadBits());
-		return;
-	}
+	bitStream->Read(chain_index);
 
-	chainIndex--;
+	chain_index--;
 
-	if (chainIndex < this->m_behaviors.size()) {
-		this->m_behaviors.at(chainIndex)->Handle(context, bitStream, branch);
-	} else {
-		Game::logger->Log("ChainBehavior", "chainIndex out of bounds, aborting handle of chain %i bits unread %i", chainIndex, bitStream->GetNumberOfUnreadBits());
+	if (chain_index < this->m_behaviors.size()) {
+		this->m_behaviors.at(chain_index)->Handle(context, bitStream, branch);
 	}
 }
 

dGame/dBehaviors/ChangeIdleFlagsBehavior.cpp

@@ -1,37 +0,0 @@
-
-#include "ChangeIdleFlagsBehavior.h"
-#include "BehaviorContext.h"
-#include "BehaviorBranchContext.h"
-
-void ChangeIdleFlagsBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
-	const auto target = branch.target != LWOOBJID_EMPTY ? branch.target : context->originator;
-	if (!target) return;
-
-	GameMessages::SendChangeIdleFlags(target, m_FlagsOn, m_FlagsOff, UNASSIGNED_SYSTEM_ADDRESS);
-
-	if (branch.duration > 0.0f) {
-		context->RegisterTimerBehavior(this, branch);
-	} else if (branch.start > 0) {
-		context->RegisterEndBehavior(this, branch);
-	}
-}
-
-void ChangeIdleFlagsBehavior::Calculate(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
-	Handle(context, bitStream, branch);
-}
-
-void ChangeIdleFlagsBehavior::End(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) {
-	const auto target = branch.target != LWOOBJID_EMPTY ? branch.target : context->originator;
-	if (!target) return;
-	// flip on and off to end behavior
-	GameMessages::SendChangeIdleFlags(target, m_FlagsOff, m_FlagsOn, UNASSIGNED_SYSTEM_ADDRESS);
-}
-
-void ChangeIdleFlagsBehavior::Timer(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) {
-	End(context, branch, second);
-}
-
-void ChangeIdleFlagsBehavior::Load() {
-	m_FlagsOff = static_cast<eAnimationFlags>(GetInt("flags_off", 0));
-	m_FlagsOn = static_cast<eAnimationFlags>(GetInt("flags_on", 0));
-}

dGame/dBehaviors/ChangeIdleFlagsBehavior.h

@@ -1,23 +0,0 @@
-
-#pragma once
-#include "Behavior.h"
-#include "eAninmationFlags.h"
-
-class ChangeIdleFlagsBehavior final : public Behavior {
-public:
-
-	/*
-	 * Inherited
-	 */
-	explicit ChangeIdleFlagsBehavior(const uint32_t behaviorId) : Behavior(behaviorId) {}
-
-	void Calculate(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) override;
-	void Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) override;
-	void Timer(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) override;
-	void End(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) override;
-	void Load() override;
-
-private:
-	eAnimationFlags m_FlagsOff;
-	eAnimationFlags m_FlagsOn;
-};

dGame/dBehaviors/ChargeUpBehavior.cpp

@@ -1,16 +1,12 @@
 #include "ChargeUpBehavior.h"
 #include "BehaviorBranchContext.h"
 #include "BehaviorContext.h"
-#include "Game.h"
 #include "dLogger.h"
 
 void ChargeUpBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, const BehaviorBranchContext branch) {
-	uint32_t handle{};
+	uint32_t handle;
 
-	if (!bitStream->Read(handle)) {
-		Game::logger->Log("ChargeUpBehavior", "Unable to read handle from bitStream, aborting Handle! variable_type");
-		return;
-	};
+	bitStream->Read(handle);
 
 	context->RegisterSyncBehavior(handle, this, branch);
 }

dGame/dBehaviors/ForceMovementBehavior.cpp

@@ -3,34 +3,23 @@
 #include "BehaviorContext.h"
 #include "ControllablePhysicsComponent.h"
 #include "EntityManager.h"
-#include "Game.h"
-#include "dLogger.h"
 
 void ForceMovementBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, const BehaviorBranchContext branch) {
 	if (this->m_hitAction->m_templateId == BehaviorTemplates::BEHAVIOR_EMPTY && this->m_hitEnemyAction->m_templateId == BehaviorTemplates::BEHAVIOR_EMPTY && this->m_hitFactionAction->m_templateId == BehaviorTemplates::BEHAVIOR_EMPTY) {
 		return;
 	}
 
-	uint32_t handle{};
-	if (!bitStream->Read(handle)) {
-		Game::logger->Log("ForceMovementBehavior", "Unable to read handle from bitStream, aborting Handle! %i", bitStream->GetNumberOfUnreadBits());
-		return;
-	}
+	uint32_t handle;
+	bitStream->Read(handle);
 	context->RegisterSyncBehavior(handle, this, branch);
 }
 
 void ForceMovementBehavior::Sync(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
-	uint32_t next{};
-	if (!bitStream->Read(next)) {
-		Game::logger->Log("ForceMovementBehavior", "Unable to read target from bitStream, aborting Sync! %i", bitStream->GetNumberOfUnreadBits());
-		return;
-	}
+	uint32_t next;
+	bitStream->Read(next);
 
-	LWOOBJID target{};
-	if (!bitStream->Read(target)) {
-		Game::logger->Log("ForceMovementBehavior", "Unable to read target from bitStream, aborting Sync! %i", bitStream->GetNumberOfUnreadBits());
-		return;
-	}
+	LWOOBJID target;
+	bitStream->Read(target);
 
 	branch.target = target;
 	auto* behavior = CreateBehavior(next);
@@ -86,5 +75,5 @@ void ForceMovementBehavior::SyncCalculation(BehaviorContext* context, RakNet::Bi
 
 	this->m_hitAction->Calculate(context, bitStream, branch);
 	this->m_hitEnemyAction->Calculate(context, bitStream, branch);
-	this->m_hitFactionAction->Calculate(context, bitStream, branch);
+	this->m_hitEnemyAction->Calculate(context, bitStream, branch);
 }

dGame/dBehaviors/InterruptBehavior.cpp

@@ -11,10 +11,7 @@ void InterruptBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitS
 	if (branch.target != context->originator) {
 		bool unknown = false;
 
-		if (!bitStream->Read(unknown)) {
-			Game::logger->Log("InterruptBehavior", "Unable to read unknown1 from bitStream, aborting Handle! %i", bitStream->GetNumberOfUnreadBits());
-			return;
-		};
+		bitStream->Read(unknown);
 
 		if (unknown) return;
 	}
@@ -22,10 +19,7 @@ void InterruptBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitS
 	if (!this->m_interruptBlock) {
 		bool unknown = false;
 
-		if (!bitStream->Read(unknown)) {
-			Game::logger->Log("InterruptBehavior", "Unable to read unknown2 from bitStream, aborting Handle! %i", bitStream->GetNumberOfUnreadBits());
-			return;
-		};
+		bitStream->Read(unknown);
 
 		if (unknown) return;
 	}
@@ -34,10 +28,7 @@ void InterruptBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitS
 	{
 		bool unknown = false;
 
-		if (!bitStream->Read(unknown)) {
-			Game::logger->Log("InterruptBehavior", "Unable to read unknown3 from bitStream, aborting Handle! %i", bitStream->GetNumberOfUnreadBits());
-			return;
-		};
+		bitStream->Read(unknown);
 	}
 
 	if (branch.target == context->originator) return;

dGame/dBehaviors/KnockbackBehavior.cpp

@@ -6,16 +6,11 @@
 #include "EntityManager.h"
 #include "GameMessages.h"
 #include "DestroyableComponent.h"
-#include "Game.h"
-#include "dLogger.h"
 
 void KnockbackBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
-	bool unknown{};
+	bool unknown;
 
-	if (!bitStream->Read(unknown)) {
-		Game::logger->Log("KnockbackBehavior", "Unable to read unknown from bitStream, aborting Handle! %i", bitStream->GetNumberOfUnreadBits());
-		return;
-	};
+	bitStream->Read(unknown);
 }
 
 void KnockbackBehavior::Calculate(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {

dGame/dBehaviors/MovementSwitchBehavior.cpp

@@ -13,11 +13,9 @@ void MovementSwitchBehavior::Handle(BehaviorContext* context, RakNet::BitStream*
 		return;
 	}
 
-	uint32_t movementType{};
-	if (!bitStream->Read(movementType)) {
-		Game::logger->Log("MovementSwitchBehavior", "Unable to read movementType from bitStream, aborting Handle! %i", bitStream->GetNumberOfUnreadBits());
-		return;
-	};
+	uint32_t movementType;
+
+	bitStream->Read(movementType);
 
 	switch (movementType) {
 	case 1:
@@ -57,3 +55,4 @@ void MovementSwitchBehavior::Load() {
 
 	this->m_jumpAction = GetAction("jump_action");
 }
+

dGame/dBehaviors/OverTimeBehavior.cpp

@@ -6,8 +6,6 @@
 #include "EntityManager.h"
 #include "SkillComponent.h"
 #include "DestroyableComponent.h"
-#include "CDClientDatabase.h"
-#include "CDClientManager.h"
 
 void OverTimeBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
 	const auto originator = context->originator;

dGame/dBehaviors/ProjectileAttackBehavior.cpp

@@ -8,12 +8,9 @@
 #include "../dWorldServer/ObjectIDManager.h"
 
 void ProjectileAttackBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
-	LWOOBJID target{};
+	LWOOBJID target;
 
-	if (!bitStream->Read(target)) {
-		Game::logger->Log("ProjectileAttackBehavior", "Unable to read target from bitStream, aborting Handle! %i", bitStream->GetNumberOfUnreadBits());
-		return;
-	};
+	bitStream->Read(target);
 
 	auto* entity = EntityManager::Instance()->GetEntity(context->originator);
 
@@ -31,23 +28,17 @@ void ProjectileAttackBehavior::Handle(BehaviorContext* context, RakNet::BitStrea
 		return;
 	}
 
-	if (m_ProjectileType == 1) {
+	if (m_useMouseposit) {
 		NiPoint3 targetPosition = NiPoint3::ZERO;
-		if (!bitStream->Read(targetPosition)) {
-			Game::logger->Log("ProjectileAttackBehavior", "Unable to read targetPosition from bitStream, aborting Handle! %i", bitStream->GetNumberOfUnreadBits());
-			return;
-		};
+		bitStream->Read(targetPosition);
 	}
 
 	auto* targetEntity = EntityManager::Instance()->GetEntity(target);
 
 	for (auto i = 0u; i < this->m_projectileCount; ++i) {
-		LWOOBJID projectileId{};
+		LWOOBJID projectileId;
 
-		if (!bitStream->Read(projectileId)) {
-			Game::logger->Log("ProjectileAttackBehavior", "Unable to read projectileId from bitStream, aborting Handle! %i", bitStream->GetNumberOfUnreadBits());
-			return;
-		};
+		bitStream->Read(projectileId);
 
 		branch.target = target;
 		branch.isProjectile = true;
@@ -87,7 +78,7 @@ void ProjectileAttackBehavior::Calculate(BehaviorContext* context, RakNet::BitSt
 
 	const auto position = entity->GetPosition() + this->m_offset;
 
-	const auto distance = Vector3::Distance(position, other->GetPosition());
+	const auto distance = NiPoint3::Distance(position, other->GetPosition());
 
 	const auto time = distance / this->m_projectileSpeed;
 
@@ -107,7 +98,7 @@ void ProjectileAttackBehavior::Calculate(BehaviorContext* context, RakNet::BitSt
 	for (auto i = 0u; i < this->m_projectileCount; ++i) {
 		auto id = static_cast<LWOOBJID>(ObjectIDManager::Instance()->GenerateObjectID());
 
-		id = GeneralUtils::SetBit(id, OBJECT_BIT_SPAWNED);
+		id = GeneralUtils::SetBit(id, OBJECT_BIT_CLIENT);
 
 		bitStream->Write(id);
 
@@ -157,6 +148,4 @@ void ProjectileAttackBehavior::Load() {
 	this->m_trackRadius = GetFloat("track_radius");
 
 	this->m_useMouseposit = GetBoolean("use_mouseposit");
-
-	this->m_ProjectileType = GetInt("projectile_type");
 }

dGame/dBehaviors/ProjectileAttackBehavior.h

@@ -23,8 +23,6 @@ public:
 
 	bool m_useMouseposit;
 
-	int32_t m_ProjectileType;
-
 	/*
 	 * Inherited
 	 */

dGame/dBehaviors/RemoveBuffBehavior.cpp

@@ -1,21 +0,0 @@
-#include "RemoveBuffBehavior.h"
-
-#include "BehaviorBranchContext.h"
-#include "BehaviorContext.h"
-#include "EntityManager.h"
-#include "BuffComponent.h"
-
-void RemoveBuffBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
-	auto* entity = EntityManager::Instance()->GetEntity(context->caster);
-	if (!entity) return;
-
-	auto* buffComponent = entity->GetComponent<BuffComponent>();
-	if (!buffComponent) return;
-
-	buffComponent->RemoveBuff(m_BuffId, false, m_RemoveImmunity);
-}
-
-void RemoveBuffBehavior::Load() {
-	this->m_RemoveImmunity = GetBoolean("remove_immunity");
-	this->m_BuffId = GetInt("buff_id");
-}

dGame/dBehaviors/RemoveBuffBehavior.h

@@ -1,22 +0,0 @@
-#pragma once
-#include "Behavior.h"
-
-class RemoveBuffBehavior final : public Behavior
-{
-public:
-
-	/*
-	 * Inherited
-	 */
-
-	explicit RemoveBuffBehavior(const uint32_t behaviorId) : Behavior(behaviorId) {
-	}
-
-	void Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) override;
-
-	void Load() override;
-
-private:
-	bool m_RemoveImmunity;
-	uint32_t m_BuffId;
-};

dGame/dBehaviors/SpeedBehavior.cpp

@@ -7,44 +7,85 @@
 
 
 void SpeedBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
-	if (m_AffectsCaster) branch.target = context->caster;
+	if (m_AffectsCaster) {
+		branch.target = context->caster;
+	}
 
 	auto* target = EntityManager::Instance()->GetEntity(branch.target);
-	if (!target) return;
+
+	if (target == nullptr) {
+		return;
+	}
 
 	auto* controllablePhysicsComponent = target->GetComponent<ControllablePhysicsComponent>();
-	if (!controllablePhysicsComponent) return;
 
-	controllablePhysicsComponent->AddSpeedboost(m_RunSpeed);
+	if (controllablePhysicsComponent == nullptr) {
+		return;
+	}
+
+	const auto current = controllablePhysicsComponent->GetSpeedMultiplier();
+
+	controllablePhysicsComponent->SetSpeedMultiplier(current + ((m_RunSpeed - 500.0f) / 500.0f));
+
 	EntityManager::Instance()->SerializeEntity(target);
 
 	if (branch.duration > 0.0f) {
 		context->RegisterTimerBehavior(this, branch);
 	} else if (branch.start > 0) {
+		controllablePhysicsComponent->SetIgnoreMultipliers(true);
+
 		context->RegisterEndBehavior(this, branch);
 	}
 }
 
-void SpeedBehavior::Calculate(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
-	Handle(context, bitStream, branch);
+void SpeedBehavior::Timer(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) {
+	auto* target = EntityManager::Instance()->GetEntity(branch.target);
+
+	if (target == nullptr) {
+		return;
+	}
+
+	auto* controllablePhysicsComponent = target->GetComponent<ControllablePhysicsComponent>();
+
+	if (controllablePhysicsComponent == nullptr) {
+		return;
+	}
+
+	const auto current = controllablePhysicsComponent->GetSpeedMultiplier();
+
+	controllablePhysicsComponent->SetSpeedMultiplier(current - ((m_RunSpeed - 500.0f) / 500.0f));
+
+	EntityManager::Instance()->SerializeEntity(target);
 }
 
 void SpeedBehavior::End(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) {
 	auto* target = EntityManager::Instance()->GetEntity(branch.target);
-	if (!target) return;
+
+	if (target == nullptr) {
+		return;
+	}
 
 	auto* controllablePhysicsComponent = target->GetComponent<ControllablePhysicsComponent>();
-	if (!controllablePhysicsComponent) return;
 
-	controllablePhysicsComponent->RemoveSpeedboost(m_RunSpeed);
+	if (controllablePhysicsComponent == nullptr) {
+		return;
+	}
+
+	const auto current = controllablePhysicsComponent->GetSpeedMultiplier();
+
+	controllablePhysicsComponent->SetIgnoreMultipliers(false);
+
+	controllablePhysicsComponent->SetSpeedMultiplier(current - ((m_RunSpeed - 500.0f) / 500.0f));
+
 	EntityManager::Instance()->SerializeEntity(target);
 }
 
-void SpeedBehavior::Timer(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) {
-	End(context, branch, second);
-}
-
 void SpeedBehavior::Load() {
 	m_RunSpeed = GetFloat("run_speed");
+
+	if (m_RunSpeed < 500.0f) {
+		m_RunSpeed = 500.0f;
+	}
+
 	m_AffectsCaster = GetBoolean("affects_caster");
 }

dGame/dBehaviors/SpeedBehavior.h

@@ -13,8 +13,6 @@ public:
 
 	void Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) override;
 
-	void Calculate(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) override;
-
 	void Timer(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) override;
 
 	void End(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) override;

dGame/dBehaviors/StunBehavior.cpp

@@ -14,11 +14,8 @@ void StunBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream
 		return;
 	}
 
-	bool blocked{};
-	if (!bitStream->Read(blocked)) {
-		Game::logger->Log("StunBehavior", "Unable to read blocked from bitStream, aborting Handle! %i", bitStream->GetNumberOfUnreadBits());
-		return;
-	};
+	bool blocked;
+	bitStream->Read(blocked);
 
 	auto* target = EntityManager::Instance()->GetEntity(branch.target);
 

dGame/dBehaviors/SwitchBehavior.cpp

@@ -10,10 +10,7 @@ void SwitchBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStre
 	auto state = true;
 
 	if (this->m_imagination > 0 || !this->m_isEnemyFaction) {
-		if (!bitStream->Read(state)) {
-			Game::logger->Log("SwitchBehavior", "Unable to read state from bitStream, aborting Handle! %i", bitStream->GetNumberOfUnreadBits());
-			return;
-		};
+		bitStream->Read(state);
 	}
 
 	auto* entity = EntityManager::Instance()->GetEntity(context->originator);
@@ -28,7 +25,7 @@ void SwitchBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStre
 		return;
 	}
 
-	Game::logger->LogDebug("SwitchBehavior", "[%i] State: (%d), imagination: (%i) / (%f)", entity->GetLOT(), state, destroyableComponent->GetImagination(), destroyableComponent->GetMaxImagination());
+	Game::logger->Log("SwitchBehavior", "[%i] State: (%d), imagination: (%i) / (%f)", entity->GetLOT(), state, destroyableComponent->GetImagination(), destroyableComponent->GetMaxImagination());
 
 	if (state || (entity->GetLOT() == 8092 && destroyableComponent->GetImagination() >= m_imagination)) {
 		this->m_actionTrue->Handle(context, bitStream, branch);

dGame/dBehaviors/SwitchMultipleBehavior.cpp

@@ -9,13 +9,10 @@
 #include "EntityManager.h"
 
 
-void SwitchMultipleBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
-	float value{};
+void SwitchMultipleBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bit_stream, BehaviorBranchContext branch) {
+	float value;
 
-	if (!bitStream->Read(value)) {
-		Game::logger->Log("SwitchMultipleBehavior", "Unable to read value from bitStream, aborting Handle! %i", bitStream->GetNumberOfUnreadBits());
-		return;
-	};
+	bit_stream->Read(value);
 
 	uint32_t trigger = 0;
 
@@ -33,10 +30,10 @@ void SwitchMultipleBehavior::Handle(BehaviorContext* context, RakNet::BitStream*
 
 	auto* behavior = this->m_behaviors.at(trigger).second;
 
-	behavior->Handle(context, bitStream, branch);
+	behavior->Handle(context, bit_stream, branch);
 }
 
-void SwitchMultipleBehavior::Calculate(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
+void SwitchMultipleBehavior::Calculate(BehaviorContext* context, RakNet::BitStream* bit_stream, BehaviorBranchContext branch) {
 	// TODO
 }
 

dGame/dBehaviors/TacArcBehavior.cpp

@@ -20,18 +20,12 @@ void TacArcBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStre
 
 	bool hit = false;
 
-	if (!bitStream->Read(hit)) {
-		Game::logger->Log("TacArcBehavior", "Unable to read hit from bitStream, aborting Handle! %i", bitStream->GetNumberOfUnreadBits());
-		return;
-	};
+	bitStream->Read(hit);
 
 	if (this->m_checkEnv) {
 		bool blocked = false;
 
-		if (!bitStream->Read(blocked)) {
-			Game::logger->Log("TacArcBehavior", "Unable to read blocked from bitStream, aborting Handle! %i", bitStream->GetNumberOfUnreadBits());
-			return;
-		};
+		bitStream->Read(blocked);
 
 		if (blocked) {
 			this->m_blockedAction->Handle(context, bitStream, branch);
@@ -43,10 +37,7 @@ void TacArcBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStre
 	if (hit) {
 		uint32_t count = 0;
 
-		if (!bitStream->Read(count)) {
-			Game::logger->Log("TacArcBehavior", "Unable to read count from bitStream, aborting Handle! %i", bitStream->GetNumberOfUnreadBits());
-			return;
-		};
+		bitStream->Read(count);
 
 		if (count > m_maxTargets && m_maxTargets > 0) {
 			count = m_maxTargets;
@@ -55,12 +46,9 @@ void TacArcBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStre
 		std::vector<LWOOBJID> targets;
 
 		for (auto i = 0u; i < count; ++i) {
-			LWOOBJID id{};
+			LWOOBJID id;
 
-			if (!bitStream->Read(id)) {
-				Game::logger->Log("TacArcBehavior", "Unable to read id from bitStream, aborting Handle! %i", bitStream->GetNumberOfUnreadBits());
-				return;
-			};
+			bitStream->Read(id);
 
 			targets.push_back(id);
 		}
@@ -166,19 +154,19 @@ void TacArcBehavior::Calculate(BehaviorContext* context, RakNet::BitStream* bitS
 		// reference is the position of the caster.
 		// If we cast a ray forward from the caster, does it come within m_farWidth of the target?
 
-		const auto distance = Vector3::Distance(reference, otherPosition);
+		const auto distance = NiPoint3::Distance(reference, otherPosition);
 
 		if (m_method == 2) {
 			NiPoint3 rayPoint = casterPosition + forward * distance;
 
-			if (m_farWidth > 0 && Vector3::DistanceSquared(rayPoint, otherPosition) > this->m_farWidth * this->m_farWidth) {
+			if (m_farWidth > 0 && NiPoint3::DistanceSquared(rayPoint, otherPosition) > this->m_farWidth * this->m_farWidth) {
 				continue;
 			}
 		}
 
 		auto normalized = (reference - otherPosition) / distance;
 
-		const float degreeAngle = std::abs(Vector3::Angle(forward, normalized) * (180 / 3.14) - 180);
+		const float degreeAngle = std::abs(NiPoint3::Angle(forward, normalized) * (180 / 3.14) - 180);
 
 		if (distance >= this->m_minDistance && this->m_maxDistance >= distance && degreeAngle <= 2 * this->m_angle) {
 			targets.push_back(entity);
@@ -186,8 +174,8 @@ void TacArcBehavior::Calculate(BehaviorContext* context, RakNet::BitStream* bitS
 	}
 
 	std::sort(targets.begin(), targets.end(), [reference](Entity* a, Entity* b) {
-		const auto aDistance = Vector3::DistanceSquared(reference, a->GetPosition());
-		const auto bDistance = Vector3::DistanceSquared(reference, b->GetPosition());
+		const auto aDistance = NiPoint3::DistanceSquared(reference, a->GetPosition());
+		const auto bDistance = NiPoint3::DistanceSquared(reference, b->GetPosition());
 
 		return aDistance > bDistance;
 		});

dGame/dBehaviors/VerifyBehavior.cpp

@@ -23,7 +23,7 @@ void VerifyBehavior::Calculate(BehaviorContext* context, RakNet::BitStream* bitS
 			return;
 		}
 
-		const auto distance = Vector3::DistanceSquared(self->GetPosition(), entity->GetPosition());
+		const auto distance = NiPoint3::DistanceSquared(self->GetPosition(), entity->GetPosition());
 
 		if (distance > this->m_range * this->m_range) {
 			success = false;

dGame/dComponents/BaseCombatAIComponent.cpp

@@ -402,7 +402,7 @@ LWOOBJID BaseCombatAIComponent::FindTarget() {
 	if (target != nullptr && !m_DirtyThreat) {
 		const auto targetPosition = target->GetPosition();
 
-		if (Vector3::DistanceSquared(targetPosition, m_StartPosition) < m_HardTetherRadius * m_HardTetherRadius) {
+		if (NiPoint3::DistanceSquared(targetPosition, m_StartPosition) < m_HardTetherRadius * m_HardTetherRadius) {
 			return m_Target;
 		}
 
@@ -433,7 +433,7 @@ LWOOBJID BaseCombatAIComponent::FindTarget() {
 
 		const auto maxDistanceSquared = m_HardTetherRadius * m_HardTetherRadius;
 
-		if (Vector3::DistanceSquared(targetPosition, m_StartPosition) > maxDistanceSquared) {
+		if (NiPoint3::DistanceSquared(targetPosition, m_StartPosition) > maxDistanceSquared) {
 			if (threat > 0) {
 				SetThreat(entry, 0);
 			}
@@ -448,7 +448,7 @@ LWOOBJID BaseCombatAIComponent::FindTarget() {
 			continue;
 		}
 
-		const auto proximityThreat = -(Vector3::DistanceSquared(targetPosition, reference) - maxDistanceSquared) / 100; // Proximity threat takes last priority
+		const auto proximityThreat = -(NiPoint3::DistanceSquared(targetPosition, reference) - maxDistanceSquared) / 100; // Proximity threat takes last priority
 
 		if (proximityThreat > biggestThreat) {
 			biggestThreat = proximityThreat;
@@ -477,7 +477,7 @@ LWOOBJID BaseCombatAIComponent::FindTarget() {
 
 		const auto targetPosition = entity->GetPosition();
 
-		if (Vector3::DistanceSquared(targetPosition, m_StartPosition) > m_HardTetherRadius * m_HardTetherRadius) {
+		if (NiPoint3::DistanceSquared(targetPosition, m_StartPosition) > m_HardTetherRadius * m_HardTetherRadius) {
 			deadThreats.push_back(threatTarget.first);
 
 			continue;
@@ -508,7 +508,7 @@ std::vector<LWOOBJID> BaseCombatAIComponent::GetTargetWithinAggroRange() const {
 	for (auto id : m_Parent->GetTargetsInPhantom()) {
 		auto* other = EntityManager::Instance()->GetEntity(id);
 
-		const auto distance = Vector3::DistanceSquared(m_Parent->GetPosition(), other->GetPosition());
+		const auto distance = NiPoint3::DistanceSquared(m_Parent->GetPosition(), other->GetPosition());
 
 		if (distance > m_AggroRadius * m_AggroRadius) continue;
 
@@ -657,7 +657,7 @@ void BaseCombatAIComponent::Wander() {
 		destination.y = dpWorld::Instance().GetNavMesh()->GetHeightAtPoint(destination);
 	}
 
-	if (Vector3::DistanceSquared(destination, m_MovementAI->GetCurrentPosition()) < 2 * 2) {
+	if (NiPoint3::DistanceSquared(destination, m_MovementAI->GetCurrentPosition()) < 2 * 2) {
 		m_MovementAI->Stop();
 
 		return;
@@ -685,16 +685,16 @@ void BaseCombatAIComponent::OnAggro() {
 	NiPoint3 currentPos = m_MovementAI->GetCurrentPosition();
 
 	// If the player's position is within range, attack
-	if (Vector3::DistanceSquared(currentPos, targetPos) <= m_AttackRadius * m_AttackRadius) {
+	if (NiPoint3::DistanceSquared(currentPos, targetPos) <= m_AttackRadius * m_AttackRadius) {
 		m_MovementAI->Stop();
-	} else if (Vector3::DistanceSquared(m_StartPosition, targetPos) > m_HardTetherRadius * m_HardTetherRadius) //Return to spawn if we're too far
+	} else if (NiPoint3::DistanceSquared(m_StartPosition, targetPos) > m_HardTetherRadius * m_HardTetherRadius) //Return to spawn if we're too far
 	{
 		m_MovementAI->SetSpeed(m_PursuitSpeed);
 
 		m_MovementAI->SetDestination(m_StartPosition);
 	} else //Chase the player's new position
 	{
-		if (IsMech() && Vector3::DistanceSquared(targetPos, currentPos) > m_AttackRadius * m_AttackRadius * 3 * 3) return;
+		if (IsMech() && NiPoint3::DistanceSquared(targetPos, currentPos) > m_AttackRadius * m_AttackRadius * 3 * 3) return;
 
 		m_MovementAI->SetSpeed(m_PursuitSpeed);
 
@@ -718,9 +718,9 @@ void BaseCombatAIComponent::OnTether() {
 	NiPoint3 targetPos = target->GetPosition();
 	NiPoint3 currentPos = m_MovementAI->ApproximateLocation();
 
-	if (Vector3::DistanceSquared(currentPos, targetPos) <= m_AttackRadius * m_AttackRadius) {
+	if (NiPoint3::DistanceSquared(currentPos, targetPos) <= m_AttackRadius * m_AttackRadius) {
 		m_MovementAI->Stop();
-	} else if (Vector3::DistanceSquared(m_StartPosition, targetPos) > m_HardTetherRadius * m_HardTetherRadius) //Return to spawn if we're too far
+	} else if (NiPoint3::DistanceSquared(m_StartPosition, targetPos) > m_HardTetherRadius * m_HardTetherRadius) //Return to spawn if we're too far
 	{
 		m_MovementAI->SetSpeed(m_PursuitSpeed);
 
@@ -728,7 +728,7 @@ void BaseCombatAIComponent::OnTether() {
 
 		m_State = AiState::aggro;
 	} else {
-		if (IsMech() && Vector3::DistanceSquared(targetPos, currentPos) > m_AttackRadius * m_AttackRadius * 3 * 3) return;
+		if (IsMech() && NiPoint3::DistanceSquared(targetPos, currentPos) > m_AttackRadius * m_AttackRadius * 3 * 3) return;
 
 		m_MovementAI->SetSpeed(m_PursuitSpeed);