summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYohann Ferreira <bertram@cegetel.net>2005-06-20 18:01:34 +0000
committerYohann Ferreira <bertram@cegetel.net>2005-06-20 18:01:34 +0000
commitc392a1aa234b304b634c4ace6375ad96397a30b9 (patch)
tree2a47d1305e32af0c6d89890228212c4223a077bc
parent4284ab680d079fe9f06a44df3a092cfd3e298895 (diff)
downloadmana-c392a1aa234b304b634c4ace6375ad96397a30b9.tar.gz
mana-c392a1aa234b304b634c4ace6375ad96397a30b9.tar.bz2
mana-c392a1aa234b304b634c4ace6375ad96397a30b9.tar.xz
mana-c392a1aa234b304b634c4ace6375ad96397a30b9.zip
Now simply push enter when the exit dialog is shown to quit.
-rw-r--r--src/game.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 10ec4868..ce269bfa 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -268,8 +268,16 @@ void do_input()
// Input chat window
else if ((keysym.sym == SDLK_RETURN) && !chatWindow->isFocused())
{
- chatWindow->requestChatFocus();
- used = true;
+ // Quit by pressing Enter if the exit confirm is there
+ if ( exitConfirm )
+ {
+ state = EXIT;
+ }
+ else // Else, open the chat edit box
+ {
+ chatWindow->requestChatFocus();
+ used = true;
+ }
}
// Emotions and some internal gui windows