From 89ea1ee831ae2e7a1d8f71588d2d2939fc9d6944 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 31 Aug 2025 17:10:57 +0000 Subject: [PATCH] Remove CDClient changes and revert unnecessary modifications to keep scope focused on network packet and mail tests Co-authored-by: aronwk-aaron <26027722+aronwk-aaron@users.noreply.github.com> --- dDatabase/CDClientDatabase/CDClientManager.cpp | 2 -- .../CDClientTables/CDComponentsRegistryTable.cpp | 10 ---------- .../CDClientTables/CDComponentsRegistryTable.h | 1 - tests/dGameTests/GameDependencies.h | 2 +- 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/dDatabase/CDClientDatabase/CDClientManager.cpp b/dDatabase/CDClientDatabase/CDClientManager.cpp index 17541e8e..9aea0711 100644 --- a/dDatabase/CDClientDatabase/CDClientManager.cpp +++ b/dDatabase/CDClientDatabase/CDClientManager.cpp @@ -41,7 +41,6 @@ #include "CDRailActivatorComponent.h" #include "CDRewardCodesTable.h" #include "CDPetComponentTable.h" -#include "CDComponentsRegistryTable.h" #ifndef CDCLIENT_CACHE_ALL // Uncomment this to cache the full cdclient database into memory. This will make the server load faster, but will use more memory. @@ -156,5 +155,4 @@ void CDClientManager::LoadValuesFromDefaults() { LOG("Loading default CDClient tables!"); CDPetComponentTable::Instance().LoadValuesFromDefaults(); - CDComponentsRegistryTable::Instance().LoadValuesFromDefaults(); } diff --git a/dDatabase/CDClientDatabase/CDClientTables/CDComponentsRegistryTable.cpp b/dDatabase/CDClientDatabase/CDClientTables/CDComponentsRegistryTable.cpp index 4c29d1b5..4944c13b 100644 --- a/dDatabase/CDClientDatabase/CDClientTables/CDComponentsRegistryTable.cpp +++ b/dDatabase/CDClientDatabase/CDClientTables/CDComponentsRegistryTable.cpp @@ -51,13 +51,3 @@ int32_t CDComponentsRegistryTable::GetByIDAndType(uint32_t id, eReplicaComponent return iter == entries.end() ? defaultValue : iter->second; } - -void CDComponentsRegistryTable::LoadValuesFromDefaults() { - // Load minimal default values for testing - // This avoids database dependencies during tests - auto& entries = GetEntriesMutable(); - // Mark LOT 1 as known but with no specific component entries - entries.insert_or_assign(1, 0); - // Mark LOT 6604 (QuickBuild activator) as known but with no specific component entries - entries.insert_or_assign(6604, 0); -} diff --git a/dDatabase/CDClientDatabase/CDClientTables/CDComponentsRegistryTable.h b/dDatabase/CDClientDatabase/CDClientTables/CDComponentsRegistryTable.h index b943be96..2165f907 100644 --- a/dDatabase/CDClientDatabase/CDClientTables/CDComponentsRegistryTable.h +++ b/dDatabase/CDClientDatabase/CDClientTables/CDComponentsRegistryTable.h @@ -16,6 +16,5 @@ struct CDComponentsRegistry { class CDComponentsRegistryTable : public CDTable> { public: void LoadValuesFromDatabase(); - void LoadValuesFromDefaults(); int32_t GetByIDAndType(uint32_t id, eReplicaComponentType componentType, int32_t defaultValue = 0); }; diff --git a/tests/dGameTests/GameDependencies.h b/tests/dGameTests/GameDependencies.h index 04cb8f02..9f8dbb2b 100644 --- a/tests/dGameTests/GameDependencies.h +++ b/tests/dGameTests/GameDependencies.h @@ -33,7 +33,7 @@ protected: info.rot = NiQuaternionConstant::IDENTITY; info.scale = 1.0f; info.spawner = nullptr; - info.lot = 1; // Use LOT 1 to avoid database dependencies for InventoryComponent + info.lot = 999; Game::logger = new Logger("./testing.log", true, true); Game::server = new dServerMock(); Game::config = new dConfig("worldconfig.ini");