Merge pull request #413 from dydzio0614/sr9_vsfix

update VS files to match spellrefactoring9 changes

AI/BattleAI/BattleAI.vcxproj

@@ -135,6 +135,7 @@
     <ClCompile Include="common.cpp" />
     <ClCompile Include="EnemyInfo.cpp" />
     <ClCompile Include="main.cpp" />
+    <ClCompile Include="PossibleSpellcast.cpp" />
     <ClCompile Include="PotentialTargets.cpp" />
     <ClCompile Include="StackWithBonuses.cpp" />
     <ClCompile Include="StdInc.cpp">
@@ -152,6 +153,7 @@
     <ClInclude Include="AttackPossibility.h" />
     <ClInclude Include="common.h" />
     <ClInclude Include="EnemyInfo.h" />
+    <ClInclude Include="PossibleSpellcast.h" />
     <ClInclude Include="PotentialTargets.h" />
     <ClInclude Include="StackWithBonuses.h" />
     <ClInclude Include="StdInc.h" />

client/VCMI_client.vcxproj

@@ -184,7 +184,6 @@
     <ClCompile Include="battle\CBattleInterfaceClasses.cpp" />
     <ClCompile Include="battle\CCreatureAnimation.cpp" />
     <ClCompile Include="CBitmapHandler.cpp" />
-    <ClCompile Include="CDefHandler.cpp" />
     <ClCompile Include="CGameInfo.cpp" />
     <ClCompile Include="Client.cpp" />
     <ClCompile Include="CMessage.cpp" />
@@ -238,7 +237,6 @@
     <ClInclude Include="battle\CBattleInterfaceClasses.h" />
     <ClInclude Include="battle\CCreatureAnimation.h" />
     <ClInclude Include="CBitmapHandler.h" />
-    <ClInclude Include="CDefHandler.h" />
     <ClInclude Include="CGameInfo.h" />
     <ClInclude Include="Client.h" />
     <ClInclude Include="CMessage.h" />

client/VCMI_client.vcxproj.filters

@@ -2,7 +2,6 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="CBitmapHandler.cpp" />
-    <ClCompile Include="CDefHandler.cpp" />
     <ClCompile Include="CGameInfo.cpp" />
     <ClCompile Include="Client.cpp" />
     <ClCompile Include="CMessage.cpp" />
@@ -140,7 +139,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CBitmapHandler.h" />
-    <ClInclude Include="CDefHandler.h" />
     <ClInclude Include="CGameInfo.h" />
     <ClInclude Include="Client.h" />
     <ClInclude Include="CMessage.h" />

lib/VCMI_lib.vcxproj

@@ -175,11 +175,16 @@
     <ClCompile Include="battle\BattleInfo.cpp" />
     <ClCompile Include="battle\AccessibilityInfo.cpp" />
     <ClCompile Include="battle\BattleAttackInfo.cpp" />
+    <ClCompile Include="battle\BattleProxy.cpp" />
     <ClCompile Include="battle\CBattleInfoCallback.cpp" />
     <ClCompile Include="battle\CBattleInfoEssentials.cpp" />
     <ClCompile Include="battle\CCallbackBase.cpp" />
     <ClCompile Include="battle\CPlayerBattleCallback.cpp" />
+    <ClCompile Include="battle\CUnitState.cpp" />
+    <ClCompile Include="battle\Destination.cpp" />
+    <ClCompile Include="battle\IBattleState.cpp" />
     <ClCompile Include="battle\ReachabilityInfo.cpp" />
+    <ClCompile Include="battle\Unit.cpp" />
     <ClCompile Include="CArtHandler.cpp" />
     <ClCompile Include="CBonusTypeHandler.cpp" />
     <ClCompile Include="CBuildingHandler.cpp" />
@@ -217,21 +222,26 @@
     <ClCompile Include="battle\SideInBattle.cpp" />
     <ClCompile Include="battle\SiegeInfo.cpp" />
     <ClCompile Include="spells\CSpellHandler.cpp" />
