mirror of
https://github.com/vcmi/vcmi.git
synced 2025-11-27 22:49:25 +02:00
Fix timer end turn while standing on obstacles/water
This commit is contained in:
@@ -1262,6 +1262,7 @@ bool CGameHandler::moveHero(ObjectInstanceID hid, int3 dst, ui8 teleporting, boo
|
|||||||
if(h->boat && !h->boat->onboardAssaultAllowed)
|
if(h->boat && !h->boat->onboardAssaultAllowed)
|
||||||
lookForGuards = IGNORE_GUARDS;
|
lookForGuards = IGNORE_GUARDS;
|
||||||
|
|
||||||
|
turnTimerHandler.setEndTurnAllowed(h->getOwner(), !standAtWater && !standAtObstacle);
|
||||||
doMove(TryMoveHero::SUCCESS, lookForGuards, visitDest, LEAVING_TILE);
|
doMove(TryMoveHero::SUCCESS, lookForGuards, visitDest, LEAVING_TILE);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user