games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Code Issues Releases Activity

CGameState::battleGetBattlefieldType: avoid crash on tile 0,0,0

Browse Source 
Fix issue 2524
This commit is contained in:
Arseniy Shestakov
2016-10-02 08:39:01 +03:00
parent c5440a1c6c
commit 04eb0e3787
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/CGameState.cpp
View File

@ -953,7 +953,7 @@ void CGameState::initDuel()
} }
} }
curB = BattleInfo::setupBattle(int3(), dp.terType, dp.bfieldType, armies, heroes, false, town); curB = BattleInfo::setupBattle(int3(-1,-1,-1), dp.terType, dp.bfieldType, armies, heroes, false, town);
curB->obstacles = dp.obstacles; curB->obstacles = dp.obstacles;
curB->localInit(); curB->localInit();
} }
@ -1908,9 +1908,9 @@ void CGameState::initVisitingAndGarrisonedHeroes()
BFieldType CGameState::battleGetBattlefieldType(int3 tile, CRandomGenerator & rand) BFieldType CGameState::battleGetBattlefieldType(int3 tile, CRandomGenerator & rand)
{ {
if(tile==int3() && curB) if(!tile.valid() && curB)
tile = curB->tile; tile = curB->tile;
else if(tile==int3() && !curB) else if(!tile.valid() && !curB)
return BFieldType::NONE; return BFieldType::NONE;
const TerrainTile &t = map->getTile(tile); const TerrainTile &t = map->getTile(tile);