summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-10-31 02:40:17 +0300
committerAndrei Karas <akaras@inbox.ru>2011-10-31 02:40:17 +0300
commite1ee9ce53bd02f46c294b3aed83adeb737f2677b (patch)
treed2451d4ac73a590c55573695963de4cd15cdec27
parentaaf4a7624da832f05157fc202b83e726f4c1522a (diff)
downloadmv-e1ee9ce53bd02f46c294b3aed83adeb737f2677b.tar.gz
mv-e1ee9ce53bd02f46c294b3aed83adeb737f2677b.tar.bz2
mv-e1ee9ce53bd02f46c294b3aed83adeb737f2677b.tar.xz
mv-e1ee9ce53bd02f46c294b3aed83adeb737f2677b.zip
Stop moving if npc dialog is showed.
-rw-r--r--src/localplayer.cpp1
-rw-r--r--src/net/tmwa/npchandler.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 16409d16c..ea3209229 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -1229,6 +1229,7 @@ void LocalPlayer::stopWalking(bool sendToServer)
mPathSetByMouse = false;
clearPath();
+ navigateClean();
}
bool LocalPlayer::toggleSit()
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index f80dd6e69..1c2654087 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -213,6 +213,8 @@ int NpcHandler::getNpc(Net::MessageIn &msg, bool haveLength)
else
{
mDialog = new NpcDialog(npcId);
+ if (player_node)
+ player_node->stopWalking(false);
Wrapper wrap;
wrap.dialog = mDialog;
mNpcDialogs[npcId] = wrap;