improve: fix circular dependencies in weapons.hpp

opentibiabr · Nov 9, 2024 · f9af834 · f9af834
1 parent 5646317
commit f9af834
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 2 deletions.
diff --git a/src/creatures/combat/combat.cpp b/src/creatures/combat/combat.cpp
@@ -27,6 +27,7 @@
 #include "lua/callbacks/events_callbacks.hpp"
 #include "lua/creature/events.hpp"
 #include "map/spectators.hpp"
+#include "creatures/players/player.hpp"
 
 int32_t Combat::getLevelFormula(const std::shared_ptr<Player> &player, const std::shared_ptr<Spell> &wheelSpell, const CombatDamage &damage) const {
 	if (!player) {

diff --git a/src/items/weapons/weapons.cpp b/src/items/weapons/weapons.cpp
@@ -13,8 +13,8 @@
 #include "creatures/combat/combat.hpp"
 #include "game/game.hpp"
 #include "lua/creature/events.hpp"
-
 #include "lua/global/lua_variant.hpp"
+#include "creatures/players/player.hpp"
 
 Weapons::Weapons() = default;
 Weapons::~Weapons() = default;

diff --git a/src/items/weapons/weapons.hpp b/src/items/weapons/weapons.hpp
@@ -10,7 +10,6 @@
 #pragma once
 
 #include "lua/scripts/luascript.hpp"
-#include "creatures/players/player.hpp"
 #include "lua/scripts/scripts.hpp"
 #include "creatures/combat/combat.hpp"
 #include "utils/utils_definitions.hpp"

diff --git a/src/lua/functions/core/game/game_functions.cpp b/src/lua/functions/core/game/game_functions.cpp
@@ -28,6 +28,7 @@
 #include "lua/functions/events/event_callback_functions.hpp"
 #include "lua/scripts/lua_environment.hpp"
 #include "map/spectators.hpp"
+#include "creatures/players/player.hpp"
 
 // Game
 int GameFunctions::luaGameCreateMonsterType(lua_State* L) {

diff --git a/src/lua/functions/core/game/global_functions.cpp b/src/lua/functions/core/game/global_functions.cpp
@@ -22,6 +22,7 @@
 #include "lua/scripts/lua_environment.hpp"
 #include "lua/scripts/script_environment.hpp"
 #include "server/network/protocol/protocolstatus.hpp"
+#include "creatures/players/player.hpp"
 
 void GlobalFunctions::init(lua_State* L) {
 	lua_register(L, "addEvent", GlobalFunctions::luaAddEvent);

diff --git a/src/lua/functions/creatures/combat/combat_functions.cpp b/src/lua/functions/creatures/combat/combat_functions.cpp
@@ -14,6 +14,7 @@
 #include "game/game.hpp"
 #include "lua/global/lua_variant.hpp"
 #include "lua/scripts/lua_environment.hpp"
+#include "creatures/players/player.hpp"
 
 int CombatFunctions::luaCombatCreate(lua_State* L) {
 	// Combat()