Fix Lua and test building

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
 

scripting/lua/api/netpacks/BattleStackMoved.h

@@ -12,6 +12,8 @@
 
 #include "PackForClient.h"
 
+#include "../../../../lib/networkPacks/PacksForClientBattle.h"
+
 VCMI_LIB_NAMESPACE_BEGIN
 
 namespace scripting

scripting/lua/api/netpacks/BattleUnitsChanged.h

@@ -12,6 +12,8 @@
 
 #include "PackForClient.h"
 
+#include "../../../../lib/networkPacks/PacksForClientBattle.h"
+
 VCMI_LIB_NAMESPACE_BEGIN
 
 namespace scripting

scripting/lua/api/netpacks/SetResources.h

@@ -12,6 +12,8 @@
 
 #include "PackForClient.h"
 
+#include "../../../../lib/networkPacks/PacksForClient.h"
+
 VCMI_LIB_NAMESPACE_BEGIN
 
 namespace scripting

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"

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;

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"

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"
 

test/mock/BattleFake.h

@@ -20,7 +20,6 @@
 #endif
 
 #include "../../lib/JsonNode.h"
-#include "../../lib/NetPacksBase.h"
 #include "../../lib/battle/CBattleInfoCallback.h"
 
 namespace test

test/netpacks/EntitiesChangedTest.cpp

@@ -11,6 +11,7 @@
 #include "StdInc.h"
 
 #include "NetPackFixture.h"
+#include "../../lib/networkPacks/PacksForClient.h"
 
 namespace test
 {

test/netpacks/NetPackFixture.h

@@ -10,7 +10,6 @@
 
 #pragma once
 
-#include "../../lib/NetPacks.h"
 #include "../../lib/gameState/CGameState.h"
 
 namespace test

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"
 

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"
 

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

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"
 

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"
 

test/spells/effects/EffectFixture.h

@@ -34,7 +34,6 @@
 
 
 #include "../../../lib/JsonNode.h"
-#include "../../../lib/NetPacksBase.h"
 #include "../../../lib/battle/CBattleInfoCallback.h"
 
 namespace battle

test/spells/targetConditions/TargetConditionItemFixture.h

@@ -12,7 +12,6 @@
 
 #include <vstd/RNG.h>
 
-#include "../../../lib/NetPacksBase.h"
 #include "../../../lib/spells/TargetCondition.h"