+    <ClCompile Include="spells\effects\Catapult.cpp" />
+    <ClCompile Include="spells\effects\Dispel.cpp" />
+    <ClCompile Include="spells\effects\Heal.cpp" />
+    <ClCompile Include="spells\effects\Obstacle.cpp" />
+    <ClCompile Include="spells\effects\RemoveObstacle.cpp" />
+    <ClCompile Include="spells\effects\Sacrifice.cpp" />
+    <ClCompile Include="spells\effects\Teleport.cpp" />
+    <ClCompile Include="spells\effects\UnitEffect.cpp" />
     <ClCompile Include="spells\ISpellMechanics.cpp" />
     <ClCompile Include="spells\AdventureSpellMechanics.cpp" />
     <ClCompile Include="spells\BattleSpellMechanics.cpp" />
-    <ClCompile Include="spells\CreatureSpellMechanics.cpp" />
-    <ClCompile Include="spells\CDefaultSpellMechanics.cpp" />
     <ClCompile Include="spells\Problem.cpp" />
+    <ClCompile Include="spells\TargetCondition.cpp" />
     <ClCompile Include="spells\ViewSpellInt.cpp" />
     <ClCompile Include="spells\effects\Effect.cpp" />
     <ClCompile Include="spells\effects\Effects.cpp" />
     <ClCompile Include="spells\effects\Clone.cpp" />
     <ClCompile Include="spells\effects\Damage.cpp" />
-    <ClCompile Include="spells\effects\GlobalEffect.cpp" />
     <ClCompile Include="spells\effects\LocationEffect.cpp" />
     <ClCompile Include="spells\effects\Registry.cpp" />
-    <ClCompile Include="spells\effects\StackEffect.cpp" />
     <ClCompile Include="spells\effects\Summon.cpp" />
     <ClCompile Include="spells\effects\Timed.cpp" />
     <ClCompile Include="filesystem\AdapterLoaders.cpp" />
@@ -315,11 +325,17 @@
     <ClInclude Include="battle\BattleInfo.h" />
     <ClInclude Include="battle\AccessibilityInfo.h" />
     <ClInclude Include="battle\BattleAttackInfo.h" />
+    <ClInclude Include="battle\BattleProxy.h" />
     <ClInclude Include="battle\CBattleInfoCallback.h" />
     <ClInclude Include="battle\CBattleInfoEssentials.h" />
     <ClInclude Include="battle\CCallbackBase.h" />
     <ClInclude Include="battle\CPlayerBattleCallback.h" />
+    <ClInclude Include="battle\CUnitState.h" />
+    <ClInclude Include="battle\Destination.h" />
+    <ClInclude Include="battle\IBattleState.h" />
+    <ClInclude Include="battle\IUnitInfo.h" />
     <ClInclude Include="battle\ReachabilityInfo.h" />
+    <ClInclude Include="battle\Unit.h" />
     <ClInclude Include="CArtHandler.h" />
     <ClInclude Include="CBonusTypeHandler.h" />
     <ClInclude Include="CBuildingHandler.h" />
@@ -432,15 +448,24 @@
     <ClInclude Include="serializer\JsonSerializer.h" />
     <ClInclude Include="battle\SideInBattle.h" />
     <ClInclude Include="battle\SiegeInfo.h" />
+    <ClInclude Include="serializer\JsonTreeSerializer.h" />
     <ClInclude Include="spells\AdventureSpellMechanics.h" />
     <ClInclude Include="spells\BattleSpellMechanics.h" />
-    <ClInclude Include="spells\CDefaultSpellMechanics.h" />
-    <ClInclude Include="spells\CreatureSpellMechanics.h" />
     <ClInclude Include="spells\CSpellHandler.h" />
+    <ClInclude Include="spells\effects\Catapult.h" />
+    <ClInclude Include="spells\effects\Dispel.h" />
+    <ClInclude Include="spells\effects\EffectsFwd.h" />
+    <ClInclude Include="spells\effects\Heal.h" />
+    <ClInclude Include="spells\effects\Obstacle.h" />
+    <ClInclude Include="spells\effects\RemoveObstacle.h" />
+    <ClInclude Include="spells\effects\Sacrifice.h" />
+    <ClInclude Include="spells\effects\Teleport.h" />
+    <ClInclude Include="spells\effects\UnitEffect.h" />
     <ClInclude Include="spells\ISpellMechanics.h" />
     <ClInclude Include="spells\Magic.h" />
     <ClInclude Include="spells\SpellMechanics.h" />
     <ClInclude Include="spells\Problem.h" />
+    <ClInclude Include="spells\TargetCondition.h" />
     <ClInclude Include="spells\ViewSpellInt.h" />
     <ClInclude Include="spells\effects\Effect.h" />
     <ClInclude Include="spells\effects\Effects.h" />

