diff options
| author | Reid <reidyaro@gmail.com> | 2011-08-08 16:51:11 +0200 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2011-08-08 16:51:11 +0200 |
| commit | 7f8498bf14338f67089881afb14b0b398a152c8c (patch) | |
| tree | e0ba5648c775776be6177dae3c0c8b50922517b1 /src/net | |
| parent | 391a4c3a1e4d5c3815ba7c822fb9bd03969dea6e (diff) | |
| parent | bcd0bdb1f087c3153d070baa274e7ecf8c8268e1 (diff) | |
| download | plus-7f8498bf14338f67089881afb14b0b398a152c8c.tar.gz plus-7f8498bf14338f67089881afb14b0b398a152c8c.tar.bz2 plus-7f8498bf14338f67089881afb14b0b398a152c8c.tar.xz plus-7f8498bf14338f67089881afb14b0b398a152c8c.zip | |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/tmwa/npchandler.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index d6549e39f..43271671e 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -92,9 +92,6 @@ void NpcHandler::handleMessage(Net::MessageIn &msg) break; } - if (player_node && player_node->getCurrentAction() != Being::SIT) - player_node->setAction(Being::STAND); - mDialog = 0; } |