summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2009-02-11 18:58:25 -0700
committerIra Rice <irarice@gmail.com>2009-02-11 18:58:25 -0700
commit1fd572f6e81f81b3699f46caf613514507d87cac (patch)
treeef4b29bb7f1d73add27f45cddc3b307edd45743b
parentf72ff67c54a3d49ffcfa83b6a06db4176f37093b (diff)
downloadmana-client-1fd572f6e81f81b3699f46caf613514507d87cac.tar.gz
mana-client-1fd572f6e81f81b3699f46caf613514507d87cac.tar.bz2
mana-client-1fd572f6e81f81b3699f46caf613514507d87cac.tar.xz
mana-client-1fd572f6e81f81b3699f46caf613514507d87cac.zip
Separated out the setup and help windows from the chat shortcut so that
they are now under the OK shortcut. Figured that if anyone doesn't like the NPC dialogs trumping their chat dialogs, then we should also allow for it under the setup and help buttons as well. The only window behavior that this keeps under the chat shortcut now is the confirmation for exiting shortcut. Signed-off-by: Ira Rice <irarice@gmail.com>
-rw-r--r--src/game.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/game.cpp b/src/game.cpp
index bc0c86b5..03febaff 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -525,11 +525,11 @@ void Game::handleInput()
done = true;
// Close the Browser if opened
else if (helpWindow->isVisible() &&
- keyboard.isKeyActive(keyboard.KEY_TOGGLE_CHAT))
+ keyboard.isKeyActive(keyboard.KEY_OK))
helpWindow->setVisible(false);
// Close the config window, cancelling changes if opened
else if (setupWindow->isVisible() &&
- keyboard.isKeyActive(keyboard.KEY_TOGGLE_CHAT))
+ keyboard.isKeyActive(keyboard.KEY_OK))
setupWindow->action(gcn::ActionEvent(NULL, "cancel"));
// Submits the text and proceeds to the next dialog
else if (npcStringDialog->isVisible() &&
@@ -551,7 +551,9 @@ void Game::handleInput()
KeyboardConfig::KEY_TOGGLE_CHAT) ==
keyboard.getKeyValue(
KeyboardConfig::KEY_OK) &&
- (npcStringDialog->isVisible() ||
+ (helpWindow->isVisible() ||
+ setupWindow->isVisible() ||
+ npcStringDialog->isVisible() ||
npcTextDialog->isVisible() ||
npcListDialog->isVisible() ||
npcIntegerDialog->isVisible())))