|
@@ -22,6 +22,7 @@
|
|
|
|
|
|
#include "../CCallback.h"
|
|
|
|
|
|
+#include "../lib/CondSh.h"
|
|
|
#include "../lib/pathfinder/CGPathNode.h"
|
|
|
#include "../lib/mapObjects/CGHeroInstance.h"
|
|
|
#include "../lib/networkPacks/PacksForClient.h"
|
|
@@ -233,7 +234,7 @@ void HeroMovementController::onMoveHeroApplied()
|
|
|
assert(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 canStop = !canMove || canHeroStopAtNode(LOCPLINT->localState->getPath(hero).currNode());
|
|
|
|