summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Athay <ko2fan@gmail.com>2008-07-21 16:49:22 +0000
committerDavid Athay <ko2fan@gmail.com>2008-07-21 16:49:22 +0000
commit157fbba039dc8ee0f7ed414791c72277aaf80831 (patch)
treef21c74ac57ecb6e953b07712724ecd713d1dc88d
parent7531e86b5c84c66fc7e46391a133accfb51b0141 (diff)
downloadmana-157fbba039dc8ee0f7ed414791c72277aaf80831.tar.gz
mana-157fbba039dc8ee0f7ed414791c72277aaf80831.tar.bz2
mana-157fbba039dc8ee0f7ed414791c72277aaf80831.tar.xz
mana-157fbba039dc8ee0f7ed414791c72277aaf80831.zip
Commit of Alt-Gr fix for Rotonen
-rw-r--r--ChangeLog5
-rw-r--r--src/game.cpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 30665053..e2a3abfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-21 David Athay <ko2fan@gmail.com>
+
+ * src/game.cpp: Initial attempt at fixing Alt-Gr issue for Rotonen,
+ this commit is just for him!
+
2008-07-18 Bjørn Lindeijer <bjorn@lindeijer.nl>
* src/main.cpp: Remove possible trailing slash at the end of the
diff --git a/src/game.cpp b/src/game.cpp
index 58c28640..0c855669 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -465,7 +465,7 @@ void Game::handleInput()
// Keys pressed together with Alt/Meta
// Emotions and some internal gui windows
#ifndef __APPLE__
- if (event.key.keysym.mod & KMOD_ALT)
+ if (event.key.keysym.mod & KMOD_ALT && event.key.keysym.mod ^ KMOD_CTRL)
#else
if (event.key.keysym.mod & KMOD_LMETA)
#endif