Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1

client/VCMI_client.vcxproj

@@ -203,6 +203,7 @@
     <ClCompile Include="gui\SDL_Extensions.cpp" />
     <ClCompile Include="mapHandler.cpp" />
     <ClCompile Include="NetPacksClient.cpp" />
+    <ClCompile Include="SDLRWwrapper.cpp" />
     <ClCompile Include="StdInc.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">Create</PrecompiledHeader>
     </ClCompile>
@@ -256,6 +257,7 @@
     <ClInclude Include="mapHandler.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="SDLMain.h" />
+    <ClInclude Include="SDLRWwrapper.h" />
     <ClInclude Include="StdInc.h" />
     <ClInclude Include="widgets\AdventureMapClasses.h" />
     <ClInclude Include="widgets\Buttons.h" />

lib/ResourceSet.cpp

@@ -113,4 +113,4 @@ Res::ResourceSet::nziterator::nziterator(const ResourceSet &RS)
 
 	if(!valid())
 		advance();
-}
+}

lib/VCMI_lib.vcxproj

@@ -188,6 +188,7 @@
     <ClCompile Include="CThreadHelper.cpp" />
     <ClCompile Include="CTownHandler.cpp" />
     <ClCompile Include="CRandomGenerator.cpp" />
+    <ClCompile Include="filesystem\FileInfo.cpp" />
     <ClCompile Include="filesystem\FileStream.cpp" />
     <ClCompile Include="spells\CSpellHandler.cpp" />
     <ClCompile Include="spells\ISpellMechanics.cpp" />
@@ -200,7 +201,6 @@
     <ClCompile Include="filesystem\CArchiveLoader.cpp" />
     <ClCompile Include="filesystem\CBinaryReader.cpp" />
     <ClCompile Include="filesystem\CCompressedStream.cpp" />
-    <ClCompile Include="filesystem\CFileInfo.cpp" />
     <ClCompile Include="filesystem\CFileInputStream.cpp" />
     <ClCompile Include="filesystem\CFilesystemLoader.cpp" />
     <ClCompile Include="filesystem\CMemoryStream.cpp" />
@@ -311,6 +311,7 @@
     <ClInclude Include="filesystem\CInputStream.h" />
     <ClInclude Include="filesystem\CMemoryStream.h" />
     <ClInclude Include="filesystem\CZipLoader.h" />
+    <ClInclude Include="filesystem\FileInfo.h" />
     <ClInclude Include="filesystem\FileStream.h" />
     <ClInclude Include="filesystem\Filesystem.h" />
     <ClInclude Include="filesystem\ISimpleResourceLoader.h" />

lib/VCMI_lib.vcxproj.filters

@@ -96,9 +96,6 @@
     <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>
@@ -236,6 +233,7 @@
     <ClCompile Include="filesystem\FileStream.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
+    <ClCompile Include="filesystem\FileInfo.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CCreatureSet.h">
@@ -580,5 +578,8 @@
     <ClInclude Include="filesystem\FileStream.h">
       <Filter>filesystem</Filter>
     </ClInclude>
+    <ClInclude Include="filesystem\FileInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

lib/mapObjects/CGTownInstance.cpp

@@ -109,7 +109,8 @@ void CGDwelling::onHeroVisit( const CGHeroInstance * h ) const
 		return;
 	}
 
-	if(!relations  &&  ID != Obj::WAR_MACHINE_FACTORY)
+	// TODO this shouldn't be hardcoded
+	if(!relations && ID != Obj::WAR_MACHINE_FACTORY && ID != Obj::REFUGEE_CAMP)
 	{
 		cb->setOwner(this, h->tempOwner);
 	}