games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +02:00
Code Issues Releases Activity

Fixed #686.

Browse Source 
Minor changes.
This commit is contained in:
Michał W. Urbańczyk
2012-04-08 02:29:11 +00:00
parent 9f6270a1f7
commit d6223dd137
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/CGameState.cpp
View File

@ -808,7 +808,11 @@ CGameState::~CGameState()
BattleInfo * CGameState::setupBattle(int3 tile, const CArmedInstance *armies[2], const CGHeroInstance * heroes[2], bool creatureBank, const CGTownInstance *town)
{
int terrain = map->getTile(tile).tertype;
const TerrainTile &t = map->getTile(tile);
int terrain = t.tertype;
if(t.isCoastal() && !t.isWater())
terrain = TerrainTile::sand;
int terType = battleGetBattlefieldType(tile);
return BattleInfo::setupBattle(tile, terrain, terType, armies, heroes, creatureBank, town);
}
@ -1623,6 +1627,9 @@ int CGameState::battleGetBattlefieldType(int3 tile)
}
}
if(!t.isWater() && t.isCoastal())
return 1; //sand/beach
switch(t.tertype)
{
case TerrainTile::dirt: