summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-03-22 22:09:02 +0300
committerAndrei Karas <akaras@inbox.ru>2016-03-22 22:09:02 +0300
commit51c9a63a660fe88cfa44d93028e6ae2448fb889d (patch)
tree8c4b1db548208737a43d52fbe28b99cb5060f017 /src/game.cpp
parentbce511aaf8b9d2b5d447f67ba0c05e2f9a92b7ca (diff)
downloadmanaplus-51c9a63a660fe88cfa44d93028e6ae2448fb889d.tar.gz
manaplus-51c9a63a660fe88cfa44d93028e6ae2448fb889d.tar.bz2
manaplus-51c9a63a660fe88cfa44d93028e6ae2448fb889d.tar.xz
manaplus-51c9a63a660fe88cfa44d93028e6ae2448fb889d.zip
Not allow moving from sit state if server not support it.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/game.cpp b/src/game.cpp
index c59103bb6..0474dad33 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -852,12 +852,12 @@ void Game::handleMove()
}
// Moving player around
- if (localPlayer->isAlive()
- && chatWindow
- && !chatWindow->isInputFocused()
- && !InventoryWindow::isAnyInputFocused()
- && !quitDialog
- && !popupMenu->isPopupVisible())
+ if (chatWindow &&
+ !quitDialog &&
+ localPlayer->canMove() &&
+ !chatWindow->isInputFocused() &&
+ !InventoryWindow::isAnyInputFocused() &&
+ !popupMenu->isPopupVisible())
{
NpcDialog *const dialog = NpcDialog::getActive();
if (dialog)