games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-12 02:28:11 +02:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
AlexVinS 2016-02-14 12:14:57 +03:00
commit fb322b41bc
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/VCMI_client.vcxproj
View File

@ -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" />

2
lib/ResourceSet.cpp
View File

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

3
lib/VCMI_lib.vcxproj
View File

@ -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" />

7
lib/VCMI_lib.vcxproj.filters
View File

@ -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>

3
lib/mapObjects/CGTownInstance.cpp
View File

@ -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);
}