games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Merge branch 'develop' into feature/VCMIMapFormat1

Browse Source 
Conflicts:
	lib/CArtHandler.cpp
This commit is contained in:
AlexVinS
2016-01-01 20:28:52 +03:00
parent f33bcee84c 9fd1cff090
commit 37d0dad70a
114 changed files with 1077 additions and 813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mapping/CMapDefines.h
View File

@@ -71,7 +71,7 @@ struct DLL_LINKAGE TerrainTile
CGObjectInstance * topVisitableObj(bool excludeTop = false) const;
bool isWater() const;
EDiggingStatus getDiggingStatus(const bool excludeTop = true) const;
bool hasFavourableWinds() const;
bool hasFavorableWinds() const;
ETerrainType terType;
ui8 terView;
@@ -80,7 +80,7 @@ struct DLL_LINKAGE TerrainTile
ERoadType::ERoadType roadType;
ui8 roadDir;
/// first two bits - how to rotate terrain graphic (next two - river graphic, next two - road);
/// 7th bit - whether tile is coastal (allows disembarking if land or block movement if water); 8th bit - Favourable Winds effect
/// 7th bit - whether tile is coastal (allows disembarking if land or block movement if water); 8th bit - Favorable Winds effect
ui8 extTileFlags;
bool visitable;
bool blocked;