aboutsummaryrefslogtreecommitdiff
path: root/simon/items.cpp
diff options
context:
space:
mode:
authorOliver Kiehl2002-12-07 13:05:58 +0000
committerOliver Kiehl2002-12-07 13:05:58 +0000
commit5f756f5cca3945e54ce432a9cda1b53d3a1042c0 (patch)
tree4cb7a85f417cbf95ecbafadb3ff8f6a4495e5fea /simon/items.cpp
parentf73d710eb3cf3939d7b6f5a1897da681fd2e7520 (diff)
downloadscummvm-rg350-5f756f5cca3945e54ce432a9cda1b53d3a1042c0.tar.gz
scummvm-rg350-5f756f5cca3945e54ce432a9cda1b53d3a1042c0.tar.bz2
scummvm-rg350-5f756f5cca3945e54ce432a9cda1b53d3a1042c0.zip
fixed speach getting turned off
added <escape> to skip cutscenes cleanup svn-id: r5867
Diffstat (limited to 'simon/items.cpp')
-rw-r--r--simon/items.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/simon/items.cpp b/simon/items.cpp
index f3c2c40b22..08561d7356 100644
--- a/simon/items.cpp
+++ b/simon/items.cpp
@@ -1370,21 +1370,20 @@ void SimonState::o_177()
void SimonState::o_quit_if_user_presses_y()
{
- OSystem::Event event;
-
for (;;) {
- _system->poll_event(&event);
- if (event.event_code == OSystem::EVENT_KEYDOWN) {
- // FIXME Arisme : better than being blocked ?
- if (event.kbd.keycode == 'y' ||
- event.kbd.keycode == 'o' || /* french */
- event.kbd.keycode == 'j' /* german I guess :) */)
+ delay(1);
+ switch (_key_pressed) {
+ case 'y':
+ case 'o': // french
+ case 'j': // german
_system->quit();
- else if (event.kbd.keycode == 'n')
break;
+
+ case 'n':
+ goto get_out;
}
- delay(10);
}
+get_out:;
}
void SimonState::o_unk_137(uint fcs_index)