Compilation fixes for MSVS

CCallback.cpp

@@ -18,6 +18,7 @@
 #include "lib/GameConstants.h"
 #include "lib/CPlayerState.h"
 #include "lib/UnlockGuard.h"
+#include "lib/BattleInfo.h"
 
 /*
  * CCallback.cpp, part of VCMI engine

lib/VCMI_lib.vcxproj

@@ -169,7 +169,7 @@
   <ItemGroup>
     <ClCompile Include="BattleAction.cpp" />
     <ClCompile Include="BattleHex.cpp" />
-    <ClCompile Include="BattleState.cpp" />
+    <ClCompile Include="BattleInfo.cpp" />
     <ClCompile Include="CArtHandler.cpp" />
     <ClCompile Include="CBonusTypeHandler.cpp" />
     <ClCompile Include="CBuildingHandler.cpp" />
@@ -184,6 +184,7 @@
     <ClCompile Include="CModHandler.cpp" />
     <ClCompile Include="CObstacleInstance.cpp" />
     <ClCompile Include="CPathfinder.cpp" />
+    <ClCompile Include="CStack.cpp" />
     <ClCompile Include="CThreadHelper.cpp" />
     <ClCompile Include="CTownHandler.cpp" />
     <ClCompile Include="CRandomGenerator.cpp" />
@@ -202,6 +203,8 @@
     <ClCompile Include="serializer\JsonDeserializer.cpp" />
     <ClCompile Include="serializer\JsonSerializeFormat.cpp" />
     <ClCompile Include="serializer\JsonSerializer.cpp" />
+    <ClCompile Include="SideInBattle.cpp" />
+    <ClCompile Include="SiegeInfo.cpp" />
     <ClCompile Include="spells\CSpellHandler.cpp" />
     <ClCompile Include="spells\ISpellMechanics.cpp" />
     <ClCompile Include="spells\AdventureSpellMechanics.cpp" />
@@ -288,7 +291,7 @@
     <ClInclude Include="AI_Base.h" />
     <ClInclude Include="BattleAction.h" />
     <ClInclude Include="BattleHex.h" />
-    <ClInclude Include="BattleState.h" />
+    <ClInclude Include="BattleInfo.h" />
     <ClInclude Include="CArtHandler.h" />
     <ClInclude Include="CBonusTypeHandler.h" />
     <ClInclude Include="CBuildingHandler.h" />
@@ -310,6 +313,7 @@
     <ClInclude Include="CRandomGenerator.h" />
     <ClInclude Include="CScriptingModule.h" />
     <ClInclude Include="CSoundBase.h" />
+    <ClInclude Include="CStack.h" />
     <ClInclude Include="CStopWatch.h" />
     <ClInclude Include="CThreadHelper.h" />
     <ClInclude Include="CTownHandler.h" />
@@ -398,6 +402,8 @@
     <ClInclude Include="serializer\JsonDeserializer.h" />
     <ClInclude Include="serializer\JsonSerializeFormat.h" />
     <ClInclude Include="serializer\JsonSerializer.h" />
+    <ClInclude Include="SideInBattle.h" />
+    <ClInclude Include="SiegeInfo.h" />
     <ClInclude Include="spells\AdventureSpellMechanics.h" />
     <ClInclude Include="spells\BattleSpellMechanics.h" />
     <ClInclude Include="spells\CDefaultSpellMechanics.h" />

lib/VCMI_lib.vcxproj.filters

@@ -32,7 +32,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="BattleAction.cpp" />
-    <ClCompile Include="BattleState.cpp" />
     <ClCompile Include="CArtHandler.cpp" />
     <ClCompile Include="CBuildingHandler.cpp" />
     <ClCompile Include="CCreatureHandler.cpp" />
@@ -261,6 +260,10 @@
     <ClCompile Include="serializer\CSerializer.cpp" />
     <ClCompile Include="serializer\CTypeList.cpp" />
     <ClCompile Include="serializer\Connection.cpp" />
+    <ClCompile Include="CStack.cpp" />
+    <ClCompile Include="SideInBattle.cpp" />
+    <ClCompile Include="SiegeInfo.cpp" />
+    <ClCompile Include="BattleInfo.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CCreatureSet.h">
@@ -317,9 +320,6 @@
     <ClInclude Include="BattleAction.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="BattleState.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="CObstacleInstance.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -656,5 +656,17 @@
     <ClInclude Include="serializer\Connection.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="BattleInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CStack.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SideInBattle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SiegeInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>