fix: circular inclusion related to network/protocol/connection (#2924)

Bug Fixes and Improvements • Fixed a minor bug in the unit test. • Improved the tests build and run scripts. • Removed all redundant pch.hpp includes from the .cpp files as the directive ```target_precompile_headers(${PROJECT_NAME}_lib PUBLIC pch.hpp)``` now handles that automatically. • Added the precompiled file correctly in the visual studio solution • Resolved several circular dependencies involving the following components: - Connection - KV - Protocol
opentibiabr · Sep 29, 2024 · e938b75 · e938b75
1 parent 899c1eb
commit e938b75
Show file tree

Hide file tree

Showing 198 changed files with 486 additions and 674 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -125,6 +125,6 @@ option(RUN_TESTS_AFTER_BUILD "Run tests when building" OFF) # By default, tests
 # *****************************************************************************
 add_subdirectory(src)
 
-if(BUILD_TESTS)
+if(BUILD_TESTS OR PACKAGE_TESTS)
     add_subdirectory(tests)
 endif()
diff --git a/cmake/modules/CanaryLib.cmake b/cmake/modules/CanaryLib.cmake
@@ -23,9 +23,7 @@ add_subdirectory(utils)
 target_sources(${PROJECT_NAME}_lib PRIVATE canary_server.cpp)
 
 # Add public pre compiler header to lib, to pass down to related targets
-if (NOT SPEED_UP_BUILD_UNITY)
-    target_precompile_headers(${PROJECT_NAME}_lib PUBLIC pch.hpp)
-endif()
+target_precompile_headers(${PROJECT_NAME}_lib PUBLIC pch.hpp)
 
 if(NOT SPEED_UP_BUILD_UNITY AND USE_PRECOMPILED_HEADERS)
     target_compile_definitions(${PROJECT_NAME}_lib PUBLIC -DUSE_PRECOMPILED_HEADERS)

diff --git a/src/account/account.cpp b/src/account/account.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "account/account.hpp"
 
 #include "account/account_repository_db.hpp"

diff --git a/src/account/account_repository.cpp b/src/account/account_repository.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "account/account_repository.hpp"
 
 #include "lib/di/container.hpp"

diff --git a/src/account/account_repository_db.cpp b/src/account/account_repository_db.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "account/account_repository_db.hpp"
 
 #include "database/database.hpp"

diff --git a/src/canary_server.cpp b/src/canary_server.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "canary_server.hpp"
 
 #include "declarations.hpp"

diff --git a/src/config/configmanager.cpp b/src/config/configmanager.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "config/configmanager.hpp"
 #include "lib/di/container.hpp"
 #include "game/game.hpp"

diff --git a/src/creatures/appearance/mounts/mounts.cpp b/src/creatures/appearance/mounts/mounts.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/appearance/mounts/mounts.hpp"
 #include "game/game.hpp"
 #include "utils/pugicast.hpp"

diff --git a/src/creatures/appearance/outfit/outfit.cpp b/src/creatures/appearance/outfit/outfit.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/appearance/outfit/outfit.hpp"
 #include "utils/pugicast.hpp"
 #include "utils/tools.hpp"

diff --git a/src/creatures/combat/combat.cpp b/src/creatures/combat/combat.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "declarations.hpp"
 #include "creatures/combat/combat.hpp"
 #include "lua/creature/events.hpp"

diff --git a/src/creatures/combat/condition.cpp b/src/creatures/combat/condition.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/combat/condition.hpp"
 #include "game/game.hpp"
 #include "game/scheduling/dispatcher.hpp"

diff --git a/src/creatures/combat/spells.cpp b/src/creatures/combat/spells.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/combat/combat.hpp"
 #include "creatures/combat/spells.hpp"
 #include "creatures/monsters/monster.hpp"

diff --git a/src/creatures/creature.cpp b/src/creatures/creature.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/creature.hpp"
 #include "declarations.hpp"
 #include "game/scheduling/dispatcher.hpp"

diff --git a/src/creatures/interactions/chat.cpp b/src/creatures/interactions/chat.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/interactions/chat.hpp"
 #include "game/game.hpp"
 #include "utils/pugicast.hpp"

diff --git a/src/creatures/monsters/monster.cpp b/src/creatures/monsters/monster.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/monsters/monster.hpp"
 #include "creatures/combat/spells.hpp"
 #include "creatures/players/wheel/player_wheel.hpp"

diff --git a/src/creatures/monsters/monsters.cpp b/src/creatures/monsters/monsters.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/monsters/monsters.hpp"
 
 #include "creatures/combat/spells.hpp"

diff --git a/src/creatures/monsters/spawns/spawn_monster.cpp b/src/creatures/monsters/spawns/spawn_monster.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/monsters/spawns/spawn_monster.hpp"
 #include "game/game.hpp"
 #include "creatures/monsters/monster.hpp"

diff --git a/src/creatures/npcs/npc.cpp b/src/creatures/npcs/npc.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/npcs/npc.hpp"
 #include "creatures/npcs/npcs.hpp"
 #include "declarations.hpp"

diff --git a/src/creatures/npcs/npcs.cpp b/src/creatures/npcs/npcs.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "declarations.hpp"
 #include "creatures/combat/combat.hpp"
 #include "lua/scripts/lua_environment.hpp"

diff --git a/src/creatures/npcs/spawns/spawn_npc.cpp b/src/creatures/npcs/spawns/spawn_npc.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/npcs/spawns/spawn_npc.hpp"
 #include "creatures/npcs/npc.hpp"
 #include "game/game.hpp"

diff --git a/src/creatures/players/achievement/player_achievement.cpp b/src/creatures/players/achievement/player_achievement.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "player_achievement.hpp"
 
 #include "creatures/players/player.hpp"

diff --git a/src/creatures/players/cyclopedia/player_badge.cpp b/src/creatures/players/cyclopedia/player_badge.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "player_badge.hpp"
 
 #include "creatures/players/player.hpp"

diff --git a/src/creatures/players/cyclopedia/player_cyclopedia.cpp b/src/creatures/players/cyclopedia/player_cyclopedia.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "player_cyclopedia.hpp"
 
 #include "database/databasetasks.hpp"

diff --git a/src/creatures/players/cyclopedia/player_title.cpp b/src/creatures/players/cyclopedia/player_title.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "player_title.hpp"
 
 #include "creatures/players/player.hpp"

diff --git a/src/creatures/players/grouping/familiars.cpp b/src/creatures/players/grouping/familiars.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/players/grouping/familiars.hpp"
 #include "lib/di/container.hpp"
 #include "config/configmanager.hpp"

diff --git a/src/creatures/players/grouping/groups.cpp b/src/creatures/players/grouping/groups.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "config/configmanager.hpp"
 #include "game/game.hpp"
 #include "creatures/players/grouping/groups.hpp"

diff --git a/src/creatures/players/grouping/guild.cpp b/src/creatures/players/grouping/guild.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/players/grouping/guild.hpp"
 #include "game/game.hpp"
 

diff --git a/src/creatures/players/grouping/party.cpp b/src/creatures/players/grouping/party.cpp
@@ -9,8 +9,6 @@
 
 #include <utility>
 
-#include "pch.hpp"
-
 #include "creatures/players/grouping/party.hpp"
 #include "game/game.hpp"
 #include "lua/creature/events.hpp"

diff --git a/src/creatures/players/imbuements/imbuements.cpp b/src/creatures/players/imbuements/imbuements.cpp
@@ -7,7 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
 #include "creatures/players/imbuements/imbuements.hpp"
 #include "lua/creature/events.hpp"
 #include "utils/pugicast.hpp"

diff --git a/src/creatures/players/management/ban.cpp b/src/creatures/players/management/ban.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/players/management/ban.hpp"
 #include "database/database.hpp"
 #include "database/databasetasks.hpp"

diff --git a/src/creatures/players/management/waitlist.cpp b/src/creatures/players/management/waitlist.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/players/management/waitlist.hpp"
 #include "game/game.hpp"
 

diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/combat/combat.hpp"
 #include "creatures/interactions/chat.hpp"
 #include "creatures/monsters/monster.hpp"
@@ -6206,7 +6204,9 @@ void Player::sendIcons() {
 	// Remove the last icon so that Bakragore's is added
 	auto iconSet = getClientIcons();
 	if (iconSet.size() >= 9 && iconBakragore != IconBakragore::None) {
-		iconSet.erase(std::prev(iconSet.end()));
+		std::vector<PlayerIcon> tempVector(iconSet.begin(), iconSet.end());
+		tempVector.pop_back();
+		iconSet = std::unordered_set<PlayerIcon>(tempVector.begin(), tempVector.end());
 	}
 
 	client->sendIcons(iconSet, iconBakragore);

diff --git a/src/creatures/players/storages/storages.cpp b/src/creatures/players/storages/storages.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/players/storages/storages.hpp"
 
 #include "config/configmanager.hpp"

diff --git a/src/creatures/players/vip/player_vip.cpp b/src/creatures/players/vip/player_vip.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/players/vip/player_vip.hpp"
 
 #include "io/iologindata.hpp"

diff --git a/src/creatures/players/vocations/vocation.cpp b/src/creatures/players/vocations/vocation.cpp
@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/players/vocations/vocation.hpp"
 
 #include "utils/pugicast.hpp"

diff --git a/src/creatures/players/wheel/player_wheel.cpp b/src/creatures/players/wheel/player_wheel.cpp
@@ -7,17 +7,16 @@
  * Website: https://docs.opentibiabr.org/
  */
 
-#include "pch.hpp"
-
 #include "creatures/players/wheel/player_wheel.hpp"
 
+#include "config/configmanager.hpp"
 #include "io/io_wheel.hpp"
-
 #include "game/game.hpp"
+#include "server/network/message/networkmessage.hpp"
 #include "creatures/players/player.hpp"
 #include "creatures/combat/spells.hpp"
-
-#include "config/configmanager.hpp"
+#include "kv/kv.hpp"
+#include "creatures/players/wheel/wheel_gems.hpp"
 
 const static std::vector<WheelGemBasicModifier_t> wheelGemBasicSlot1Allowed = {
 	WheelGemBasicModifier_t::General_FireResistance,
@@ -3151,3 +3150,46 @@ WheelGemBasicModifier_t PlayerWheel::selectBasicModifier2(WheelGemBasicModifier_
 	}
 	return modifier;
 }
+
+void PlayerWheelGem::save(const std::shared_ptr<KV> &kv) const {
+	kv->scoped("revealed")->set(uuid, serialize());
+}
+void PlayerWheelGem::remove(const std::shared_ptr<KV> &kv) const {
+	kv->scoped("revealed")->remove(uuid);
+}
+
+PlayerWheelGem PlayerWheelGem::load(const std::shared_ptr<KV> &kv, const std::string &uuid) {
+	auto val = kv->scoped("revealed")->get(uuid);
+	if (!val || !val.has_value()) {
+		return {};
+	}
+	return deserialize(uuid, val.value());
+}
+
+ValueWrapper PlayerWheelGem::serialize() const {
+	return {
+		{ "uuid", uuid },
+		{ "locked", locked },
+		{ "affinity", static_cast<IntType>(affinity) },
+		{ "quality", static_cast<IntType>(quality) },
+		{ "basicModifier1", static_cast<IntType>(basicModifier1) },
+		{ "basicModifier2", static_cast<IntType>(basicModifier2) },
+		{ "supremeModifier", static_cast<IntType>(supremeModifier) }
+	};
+}
+
+PlayerWheelGem PlayerWheelGem::deserialize(const std::string &uuid, const ValueWrapper &val) {
+	auto map = val.get<MapType>();
+	if (map.empty()) {
+		return {};
+	}
+	return {
+		uuid,
+		map["locked"]->get<BooleanType>(),
+		static_cast<WheelGemAffinity_t>(map["affinity"]->get<IntType>()),
+		static_cast<WheelGemQuality_t>(map["quality"]->get<IntType>()),
+		static_cast<WheelGemBasicModifier_t>(map["basicModifier1"]->get<IntType>()),
+		static_cast<WheelGemBasicModifier_t>(map["basicModifier2"]->get<IntType>()),
+		static_cast<WheelGemSupremeModifier_t>(map["supremeModifier"]->get<IntType>())
+	};
+}