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

CGMonolith: avoid crash when all exits are blocked by friendly heroes

Browse Source
This commit is contained in:
ArseniyShestakov 2015-12-18 01:08:19 +03:00
parent 9490a5d66d
commit b6176649ec
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/mapObjects/MiscObjects.cpp
View File

@ -940,17 +940,18 @@ void CGMonolith::onHeroVisit( const CGHeroInstance * h ) const
void CGMonolith::teleportDialogAnswered(const CGHeroInstance *hero, ui32 answer, TTeleportExitsList exits) const void CGMonolith::teleportDialogAnswered(const CGHeroInstance *hero, ui32 answer, TTeleportExitsList exits) const
{ {
int3 dPos; int3 dPos;
auto randomExit = getRandomExit(hero);
auto realExits = getAllExits(true); auto realExits = getAllExits(true);
if(!isEntrance() // Do nothing if hero visited exit only object if(!isEntrance() // Do nothing if hero visited exit only object
|| (!exits.size() && !realExits.size()) // Do nothing if there no exits on this channel || (!exits.size() && !realExits.size()) // Do nothing if there no exits on this channel
|| (!exits.size() && ObjectInstanceID() == getRandomExit(hero))) // Do nothing if all exits are blocked by friendly hero and it's not subterranean gate || ObjectInstanceID() == randomExit) // Do nothing if all exits are blocked by friendly hero and it's not subterranean gate
{ {
return; return;
} }
else if(vstd::isValidIndex(exits, answer)) else if(vstd::isValidIndex(exits, answer))
dPos = exits[answer].second; dPos = exits[answer].second;
else else
dPos = CGHeroInstance::convertPosition(cb->getObj(getRandomExit(hero))->visitablePos(), true); dPos = CGHeroInstance::convertPosition(cb->getObj(randomExit)->visitablePos(), true);
cb->moveHero(hero->id, dPos, true); cb->moveHero(hero->id, dPos, true);
} }