Fix Lua and test building

2024-12-24 22:14:36 +02:00 · 2023-10-23 16:05:38 +03:00 · 2023-10-23 16:05:38 +03:00 · ae92bdfb51
commit ae92bdfb51
parent b88a8da4e8
18 changed files with 13 additions and 15 deletions
--- 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

--- 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
--- 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
--- 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
--- a/test/battle/CBattleInfoCallbackTest.cpp
+++ b/test/battle/CBattleInfoCallbackTest.cpp
@ -14,8 +14,6 @@

 #include <vstd/RNG.h>

-#include "../../lib/NetPacksBase.h"
-
 #include "mock/mock_BonusBearer.h"
 #include "mock/mock_battle_IBattleState.h"
 #include "mock/mock_battle_Unit.h"
--- 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;
--- a/test/events/ApplyDamageTest.cpp
+++ b/test/events/ApplyDamageTest.cpp
@ -12,7 +12,7 @@
 #include <vcmi/events/EventBus.h>

 #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"
--- 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"

--- 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
--- 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
 {
--- 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
--- 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"

--- 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"

--- 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
--- a/test/spells/TargetConditionTest.cpp
+++ b/test/spells/TargetConditionTest.cpp
@ -11,7 +11,6 @@

 #include <vstd/RNG.h>

-#include "../../lib/NetPacksBase.h"
 #include "../../lib/spells/TargetCondition.h"
 #include "../../lib/serializer/JsonDeserializer.h"

--- a/test/spells/effects/EffectFixture.cpp
+++ b/test/spells/effects/EffectFixture.cpp
@ -13,7 +13,7 @@

 #include <vstd/RNG.h>

-#include "../../../lib/NetPacks.h"
+#include "../../../lib/networkPacks/PacksForClientBattle.h"

 #include "../../../lib/serializer/JsonDeserializer.h"

--- 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
--- a/test/spells/targetConditions/TargetConditionItemFixture.h
+++ b/test/spells/targetConditions/TargetConditionItemFixture.h
@ -12,7 +12,6 @@

 #include <vstd/RNG.h>

-#include "../../../lib/NetPacksBase.h"
 #include "../../../lib/spells/TargetCondition.h"