- Fixed VS project files (added missing .cpp files)

- Structured VS project files (added a filter for every subfolder)

AI/VCAI/VCAI.vcxproj

@@ -91,7 +91,7 @@
       </AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile>
-      <AdditionalOptions>/Zm150 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zm195 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>VCMI_lib.lib;FuzzyLite.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -138,7 +138,9 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="AIUtility.cpp" />
     <ClCompile Include="Fuzzy.cpp" />
+    <ClCompile Include="Goals.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="StdInc.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
@@ -149,7 +151,9 @@
     <ClCompile Include="VCAI.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="AIUtility.h" />
     <ClInclude Include="Fuzzy.h" />
+    <ClInclude Include="Goals.h" />
     <ClInclude Include="StdInc.h" />
     <ClInclude Include="VCAI.h" />
   </ItemGroup>

client/VCMI_client.vcxproj.filters

@@ -26,17 +26,39 @@
     <ClCompile Include="NetPacksClient.cpp" />
     <ClCompile Include="StdInc.cpp" />
     <ClCompile Include="CQuestLog.cpp" />
-    <ClCompile Include="battle\CBattleAnimations.cpp" />
-    <ClCompile Include="battle\CBattleInterface.cpp" />
-    <ClCompile Include="battle\CBattleInterfaceClasses.cpp" />
-    <ClCompile Include="battle\CCreatureAnimation.cpp" />
-    <ClCompile Include="gui\CCursorHandler.cpp" />
-    <ClCompile Include="gui\CGuiHandler.cpp" />
-    <ClCompile Include="gui\CIntObject.cpp" />
-    <ClCompile Include="gui\CIntObjectClasses.cpp" />
-    <ClCompile Include="gui\Fonts.cpp" />
-    <ClCompile Include="gui\Geometries.cpp" />
-    <ClCompile Include="gui\SDL_Extensions.cpp" />
+    <ClCompile Include="battle\CBattleAnimations.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
+    <ClCompile Include="battle\CBattleInterface.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
+    <ClCompile Include="battle\CBattleInterfaceClasses.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
+    <ClCompile Include="battle\CCreatureAnimation.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
+    <ClCompile Include="gui\CCursorHandler.cpp">
+      <Filter>gui</Filter>
+    </ClCompile>
+    <ClCompile Include="gui\CGuiHandler.cpp">
+      <Filter>gui</Filter>
+    </ClCompile>
+    <ClCompile Include="gui\CIntObject.cpp">
+      <Filter>gui</Filter>
+    </ClCompile>
+    <ClCompile Include="gui\CIntObjectClasses.cpp">
+      <Filter>gui</Filter>
+    </ClCompile>
+    <ClCompile Include="gui\Fonts.cpp">
+      <Filter>gui</Filter>
+    </ClCompile>
+    <ClCompile Include="gui\Geometries.cpp">
+      <Filter>gui</Filter>
+    </ClCompile>
+    <ClCompile Include="gui\SDL_Extensions.cpp">
+      <Filter>gui</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Global.h" />
@@ -69,18 +91,42 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClInclude Include="mapHandler.h" />
-    <ClInclude Include="battle\CBattleAnimations.h" />
-    <ClInclude Include="battle\CBattleInterface.h" />
-    <ClInclude Include="battle\CBattleInterfaceClasses.h" />
-    <ClInclude Include="battle\CCreatureAnimation.h" />
-    <ClInclude Include="gui\CCursorHandler.h" />
-    <ClInclude Include="gui\CGuiHandler.h" />
-    <ClInclude Include="gui\CIntObject.h" />
-    <ClInclude Include="gui\CIntObjectClasses.h" />
-    <ClInclude Include="gui\Fonts.h" />
-    <ClInclude Include="gui\Geometries.h" />
-    <ClInclude Include="gui\SDL_Extensions.h" />
-    <ClInclude Include="gui\SDL_Pixels.h" />
+    <ClInclude Include="battle\CBattleAnimations.h">
+      <Filter>battle</Filter>
+    </ClInclude>
+    <ClInclude Include="battle\CBattleInterface.h">
+      <Filter>battle</Filter>
+    </ClInclude>
+    <ClInclude Include="battle\CBattleInterfaceClasses.h">
+      <Filter>battle</Filter>
+    </ClInclude>
+    <ClInclude Include="battle\CCreatureAnimation.h">
+      <Filter>battle</Filter>
+    </ClInclude>
+    <ClInclude Include="gui\CCursorHandler.h">
+      <Filter>gui</Filter>
+    </ClInclude>
+    <ClInclude Include="gui\CGuiHandler.h">
+      <Filter>gui</Filter>
+    </ClInclude>
+    <ClInclude Include="gui\CIntObject.h">
+      <Filter>gui</Filter>
+    </ClInclude>
+    <ClInclude Include="gui\CIntObjectClasses.h">
+      <Filter>gui</Filter>
+    </ClInclude>
+    <ClInclude Include="gui\Fonts.h">
+      <Filter>gui</Filter>
+    </ClInclude>
+    <ClInclude Include="gui\Geometries.h">
+      <Filter>gui</Filter>
+    </ClInclude>
+    <ClInclude Include="gui\SDL_Extensions.h">
+      <Filter>gui</Filter>
+    </ClInclude>
+    <ClInclude Include="gui\SDL_Pixels.h">
+      <Filter>gui</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="VCMI_client.rc" />
@@ -92,4 +138,12 @@
     <None Include="..\ChangeLog" />
     <None Include="vcmi.ico" />
   </ItemGroup>
