- Compile fixes part 1

- Project settings for MSVS

editor/Editor.vcxproj

@@ -73,7 +73,7 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
       <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
     </ClCompile>
     <Link>

launcher/modManager/cmodlistview_moc.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "StdInc.h"
+#include "../StdInc.h"
 #include "../../lib/CConfigHandler.h"
 
 namespace Ui {

launcher/settingsView/csettingsview_moc.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "StdInc.h"
+#include "../StdInc.h"
 
 namespace Ui {
 	class CSettingsView;

lib/VCMI_lib.vcxproj

@@ -188,6 +188,7 @@
     <ClCompile Include="CThreadHelper.cpp" />
     <ClCompile Include="CTownHandler.cpp" />
     <ClCompile Include="CRandomGenerator.cpp" />
+    <ClCompile Include="filesystem\FileStream.cpp" />
     <ClCompile Include="spells\CSpellHandler.cpp" />
     <ClCompile Include="spells\ISpellMechanics.cpp" />
     <ClCompile Include="spells\AdventureSpellMechanics.cpp" />
@@ -310,6 +311,7 @@
     <ClInclude Include="filesystem\CInputStream.h" />
     <ClInclude Include="filesystem\CMemoryStream.h" />
     <ClInclude Include="filesystem\CZipLoader.h" />
+    <ClInclude Include="filesystem\FileStream.h" />
     <ClInclude Include="filesystem\Filesystem.h" />
     <ClInclude Include="filesystem\ISimpleResourceLoader.h" />
     <ClInclude Include="filesystem\ResourceID.h" />

lib/VCMI_lib.vcxproj.filters

@@ -233,6 +233,9 @@
     <ClCompile Include="registerTypes\TypesMapObjects3.cpp">
       <Filter>registerTypes</Filter>
     </ClCompile>
+    <ClCompile Include="filesystem\FileStream.cpp">
+      <Filter>filesystem</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CCreatureSet.h">
@@ -574,5 +577,8 @@
     <ClInclude Include="mapping\CDrawRoadsOperation.h">
       <Filter>mapping</Filter>
     </ClInclude>
+    <ClInclude Include="filesystem\FileStream.h">
+      <Filter>filesystem</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

lib/filesystem/AdapterLoaders.cpp

@@ -95,7 +95,7 @@ std::set<std::string> CFilesystemList::getResourceNames(const ResourceID & resou
 		auto rn = loader->getResourceName(resourceName);
 		if(rn)
 		{
-			paths.insert(*rn);
+			paths.insert(rn->string());
 		}
 	}
 	return std::move(paths);

lib/filesystem/FileStream.cpp

@@ -1,5 +1,6 @@
 #include "StdInc.h"
 #include "FileStream.h"
+#include "../minizip/ioapi.h"
 
 #ifdef USE_SYSTEM_MINIZIP
 #include <minizip/unzip.h>
@@ -56,8 +57,9 @@ zlib_filefunc64_def* FileStream::GetMinizipFilefunc()
 {
 	static zlib_filefunc64_def MinizipFilefunc;
 	static bool initialized = false;
-	if (!initialized) {
-		fill_fopen64_filefunc((&MinizipFilefunc));
+	if (!initialized)
+	{
+		fill_fopen64_filefunc(&MinizipFilefunc);
 		MinizipFilefunc.zopen64_file = &MinizipOpenFunc;
 		initialized = true;
 	}

lib/filesystem/ISimpleResourceLoader.h

@@ -64,7 +64,7 @@ public:
 		auto rn = getResourceName(resourceName);
 		if(rn)
 		{
-			result.insert(*rn);
+			result.insert(rn->string());
 		}
 		return result;
 	}

lib/rmg/CRmgTemplateZone.cpp

@@ -1129,7 +1129,7 @@ bool CRmgTemplateZone::createTreasurePile(CMapGenerator* gen, int3 &pos, float m
 				info.occupiedPositions.insert(blockPos);
 				info.blockedPositions.insert(blockPos);
 			}
-			info.occupiedPositions.insert(visitablePos);
+			info.occupiedPositions.insert(visitablePos + oi.templ.getVisitableOffset());
 
 			currentValue += oi.value;