diff options
| author | David Athay <ko2fan@gmail.com> | 2009-05-14 12:16:34 +0100 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2009-05-14 12:16:34 +0100 |
| commit | dc1eb0895382451b1c79c60ecb7ca7dbbec89681 (patch) | |
| tree | 56742cbe8674d68e152f23885a7e062becf9b5ce /src/game.cpp | |
| parent | c96fbe557a3274325399411456e98a5a63b1bc54 (diff) | |
| parent | 39e06227df101a73aa5b9078a3afb6a7a71b89ba (diff) | |
| download | mana-client-dc1eb0895382451b1c79c60ecb7ca7dbbec89681.tar.gz mana-client-dc1eb0895382451b1c79c60ecb7ca7dbbec89681.tar.bz2 mana-client-dc1eb0895382451b1c79c60ecb7ca7dbbec89681.tar.xz mana-client-dc1eb0895382451b1c79c60ecb7ca7dbbec89681.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/game.cpp b/src/game.cpp index c07d6520..59c57607 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -582,6 +582,13 @@ void Game::handleInput() if (chatWindow->requestChatFocus()) used = true; } + if (npcDialog->isVisible()) + { + if (keyboard.isKeyActive(keyboard.KEY_MOVE_UP)) + npcDialog->move(1); + else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN)) + npcDialog->move(-1); + } } |