aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMartin Kiewitz2010-01-08 21:44:18 +0000
committerMartin Kiewitz2010-01-08 21:44:18 +0000
commit5cfd241af9f4cad018cb3f8d9555e5a5e468c3bd (patch)
treed55260589e792c49ac765b4d431b96bc06ed5c7f /engines
parent8ba776913dc34f6b213c9b013c67ff9f64e09ea4 (diff)
downloadscummvm-rg350-5cfd241af9f4cad018cb3f8d9555e5a5e468c3bd.tar.gz
scummvm-rg350-5cfd241af9f4cad018cb3f8d9555e5a5e468c3bd.tar.bz2
scummvm-rg350-5cfd241af9f4cad018cb3f8d9555e5a5e468c3bd.zip
SCI: we won't do keyboard mapping for sci1late+, because otherwise Ctrl-keys won't work. I couldnt find games that use Alt-keys, so I was unable to check those as well
svn-id: r47175
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/event.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/engines/sci/event.cpp b/engines/sci/event.cpp
index 455066a812..9c3de07366 100644
--- a/engines/sci/event.cpp
+++ b/engines/sci/event.cpp
@@ -364,12 +364,15 @@ sciEvent SciEvent::get(unsigned int mask) {
if (event.type == SCI_EVENT_KEYBOARD) {
// Do we still have to translate the key?
- // Scancodify if appropriate
- if (event.modifiers & SCI_KEYMOD_ALT) {
- event.character = altify(event.character);
- } else if (event.modifiers & SCI_KEYMOD_CTRL) {
- //event.character = event.data;
- event.character = controlify(event.character);
+ if (getSciVersion() <= SCI_VERSION_1_MIDDLE) {
+ // TODO: find out if altify is also not needed for sci1late+, couldnt find any game that uses those keys
+ // Scancodify if appropriate
+ if (event.modifiers & SCI_KEYMOD_ALT) {
+ event.character = altify(event.character);
+ } else if (event.modifiers & SCI_KEYMOD_CTRL) {
+ //event.character = event.data;
+ event.character = controlify(event.character);
+ }
}
// Numlockify if appropriate