diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-08-01 21:32:16 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-08-01 21:35:09 -0600 |
| commit | a3e61c0e830c46b51c0d135962ad361c02b93243 (patch) | |
| tree | 3b94948be5750c8f968ea89723799eb4f119c063 /src/game.cpp | |
| parent | 0e189bbe81c88283438aabb4fec3ba30920d3a36 (diff) | |
| download | mana-a3e61c0e830c46b51c0d135962ad361c02b93243.tar.gz mana-a3e61c0e830c46b51c0d135962ad361c02b93243.tar.bz2 mana-a3e61c0e830c46b51c0d135962ad361c02b93243.tar.xz mana-a3e61c0e830c46b51c0d135962ad361c02b93243.zip | |
Remove isActive methods from buy/sell windows
Uses a state variable in PlayerInfo instead. Moves isTalking from Being
to PlayerInfo. Also some small cleanups.
Reviewed-by: Chuck Miller
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 148c3784..0c765f9e 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -758,7 +758,7 @@ void Game::handleInput() return; // Moving player around - if (player_node->isAlive() && !Being::isTalking() && + if (player_node->isAlive() && !PlayerInfo::isTalking() && !chatWindow->isInputFocused() && !quitDialog) { // Get the state of the keyboard keys |