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

Merge pull request #963 from vcmi/terrain-rewrite

Browse Source 
Terrain rewrite
This commit is contained in:
DjWarmonger
2022-09-29 18:24:05 +02:00
committed by GitHub
parent 878aabd4d6 20c102e648
commit 58a3abb643
102 changed files with 1190 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/CStack.cpp
View File

@@ -331,11 +331,11 @@ bool CStack::canBeHealed() const
bool CStack::isOnNativeTerrain() const
{
//this code is called from CreatureTerrainLimiter::limit on battle start
auto res = nativeTerrain == Terrain::ANY || nativeTerrain == battle->getTerrainType();
auto res = nativeTerrain == Terrain::ANY_TERRAIN || nativeTerrain == battle->getTerrainType();
return res;
}
bool CStack::isOnTerrain(const Terrain & terrain) const
bool CStack::isOnTerrain(TerrainId terrain) const
{
return battle->getTerrainType() == terrain;
}