lib/VCMI_lib.vcxproj.filters

@@ -32,6 +32,9 @@
     <Filter Include="battle">
       <UniqueIdentifier>{d18aad99-ef40-484a-b317-8f7a36d975fc}</UniqueIdentifier>
     </Filter>
+    <Filter Include="spells\effects">
+      <UniqueIdentifier>{a3de4952-3c98-4c1a-bc4b-bd3eeaa82ba7}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="CArtHandler.cpp" />
@@ -201,9 +204,6 @@
     <ClCompile Include="spells\AdventureSpellMechanics.cpp">
       <Filter>spells</Filter>
     </ClCompile>
-    <ClCompile Include="spells\CDefaultSpellMechanics.cpp">
-      <Filter>spells</Filter>
-    </ClCompile>
     <ClCompile Include="spells\CSpellHandler.cpp">
       <Filter>spells</Filter>
     </ClCompile>
@@ -216,9 +216,6 @@
     <ClCompile Include="spells\BattleSpellMechanics.cpp">
       <Filter>spells</Filter>
     </ClCompile>
-    <ClCompile Include="spells\CreatureSpellMechanics.cpp">
-      <Filter>spells</Filter>
-    </ClCompile>
     <ClCompile Include="mapping\CDrawRoadsOperation.cpp" />
     <ClCompile Include="CPathfinder.cpp" />
     <ClCompile Include="registerTypes\TypesMapObjects1.cpp">
@@ -314,6 +311,75 @@
       <Filter>serializer</Filter>
     </ClCompile>
     <ClCompile Include="CSkillHandler.cpp" />
+    <ClCompile Include="battle\BattleProxy.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
+    <ClCompile Include="battle\CUnitState.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
+    <ClCompile Include="battle\Destination.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
+    <ClCompile Include="battle\IBattleState.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
+    <ClCompile Include="battle\Unit.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
+    <ClCompile Include="spells\TargetCondition.cpp">
+      <Filter>spells</Filter>
+    </ClCompile>
+    <ClCompile Include="spells\effects\Catapult.cpp">
+      <Filter>spells\effects</Filter>
+    </ClCompile>
+    <ClCompile Include="spells\effects\Dispel.cpp">
+      <Filter>spells\effects</Filter>
+    </ClCompile>
+    <ClCompile Include="spells\effects\Heal.cpp">
+      <Filter>spells\effects</Filter>
+    </ClCompile>
+    <ClCompile Include="spells\effects\Obstacle.cpp">
+      <Filter>spells\effects</Filter>
+    </ClCompile>
+    <ClCompile Include="spells\effects\RemoveObstacle.cpp">
+      <Filter>spells\effects</Filter>
+    </ClCompile>
+    <ClCompile Include="spells\effects\Sacrifice.cpp">
+      <Filter>spells\effects</Filter>
+    </ClCompile>
+    <ClCompile Include="spells\effects\Teleport.cpp">
+      <Filter>spells\effects</Filter>
+    </ClCompile>
+    <ClCompile Include="spells\effects\UnitEffect.cpp">
+      <Filter>spells\effects</Filter>
+    </ClCompile>
+    <ClCompile Include="spells\effects\Clone.cpp">
+      <Filter>spells\effects</Filter>
+    </ClCompile>
+    <ClCompile Include="spells\effects\Damage.cpp">
+      <Filter>spells\effects</Filter>
+    </ClCompile>
+    <ClCompile Include="spells\effects\Effect.cpp">
+      <Filter>spells\effects</Filter>
+    </ClCompile>
+    <ClCompile Include="spells\effects\Effects.cpp">
+      <Filter>spells\effects</Filter>
+    </ClCompile>
+    <ClCompile Include="spells\effects\LocationEffect.cpp">
+      <Filter>spells\effects</Filter>
+    </ClCompile>
+    <ClCompile Include="spells\effects\Registry.cpp">
+      <Filter>spells\effects</Filter>
+    </ClCompile>
+    <ClCompile Include="spells\effects\Summon.cpp">
+      <Filter>spells\effects</Filter>
+    </ClCompile>
+    <ClCompile Include="spells\effects\Timed.cpp">
+      <Filter>spells\effects</Filter>
+    </ClCompile>
+    <ClCompile Include="spells\Problem.cpp">
+      <Filter>spells</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CCreatureSet.h">
@@ -583,9 +649,6 @@
     <ClInclude Include="spells\BattleSpellMechanics.h">
       <Filter>spells</Filter>
     </ClInclude>