-</Project>
+  <ItemGroup>
+    <Filter Include="battle">
+      <UniqueIdentifier>{c25dc848-6e1b-4a9b-b6f2-517626e9a23d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="gui">
+      <UniqueIdentifier>{cec5376d-0f32-475e-bf51-3dbae35c6b98}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>

lib/VCMI_lib.vcxproj

@@ -195,7 +195,9 @@
     <ClCompile Include="filesystem\CMemoryStream.cpp" />
     <ClCompile Include="filesystem\CZipLoader.cpp" />
     <ClCompile Include="filesystem\Filesystem.cpp" />
+    <ClCompile Include="filesystem\ResourceID.cpp" />
     <ClCompile Include="GameConstants.cpp" />
+    <ClCompile Include="JsonDetail.cpp" />
     <ClCompile Include="mapping\CCampaignHandler.cpp" />
     <ClCompile Include="mapping\CMap.cpp" />
     <ClCompile Include="mapping\CMapInfo.cpp" />
@@ -272,8 +274,10 @@
     <ClInclude Include="filesystem\CZipLoader.h" />
     <ClInclude Include="filesystem\Filesystem.h" />
     <ClInclude Include="filesystem\ISimpleResourceLoader.h" />
-	<ClInclude Include="FunctionList.h" />
+    <ClInclude Include="filesystem\ResourceID.h" />
+    <ClInclude Include="FunctionList.h" />
     <ClInclude Include="IBonusTypeHandler.h" />
+    <ClInclude Include="JsonDetail.h" />
     <ClInclude Include="mapping\CCampaignHandler.h" />
     <ClInclude Include="mapping\CMap.h" />
     <ClInclude Include="mapping\CMapInfo.h" />
@@ -309,4 +313,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

lib/VCMI_lib.vcxproj.filters

@@ -8,9 +8,18 @@
     <Filter Include="Source Files">
       <UniqueIdentifier>{132126f1-89bb-4505-a77e-d4c3a18103be}</UniqueIdentifier>
     </Filter>
-    <Filter Include="RMG">
+    <Filter Include="filesystem">
+      <UniqueIdentifier>{a2ca6977-50bf-4585-aa6e-779a10863922}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="logging">
+      <UniqueIdentifier>{230979a5-fbea-4d21-b2a6-cf476ebc123d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="rmg">
       <UniqueIdentifier>{8ba33e2e-2971-4873-9c49-128c34147a38}</UniqueIdentifier>
     </Filter>
+    <Filter Include="mapping">
+      <UniqueIdentifier>{401483eb-380a-4e36-b532-207491622703}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="BattleAction.cpp" />
@@ -39,52 +48,90 @@
     <ClCompile Include="CThreadHelper.cpp" />
     <ClCompile Include="StdInc.cpp" />
     <ClCompile Include="CObstacleInstance.cpp" />
-    <ClCompile Include="Filesystem\CBinaryReader.cpp" />
-    <ClCompile Include="Filesystem\CFileInfo.cpp" />
-    <ClCompile Include="Filesystem\CFileInputStream.cpp" />
-    <ClCompile Include="Filesystem\CFilesystemLoader.cpp" />
-    <ClCompile Include="Filesystem\CMemoryStream.cpp" />
-    <ClCompile Include="Filesystem\CCompressedStream.cpp" />
     <ClCompile Include="CModHandler.cpp" />
     <ClCompile Include="CConfigHandler.cpp" />
     <ClCompile Include="CBattleCallback.cpp" />
     <ClCompile Include="Mapping\CCampaignHandler.cpp" />
-    <ClCompile Include="Mapping\CMap.cpp" />
-    <ClCompile Include="Mapping\CMapInfo.cpp" />
-    <ClCompile Include="Mapping\CMapService.cpp" />
-    <ClCompile Include="Mapping\CMapEditManager.cpp" />
-    <ClCompile Include="Mapping\MapFormatH3M.cpp" />
     <ClCompile Include="GameConstants.cpp" />
     <ClCompile Include="RegisterTypes.cpp" />
     <ClCompile Include="VCMIDirs.cpp" />
     <ClCompile Include="CBonusTypeHandler.cpp" />
-    <ClCompile Include="logging\CBasicLogConfigurator.cpp" />
-    <ClCompile Include="logging\CLogger.cpp" />
-    <ClCompile Include="filesystem\AdapterLoaders.cpp" />
-    <ClCompile Include="filesystem\CArchiveLoader.cpp" />
-    <ClCompile Include="filesystem\Filesystem.cpp" />
-    <ClCompile Include="filesystem\CZipLoader.cpp" />
     <ClCompile Include="rmg\CRmgTemplate.cpp">
-      <Filter>RMG</Filter>
+      <Filter>rmg</Filter>
     </ClCompile>
     <ClCompile Include="rmg\CRmgTemplateStorage.cpp">
-      <Filter>RMG</Filter>
+      <Filter>rmg</Filter>
     </ClCompile>
     <ClCompile Include="rmg\CRmgTemplateZone.cpp">
-      <Filter>RMG</Filter>
+      <Filter>rmg</Filter>
     </ClCompile>
     <ClCompile Include="rmg\CZonePlacer.cpp">
-      <Filter>RMG</Filter>
+      <Filter>rmg</Filter>
     </ClCompile>
     <ClCompile Include="RMG\CMapGenerator.cpp">
-      <Filter>RMG</Filter>
+      <Filter>rmg</Filter>
     </ClCompile>
     <ClCompile Include="rmg\CMapGenOptions.cpp">
-      <Filter>RMG</Filter>
+      <Filter>rmg</Filter>
     </ClCompile>
     <ClCompile Include="rmg\CZoneGraphGenerator.cpp">
-      <Filter>RMG</Filter>
+      <Filter>rmg</Filter>
+    </ClCompile>
+    <ClCompile Include="filesystem\Filesystem.cpp">
+      <Filter>filesystem</Filter>
+    </ClCompile>
+    <ClCompile Include="filesystem\CZipLoader.cpp">
+      <Filter>filesystem</Filter>
+    </ClCompile>
+    <ClCompile Include="filesystem\CMemoryStream.cpp">
+      <Filter>filesystem</Filter>
+    </ClCompile>
+    <ClCompile Include="filesystem\CFilesystemLoader.cpp">
+      <Filter>filesystem</Filter>
+    </ClCompile>
+    <ClCompile Include="filesystem\CFileInputStream.cpp">
+      <Filter>filesystem</Filter>
+    </ClCompile>
+    <ClCompile Include="filesystem\CFileInfo.cpp">
+      <Filter>filesystem</Filter>
+    </ClCompile>
+    <ClCompile Include="filesystem\CCompressedStream.cpp">
+      <Filter>filesystem</Filter>
+    </ClCompile>
+    <ClCompile Include="filesystem\CBinaryReader.cpp">
+      <Filter>filesystem</Filter>
     </ClCompile>
+    <ClCompile Include="filesystem\CArchiveLoader.cpp">
+      <Filter>filesystem</Filter>
+    </ClCompile>
+    <ClCompile Include="filesystem\AdapterLoaders.cpp">
+      <Filter>filesystem</Filter>
+    </ClCompile>
+    <ClCompile Include="logging\CBasicLogConfigurator.cpp">
+      <Filter>logging</Filter>
+    </ClCompile>
+    <ClCompile Include="logging\CLogger.cpp">
+      <Filter>logging</Filter>
+    </ClCompile>
+    <ClCompile Include="mapping\CMap.cpp">
+      <Filter>mapping</Filter>
+    </ClCompile>
+    <ClCompile Include="mapping\CMapEditManager.cpp">
+      <Filter>mapping</Filter>
+    </ClCompile>
+    <ClCompile Include="mapping\CMapInfo.cpp">
+      <Filter>mapping</Filter>
+    </ClCompile>
+    <ClCompile Include="mapping\CMapService.cpp">
+      <Filter>mapping</Filter>
+    </ClCompile>
+    <ClCompile Include="mapping\MapFormatH3M.cpp">
+      <Filter>mapping</Filter>
+    </ClCompile>
+    <ClCompile Include="filesystem\ResourceID.cpp">
+      <Filter>filesystem</Filter>
+    </ClCompile>
+    <ClCompile Include="JsonDetail.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CCreatureSet.h">
@@ -207,116 +254,113 @@
     <ClInclude Include="UnlockGuard.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Filesystem\CBinaryReader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Filesystem\CFileInfo.h">
+    <ClInclude Include="FunctionList.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Filesystem\CFileInputStream.h">
+    <ClInclude Include="CModHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Filesystem\CFilesystemLoader.h">
+    <ClInclude Include="CConfigHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Filesystem\CInputStream.h">
+    <ClInclude Include="CBattleCallback.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Filesystem\CMemoryStream.h">
+    <ClInclude Include="Mapping\CCampaignHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Filesystem\ISimpleResourceLoader.h">
+    <ClInclude Include="CBonusTypeHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Filesystem\CCompressedStream.h">
+    <ClInclude Include="IBonusTypeHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="FunctionList.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="rmg\CZoneGraphGenerator.h">
+      <Filter>rmg</Filter>
     </ClInclude>
-    <ClInclude Include="CModHandler.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="rmg\CZonePlacer.h">
+      <Filter>rmg</Filter>
     </ClInclude>
-    <ClInclude Include="CConfigHandler.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="rmg\CRmgTemplateZone.h">
+      <Filter>rmg</Filter>
     </ClInclude>
-    <ClInclude Include="Map\CMapInfo.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="rmg\CRmgTemplateStorage.h">
+      <Filter>rmg</Filter>
     </ClInclude>
-    <ClInclude Include="CBattleCallback.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="rmg\CRmgTemplate.h">
+      <Filter>rmg</Filter>
     </ClInclude>
-    <ClInclude Include="StringConstants.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="RMG\CMapGenerator.h">
+      <Filter>rmg</Filter>
     </ClInclude>
-    <ClInclude Include="Mapping\CCampaignHandler.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="rmg\CMapGenOptions.h">
+      <Filter>rmg</Filter>
     </ClInclude>
-    <ClInclude Include="Mapping\CMap.h">
+    <ClInclude Include="CRandomGenerator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Mapping\CMapInfo.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="filesystem\AdapterLoaders.h">
+      <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="Mapping\CMapService.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="filesystem\CArchiveLoader.h">
+      <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="Mapping\CMapEditManager.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="filesystem\CBinaryReader.h">
+      <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="Mapping\MapFormatH3M.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="filesystem\CCompressedStream.h">
+      <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="CBonusTypeHandler.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="filesystem\CFileInfo.h">
+      <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="IBonusTypeHandler.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="filesystem\CFileInputStream.h">
+      <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="ScopeGuard.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="filesystem\CFilesystemLoader.h">
+      <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="logging\CBasicLogConfigurator.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="filesystem\CInputStream.h">
+      <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="logging\CLogger.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="filesystem\CMemoryStream.h">
+      <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="IHandlerBase.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="filesystem\CZipLoader.h">
+      <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="filesystem\AdapterLoaders.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="filesystem\Filesystem.h">
+      <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="filesystem\CArchiveLoader.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="filesystem\ISimpleResourceLoader.h">
+      <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="filesystem\Filesystem.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="logging\CBasicLogConfigurator.h">
+      <Filter>logging</Filter>
     </ClInclude>
-    <ClInclude Include="filesystem\CZipLoader.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="logging\CLogger.h">
+      <Filter>logging</Filter>
     </ClInclude>
-    <ClInclude Include="rmg\CZoneGraphGenerator.h">
-      <Filter>RMG</Filter>
+    <ClInclude Include="mapping\CMap.h">
+      <Filter>mapping</Filter>
     </ClInclude>
-    <ClInclude Include="rmg\CZonePlacer.h">
-      <Filter>RMG</Filter>
+    <ClInclude Include="mapping\CMapEditManager.h">
+      <Filter>mapping</Filter>
     </ClInclude>
-    <ClInclude Include="rmg\CRmgTemplateZone.h">
-      <Filter>RMG</Filter>
+    <ClInclude Include="mapping\CMapInfo.h">
+      <Filter>mapping</Filter>
     </ClInclude>
-    <ClInclude Include="rmg\CRmgTemplateStorage.h">
-      <Filter>RMG</Filter>
+    <ClInclude Include="mapping\CMapService.h">
+      <Filter>mapping</Filter>
     </ClInclude>
-    <ClInclude Include="rmg\CRmgTemplate.h">
-      <Filter>RMG</Filter>
+    <ClInclude Include="mapping\MapFormatH3M.h">
+      <Filter>mapping</Filter>
     </ClInclude>
-    <ClInclude Include="RMG\CMapGenerator.h">
-      <Filter>RMG</Filter>
+    <ClInclude Include="filesystem\ResourceID.h">
+      <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="rmg\CMapGenOptions.h">
-      <Filter>RMG</Filter>
+    <ClInclude Include="JsonDetail.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
+</Project>