diff --git a/scripting/lua/api/ServerCb.cpp b/scripting/lua/api/ServerCb.cpp index 1d0f9d501..aa257c6e9 100644 --- a/scripting/lua/api/ServerCb.cpp +++ b/scripting/lua/api/ServerCb.cpp @@ -14,7 +14,7 @@ #include "Registry.h" #include "../LuaStack.h" -#include "../../../lib/NetPacks.h" +#include "../../../lib/networkPacks/PacksForClientBattle.h" VCMI_LIB_NAMESPACE_BEGIN diff --git a/scripting/lua/api/netpacks/BattleStackMoved.h b/scripting/lua/api/netpacks/BattleStackMoved.h index 3926a737e..a0fc9a9e4 100644 --- a/scripting/lua/api/netpacks/BattleStackMoved.h +++ b/scripting/lua/api/netpacks/BattleStackMoved.h @@ -12,6 +12,8 @@ #include "PackForClient.h" +#include "../../../../lib/networkPacks/PacksForClientBattle.h" + VCMI_LIB_NAMESPACE_BEGIN namespace scripting diff --git a/scripting/lua/api/netpacks/BattleUnitsChanged.h b/scripting/lua/api/netpacks/BattleUnitsChanged.h index 2344076e3..83837f814 100644 --- a/scripting/lua/api/netpacks/BattleUnitsChanged.h +++ b/scripting/lua/api/netpacks/BattleUnitsChanged.h @@ -12,6 +12,8 @@ #include "PackForClient.h" +#include "../../../../lib/networkPacks/PacksForClientBattle.h" + VCMI_LIB_NAMESPACE_BEGIN namespace scripting diff --git a/scripting/lua/api/netpacks/SetResources.h b/scripting/lua/api/netpacks/SetResources.h index d58908240..4b35ef6f6 100644 --- a/scripting/lua/api/netpacks/SetResources.h +++ b/scripting/lua/api/netpacks/SetResources.h @@ -12,6 +12,8 @@ #include "PackForClient.h" +#include "../../../../lib/networkPacks/PacksForClient.h" + VCMI_LIB_NAMESPACE_BEGIN namespace scripting diff --git a/test/battle/CBattleInfoCallbackTest.cpp b/test/battle/CBattleInfoCallbackTest.cpp index 391401b05..5cef1f907 100644 --- a/test/battle/CBattleInfoCallbackTest.cpp +++ b/test/battle/CBattleInfoCallbackTest.cpp @@ -14,8 +14,6 @@ #include -#include "../../lib/NetPacksBase.h" - #include "mock/mock_BonusBearer.h" #include "mock/mock_battle_IBattleState.h" #include "mock/mock_battle_Unit.h" diff --git a/test/battle/CHealthTest.cpp b/test/battle/CHealthTest.cpp index 6ea80a7d9..ac32cee5e 100644 --- a/test/battle/CHealthTest.cpp +++ b/test/battle/CHealthTest.cpp @@ -12,7 +12,6 @@ #include "mock/mock_battle_Unit.h" #include "mock/mock_BonusBearer.h" #include "../../lib/battle/CUnitState.h" -#include "../../lib/NetPacksBase.h" using namespace testing; using namespace battle; diff --git a/test/events/ApplyDamageTest.cpp b/test/events/ApplyDamageTest.cpp index 7df90298b..b396ccd44 100644 --- a/test/events/ApplyDamageTest.cpp +++ b/test/events/ApplyDamageTest.cpp @@ -12,7 +12,7 @@ #include #include "../../lib/events/ApplyDamage.h" -#include "../../lib/NetPacks.h" +#include "../../lib/networkPacks/PacksForClientBattle.h" #include "../mock/mock_Environment.h" #include "../mock/mock_battle_Unit.h" diff --git a/test/game/CGameStateTest.cpp b/test/game/CGameStateTest.cpp index 0141bc2a7..42e595eec 100644 --- a/test/game/CGameStateTest.cpp +++ b/test/game/CGameStateTest.cpp @@ -16,7 +16,8 @@ #include "../../lib/VCMIDirs.h" #include "../../lib/gameState/CGameState.h" -#include "../../lib/NetPacks.h" +#include "../../lib/networkPacks/PacksForClient.h" +#include "../../lib/networkPacks/PacksForClientBattle.h" #include "../../lib/StartInfo.h" #include "../../lib/TerrainHandler.h" diff --git a/test/mock/BattleFake.h b/test/mock/BattleFake.h index cb265e008..8ce30c38f 100644 --- a/test/mock/BattleFake.h +++ b/test/mock/BattleFake.h @@ -20,7 +20,6 @@ #endif #include "../../lib/JsonNode.h" -#include "../../lib/NetPacksBase.h" #include "../../lib/battle/CBattleInfoCallback.h" namespace test diff --git a/test/netpacks/EntitiesChangedTest.cpp b/test/netpacks/EntitiesChangedTest.cpp index adb6b0647..e4423176a 100644 --- a/test/netpacks/EntitiesChangedTest.cpp +++ b/test/netpacks/EntitiesChangedTest.cpp @@ -11,6 +11,7 @@ #include "StdInc.h" #include "NetPackFixture.h" +#include "../../lib/networkPacks/PacksForClient.h" namespace test { diff --git a/test/netpacks/NetPackFixture.h b/test/netpacks/NetPackFixture.h index 2e995cba1..176d37e21 100644 --- a/test/netpacks/NetPackFixture.h +++ b/test/netpacks/NetPackFixture.h @@ -10,7 +10,6 @@ #pragma once -#include "../../lib/NetPacks.h" #include "../../lib/gameState/CGameState.h" namespace test diff --git a/test/scripting/LuaSpellEffectAPITest.cpp b/test/scripting/LuaSpellEffectAPITest.cpp index 0a477f41b..8040b99df 100644 --- a/test/scripting/LuaSpellEffectAPITest.cpp +++ b/test/scripting/LuaSpellEffectAPITest.cpp @@ -11,7 +11,7 @@ #include "ScriptFixture.h" -#include "../../lib/NetPacks.h" +#include "../../lib/networkPacks/PacksForClientBattle.h" #include "../mock/mock_ServerCallback.h" diff --git a/test/scripting/ScriptFixture.h b/test/scripting/ScriptFixture.h index 4d7b780bc..ea9f0cbe3 100644 --- a/test/scripting/ScriptFixture.h +++ b/test/scripting/ScriptFixture.h @@ -16,7 +16,6 @@ #include "../../lib/JsonNode.h" #include "../../lib/ScriptHandler.h" -#include "../../lib/NetPacksBase.h" #include "../../lib/battle/CBattleInfoCallback.h" #include "../../lib/bonuses/Bonus.h" diff --git a/test/spells/AbilityCasterTest.cpp b/test/spells/AbilityCasterTest.cpp index 1172c4ca3..02c3a9e44 100644 --- a/test/spells/AbilityCasterTest.cpp +++ b/test/spells/AbilityCasterTest.cpp @@ -13,7 +13,6 @@ #include "mock/mock_BonusBearer.h" #include "mock/mock_spells_Spell.h" -#include "../../lib/NetPacksBase.h" #include "../../lib/spells/AbilityCaster.h" namespace test diff --git a/test/spells/TargetConditionTest.cpp b/test/spells/TargetConditionTest.cpp index 88abf7fcd..2f6f604fb 100644 --- a/test/spells/TargetConditionTest.cpp +++ b/test/spells/TargetConditionTest.cpp @@ -11,7 +11,6 @@ #include -#include "../../lib/NetPacksBase.h" #include "../../lib/spells/TargetCondition.h" #include "../../lib/serializer/JsonDeserializer.h" diff --git a/test/spells/effects/EffectFixture.cpp b/test/spells/effects/EffectFixture.cpp index 0395700aa..2b122d85e 100644 --- a/test/spells/effects/EffectFixture.cpp +++ b/test/spells/effects/EffectFixture.cpp @@ -13,7 +13,7 @@ #include -#include "../../../lib/NetPacks.h" +#include "../../../lib/networkPacks/PacksForClientBattle.h" #include "../../../lib/serializer/JsonDeserializer.h" diff --git a/test/spells/effects/EffectFixture.h b/test/spells/effects/EffectFixture.h index bc07ae1fa..dde8e9a2d 100644 --- a/test/spells/effects/EffectFixture.h +++ b/test/spells/effects/EffectFixture.h @@ -34,7 +34,6 @@ #include "../../../lib/JsonNode.h" -#include "../../../lib/NetPacksBase.h" #include "../../../lib/battle/CBattleInfoCallback.h" namespace battle diff --git a/test/spells/targetConditions/TargetConditionItemFixture.h b/test/spells/targetConditions/TargetConditionItemFixture.h index 060731fb5..67df578a4 100644 --- a/test/spells/targetConditions/TargetConditionItemFixture.h +++ b/test/spells/targetConditions/TargetConditionItemFixture.h @@ -12,7 +12,6 @@ #include -#include "../../../lib/NetPacksBase.h" #include "../../../lib/spells/TargetCondition.h"