-    <ClInclude Include="spells\CreatureSpellMechanics.h">
-      <Filter>spells</Filter>
-    </ClInclude>
     <ClInclude Include="spells\CSpellHandler.h">
       <Filter>spells</Filter>
     </ClInclude>
@@ -595,9 +658,6 @@
     <ClInclude Include="spells\ViewSpellInt.h">
       <Filter>spells</Filter>
     </ClInclude>
-    <ClInclude Include="spells\CDefaultSpellMechanics.h">
-      <Filter>spells</Filter>
-    </ClInclude>
     <ClInclude Include="spells\SpellMechanics.h">
       <Filter>spells</Filter>
     </ClInclude>
@@ -739,5 +799,89 @@
     <ClInclude Include="CSkillHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="spells\effects\GlobalEffect.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="spells\effects\StackEffect.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="serializer\JsonTreeSerializer.h">
+      <Filter>serializer</Filter>
+    </ClInclude>
+    <ClInclude Include="battle\BattleProxy.h">
+      <Filter>battle</Filter>
+    </ClInclude>
+    <ClInclude Include="battle\CUnitState.h">
+      <Filter>battle</Filter>
+    </ClInclude>
+    <ClInclude Include="battle\Destination.h">
+      <Filter>battle</Filter>
+    </ClInclude>
+    <ClInclude Include="battle\IBattleState.h">
+      <Filter>battle</Filter>
+    </ClInclude>
+    <ClInclude Include="battle\IUnitInfo.h">
+      <Filter>battle</Filter>
+    </ClInclude>
+    <ClInclude Include="battle\Unit.h">
+      <Filter>battle</Filter>
+    </ClInclude>
+    <ClInclude Include="spells\TargetCondition.h">
+      <Filter>spells</Filter>
+    </ClInclude>
+    <ClInclude Include="spells\effects\Catapult.h">
+      <Filter>spells\effects</Filter>
+    </ClInclude>
+    <ClInclude Include="spells\effects\Dispel.h">
+      <Filter>spells\effects</Filter>
+    </ClInclude>
+    <ClInclude Include="spells\effects\EffectsFwd.h">
+      <Filter>spells\effects</Filter>
+    </ClInclude>
+    <ClInclude Include="spells\effects\Heal.h">
+      <Filter>spells\effects</Filter>
+    </ClInclude>
+    <ClInclude Include="spells\effects\Obstacle.h">
+      <Filter>spells\effects</Filter>
+    </ClInclude>
+    <ClInclude Include="spells\effects\RemoveObstacle.h">
+      <Filter>spells\effects</Filter>
+    </ClInclude>
+    <ClInclude Include="spells\effects\Sacrifice.h">
+      <Filter>spells\effects</Filter>
+    </ClInclude>
+    <ClInclude Include="spells\effects\Teleport.h">
+      <Filter>spells\effects</Filter>
+    </ClInclude>
+    <ClInclude Include="spells\effects\UnitEffect.h">
+      <Filter>spells\effects</Filter>
+    </ClInclude>
+    <ClInclude Include="spells\effects\Clone.h">
+      <Filter>spells\effects</Filter>
+    </ClInclude>
+    <ClInclude Include="spells\effects\Damage.h">
+      <Filter>spells\effects</Filter>
+    </ClInclude>
+    <ClInclude Include="spells\effects\Effect.h">
+      <Filter>spells\effects</Filter>
+    </ClInclude>
+    <ClInclude Include="spells\effects\Effects.h">
+      <Filter>spells\effects</Filter>
+    </ClInclude>
+    <ClInclude Include="spells\effects\LocationEffect.h">
+      <Filter>spells\effects</Filter>
+    </ClInclude>
+    <ClInclude Include="spells\effects\Registry.h">
+      <Filter>spells\effects</Filter>
+    </ClInclude>
+    <ClInclude Include="spells\effects\Summon.h">
+      <Filter>spells\effects</Filter>
+    </ClInclude>
+    <ClInclude Include="spells\effects\Timed.h">
+      <Filter>spells\effects</Filter>
+    </ClInclude>
+    <ClInclude Include="spells\Problem.h">
+      <Filter>spells</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>