aboutsummaryrefslogtreecommitdiff
path: root/engines/agi
diff options
context:
space:
mode:
authorKari Salminen2009-08-18 21:37:31 +0000
committerKari Salminen2009-08-18 21:37:31 +0000
commit2bd1f51d92492fa88ba61dc65f783fc9bbfd852c (patch)
tree07624be9b33f92db8dfff4de8f0af1d11399ac6d /engines/agi
parent0762bb7cf6d81632a0fd9621104546fa9ae3da18 (diff)
downloadscummvm-rg350-2bd1f51d92492fa88ba61dc65f783fc9bbfd852c.tar.gz
scummvm-rg350-2bd1f51d92492fa88ba61dc65f783fc9bbfd852c.tar.bz2
scummvm-rg350-2bd1f51d92492fa88ba61dc65f783fc9bbfd852c.zip
Possible fix for #2828330 (AGI: KQ1: Fast text box). If doesn't break anything else then should go to the branch-1-0-0 too, but haven't had the time to do much testing yet - thus committing to the trunk first.
svn-id: r43523
Diffstat (limited to 'engines/agi')
-rw-r--r--engines/agi/cycle.cpp4
-rw-r--r--engines/agi/menu.cpp1
2 files changed, 3 insertions, 2 deletions
diff --git a/engines/agi/cycle.cpp b/engines/agi/cycle.cpp
index d212f8c2e0..2b4ef7f60a 100644
--- a/engines/agi/cycle.cpp
+++ b/engines/agi/cycle.cpp
@@ -266,8 +266,8 @@ process_key:
}
// commented out to close Sarien bug #438872
- if (key)
- _game.keypress = key;
+ //if (key)
+ // _game.keypress = key;
}
break;
case INPUT_GETSTRING:
diff --git a/engines/agi/menu.cpp b/engines/agi/menu.cpp
index 5d30eda81d..e1db04ff49 100644
--- a/engines/agi/menu.cpp
+++ b/engines/agi/menu.cpp
@@ -408,6 +408,7 @@ bool Menu::keyhandler(int key) {
if (d->enabled) {
debugC(6, kDebugLevelMenu | kDebugLevelInput, "event %d registered", d->event);
_vm->_game.controllerOccured[d->event] = true;
+ _vm->_menuSelected = true;
goto exit_menu;
}
break;