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

Do not attempt to move if there are active dialogs

Browse Source
This commit is contained in:
Ivan Savenko
2024-04-13 16:57:21 +03:00
parent d70914a147
commit 2f1f68f89d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/HeroMovementController.cpp
View File

@ -22,6 +22,7 @@
#include "../CCallback.h" #include "../CCallback.h"
#include "../lib/CondSh.h"
#include "../lib/pathfinder/CGPathNode.h" #include "../lib/pathfinder/CGPathNode.h"
#include "../lib/mapObjects/CGHeroInstance.h" #include "../lib/mapObjects/CGHeroInstance.h"
#include "../lib/networkPacks/PacksForClient.h" #include "../lib/networkPacks/PacksForClient.h"
@ -233,7 +234,7 @@ void HeroMovementController::onMoveHeroApplied()
assert(currentlyMovingHero); assert(currentlyMovingHero);
const auto * hero = currentlyMovingHero; const auto * hero = currentlyMovingHero;
bool canMove = LOCPLINT->localState->hasPath(hero) && LOCPLINT->localState->getPath(hero).nextNode().turns == 0; bool canMove = LOCPLINT->localState->hasPath(hero) && LOCPLINT->localState->getPath(hero).nextNode().turns == 0 && !LOCPLINT->showingDialog->get();
bool wantStop = stoppingMovement; bool wantStop = stoppingMovement;
bool canStop = !canMove || canHeroStopAtNode(LOCPLINT->localState->getPath(hero).currNode()); bool canStop = !canMove || canHeroStopAtNode(LOCPLINT->localState->getPath(hero).currNode());