libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-02 08:55:45 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fixed #557574 - quickload/save shortcuts where passed on to game engine, which is wrong

Browse Source 
svn-id: r4354
This commit is contained in:
Max Horn 2002-05-19 12:35:43 +00:00
parent f453058bf2
commit d2398b4b7e
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scummvm.cpp
View File

@ -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: