mirror of
				https://github.com/vcmi/vcmi.git
				synced 2025-10-31 00:07:39 +02:00 
			
		
		
		
	Compile fixes for MSVS
This commit is contained in:
		| @@ -100,7 +100,7 @@ struct DLL_LINKAGE RumorState | ||||
| 	ERumorType type; | ||||
| 	std::map<ERumorType, std::pair<int, int>> last; | ||||
|  | ||||
| 	RumorState(){type = TYPE_NONE; last = {};}; | ||||
| 	RumorState(){type = TYPE_NONE;}; | ||||
| 	bool update(int id, int extra); | ||||
|  | ||||
| 	template <typename Handler> void serialize(Handler &h, const int version) | ||||
|   | ||||
| @@ -293,8 +293,10 @@ | ||||
|     <ClInclude Include="Connection.h" /> | ||||
|     <ClInclude Include="ConstTransitivePtr.h" /> | ||||
|     <ClInclude Include="CPathfinder.h" /> | ||||
|     <ClInclude Include="CPlayerState.h" /> | ||||
|     <ClInclude Include="CRandomGenerator.h" /> | ||||
|     <ClInclude Include="CScriptingModule.h" /> | ||||
|     <ClInclude Include="CSoundBase.h" /> | ||||
|     <ClInclude Include="CStopWatch.h" /> | ||||
|     <ClInclude Include="CThreadHelper.h" /> | ||||
|     <ClInclude Include="CTownHandler.h" /> | ||||
| @@ -313,6 +315,7 @@ | ||||
|     <ClInclude Include="filesystem\ResourceID.h" /> | ||||
|     <ClInclude Include="FunctionList.h" /> | ||||
|     <ClInclude Include="IBonusTypeHandler.h" /> | ||||
|     <ClInclude Include="IHandlerBase.h" /> | ||||
|     <ClInclude Include="JsonDetail.h" /> | ||||
|     <ClInclude Include="LogicalExpression.h" /> | ||||
|     <ClInclude Include="mapObjects\CArmedInstance.h" /> | ||||
| @@ -332,12 +335,15 @@ | ||||
|     <ClInclude Include="mapObjects\MiscObjects.h" /> | ||||
|     <ClInclude Include="mapObjects\ObjectTemplate.h" /> | ||||
|     <ClInclude Include="mapping\CCampaignHandler.h" /> | ||||
|     <ClInclude Include="mapping\CDrawRoadsOperation.h" /> | ||||
|     <ClInclude Include="mapping\CMap.h" /> | ||||
|     <ClInclude Include="mapping\CMapDefines.h" /> | ||||
|     <ClInclude Include="mapping\CMapInfo.h" /> | ||||
|     <ClInclude Include="mapping\CMapService.h" /> | ||||
|     <ClInclude Include="mapping\CMapEditManager.h" /> | ||||
|     <ClInclude Include="mapping\MapFormatH3M.h" /> | ||||
|     <ClInclude Include="mapping\MapFormatJson.h" /> | ||||
|     <ClInclude Include="NetPacksBase.h" /> | ||||
|     <ClInclude Include="registerTypes\RegisterTypes.h" /> | ||||
|     <ClInclude Include="rmg\CMapGenerator.h" /> | ||||
|     <ClInclude Include="logging\CLogger.h" /> | ||||
| @@ -360,6 +366,7 @@ | ||||
|     <ClInclude Include="rmg\CZoneGraphGenerator.h" /> | ||||
|     <ClInclude Include="rmg\CZonePlacer.h" /> | ||||
|     <ClInclude Include="rmg\float3.h" /> | ||||
|     <ClInclude Include="ScopeGuard.h" /> | ||||
|     <ClInclude Include="spells\AdventureSpellMechanics.h" /> | ||||
|     <ClInclude Include="spells\BattleSpellMechanics.h" /> | ||||
|     <ClInclude Include="spells\CDefaultSpellMechanics.h" /> | ||||
| @@ -371,7 +378,9 @@ | ||||
|     <ClInclude Include="spells\ViewSpellInt.h" /> | ||||
|     <ClInclude Include="StartInfo.h" /> | ||||
|     <ClInclude Include="StdInc.h" /> | ||||
|     <ClInclude Include="StringConstants.h" /> | ||||
|     <ClInclude Include="UnlockGuard.h" /> | ||||
|     <ClInclude Include="vcmi_endian.h" /> | ||||
|     <ClInclude Include="VCMI_Lib.h" /> | ||||
|     <ClInclude Include="VCMIDirs.h" /> | ||||
|   </ItemGroup> | ||||
|   | ||||
| @@ -155,8 +155,6 @@ | ||||
|     <ClCompile Include="registerTypes\TypesClientPacks1.cpp"> | ||||
|       <Filter>registerTypes</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="registerTypes\TypesMapObjects1.cpp" /> | ||||
|     <ClCompile Include="registerTypes\TypesMapObjects2.cpp" /> | ||||
|     <ClCompile Include="mapObjects\CArmedInstance.cpp"> | ||||
|       <Filter>mapObjects</Filter> | ||||
|     </ClCompile> | ||||
| @@ -202,7 +200,6 @@ | ||||
|     <ClCompile Include="mapObjects\ObjectTemplate.cpp"> | ||||
|       <Filter>mapObjects</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="registerTypes\TypesMapObjects3.cpp" /> | ||||
|     <ClCompile Include="IHandlerBase.cpp" /> | ||||
|     <ClCompile Include="spells\AdventureSpellMechanics.cpp"> | ||||
|       <Filter>spells</Filter> | ||||
| @@ -227,6 +224,15 @@ | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="mapping\CDrawRoadsOperation.cpp" /> | ||||
|     <ClCompile Include="CPathfinder.cpp" /> | ||||
|     <ClCompile Include="registerTypes\TypesMapObjects1.cpp"> | ||||
|       <Filter>registerTypes</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="registerTypes\TypesMapObjects2.cpp"> | ||||
|       <Filter>registerTypes</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="registerTypes\TypesMapObjects3.cpp"> | ||||
|       <Filter>registerTypes</Filter> | ||||
|     </ClCompile> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <ClInclude Include="CCreatureSet.h"> | ||||
| @@ -541,5 +547,32 @@ | ||||
|     <ClInclude Include="CPathfinder.h"> | ||||
|       <Filter>Header Files</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="CPlayerState.h"> | ||||
|       <Filter>Header Files</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="mapping\CMapDefines.h"> | ||||
|       <Filter>mapping</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="CSoundBase.h"> | ||||
|       <Filter>Header Files</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="IHandlerBase.h"> | ||||
|       <Filter>Header Files</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="NetPacksBase.h"> | ||||
|       <Filter>Header Files</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="ScopeGuard.h"> | ||||
|       <Filter>Header Files</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="StringConstants.h"> | ||||
|       <Filter>Header Files</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="vcmi_endian.h"> | ||||
|       <Filter>Header Files</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="mapping\CDrawRoadsOperation.h"> | ||||
|       <Filter>mapping</Filter> | ||||
|     </ClInclude> | ||||
|   </ItemGroup> | ||||
| </Project> | ||||
| @@ -2,6 +2,7 @@ | ||||
|  | ||||
| #include "CObjectClassesHandler.h" | ||||
| #include "../CTownHandler.h" // for building ID-based filters | ||||
| #include "MapObjects.h" | ||||
|  | ||||
| /* | ||||
|  * CommonConstructors.h, part of VCMI engine | ||||
|   | ||||
		Reference in New Issue
	
	Block a user