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

Merge pull request #3973 from vcmi/master

Browse Source 
Merge master -> beta
This commit is contained in:
Ivan Savenko
2024-05-14 16:59:10 +03:00
committed by GitHub
parent f061f98ddd 7fb93613d5
commit da9d82b697
17 changed files with 116 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/adventureMap/AdventureMapShortcuts.cpp
View File

@@ -456,7 +456,7 @@ bool AdventureMapShortcuts::optionHeroSelected()
bool AdventureMapShortcuts::optionHeroCanMove()
{
const auto * hero = LOCPLINT->localState->getCurrentHero();
return optionInMapView() && hero && hero->movementPointsRemaining() != 0 && LOCPLINT->localState->hasPath(hero);
return optionInMapView() && hero && LOCPLINT->localState->hasPath(hero) && LOCPLINT->localState->getPath(hero).nextNode().turns == 0;
}
bool AdventureMapShortcuts::optionHasNextHero()