diff options
| author | Bertram <bertram@cegetel.net> | 2010-01-27 01:46:58 +0100 |
|---|---|---|
| committer | Bertram <bertram@cegetel.net> | 2010-01-27 01:46:58 +0100 |
| commit | 572ed6a1aa6c847e8764bddf2bb0d687ecf1a405 (patch) | |
| tree | f0183d944a3a887b359e2dc2895e87a9c2767e66 /src/game.cpp | |
| parent | 692aac3122843c59610684802e25b92cc9f0a33c (diff) | |
| download | mana-572ed6a1aa6c847e8764bddf2bb0d687ecf1a405.tar.gz mana-572ed6a1aa6c847e8764bddf2bb0d687ecf1a405.tar.bz2 mana-572ed6a1aa6c847e8764bddf2bb0d687ecf1a405.tar.xz mana-572ed6a1aa6c847e8764bddf2bb0d687ecf1a405.zip | |
Added mutators/accessors to being.h and smal cleanups.
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp index 427f70b6..0cc59ff6 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -905,7 +905,7 @@ void Game::handleInput() return; // Moving player around - if (player_node->mAction != Being::DEAD && current_npc == 0 && + if (player_node->isAlive() && current_npc == 0 && !chatWindow->isInputFocused() && !quitDialog) { // Get the state of the keyboard keys |