diff options
| author | Max Horn | 2002-05-19 12:35:43 +0000 |
|---|---|---|
| committer | Max Horn | 2002-05-19 12:35:43 +0000 |
| commit | d2398b4b7e664dd174b4dcb827d83ccb8cfc3613 (patch) | |
| tree | cd460b60768cfa15a85590c331d9ce80f84076ae /scummvm.cpp | |
| parent | f453058bf21fbad286f498eab10930fb1e83ad97 (diff) | |
| download | scummvm-rg350-d2398b4b7e664dd174b4dcb827d83ccb8cfc3613.tar.gz scummvm-rg350-d2398b4b7e664dd174b4dcb827d83ccb8cfc3613.tar.bz2 scummvm-rg350-d2398b4b7e664dd174b4dcb827d83ccb8cfc3613.zip | |
fixed #557574 - quickload/save shortcuts where passed on to game engine, which is wrong
svn-id: r4354
Diffstat (limited to 'scummvm.cpp')
| -rw-r--r-- | scummvm.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/scummvm.cpp b/scummvm.cpp index d00fa6113f..3e8070f7e5 100644 --- a/scummvm.cpp +++ b/scummvm.cpp @@ -1200,16 +1200,13 @@ void Scumm::waitForTimer(int msec_delay) { while (_system->poll_event(&event)) { switch(event.event_code) { case OSystem::EVENT_KEYDOWN: - _keyPressed = event.kbd.ascii; - - if (event.kbd.keycode >= '0' && event.kbd.keycode<='9') { - if (event.kbd.flags == OSystem::KBD_SHIFT || - event.kbd.flags == OSystem::KBD_CTRL) { - _saveLoadSlot = event.kbd.keycode - '0'; - sprintf(_saveLoadName, "Quicksave %d", _saveLoadSlot); - _saveLoadFlag = (event.kbd.flags == OSystem::KBD_SHIFT) ? 1 : 2; - _saveLoadCompatible = false; - } + if (event.kbd.keycode >= '0' && event.kbd.keycode<='9' + && (event.kbd.flags == OSystem::KBD_SHIFT || + event.kbd.flags == OSystem::KBD_CTRL)) { + _saveLoadSlot = event.kbd.keycode - '0'; + sprintf(_saveLoadName, "Quicksave %d", _saveLoadSlot); + _saveLoadFlag = (event.kbd.flags == OSystem::KBD_SHIFT) ? 1 : 2; + _saveLoadCompatible = false; } else if (event.kbd.flags==OSystem::KBD_CTRL) { if (event.kbd.keycode=='f') _fastMode ^= 1; @@ -1219,7 +1216,8 @@ void Scumm::waitForTimer(int msec_delay) { g_debugger.attach(this); else if (event.kbd.keycode=='s') resourceStats(); - } + } else + _keyPressed = event.kbd.ascii; // Normal key press, pass on to the game. break; case OSystem::EVENT_MOUSEMOVE: |