diff options
| author | Travis Howell | 2009-07-23 05:57:00 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-07-23 05:57:00 +0000 |
| commit | 46be9c3a1c0cce6b7d5888eeb46398decd6ff466 (patch) | |
| tree | 0b93d63e1df294708a816ff680db3c883f79310f /engines | |
| parent | fad11ade6efbfcbd61c4398fb2f077a278057334 (diff) | |
| download | scummvm-rg350-46be9c3a1c0cce6b7d5888eeb46398decd6ff466.tar.gz scummvm-rg350-46be9c3a1c0cce6b7d5888eeb46398decd6ff466.tar.bz2 scummvm-rg350-46be9c3a1c0cce6b7d5888eeb46398decd6ff466.zip | |
Simplify the code to check whether loading or saving a game is possible.
svn-id: r42672
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/input.cpp | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp index 4eadda8485..db102f5591 100644 --- a/engines/scumm/input.cpp +++ b/engines/scumm/input.cpp @@ -110,9 +110,9 @@ void ScummEngine_v80he::parseEvent(Common::Event event) { void ScummEngine::parseEvent(Common::Event event) { switch (event.type) { case Common::EVENT_KEYDOWN: - if (event.kbd.keycode >= '0' && event.kbd.keycode <= '9' - && event.kbd.flags == Common::KBD_CTRL && - canLoadGameStateCurrently()) { + if (event.kbd.keycode >= '0' && event.kbd.keycode <= '9' && + ((event.kbd.flags == Common::KBD_ALT && canSaveGameStateCurrently()) || + (event.kbd.flags == Common::KBD_CTRL && canLoadGameStateCurrently()))) { _saveLoadSlot = event.kbd.keycode - '0'; // don't overwrite autosave (slot 0) @@ -120,24 +120,8 @@ void ScummEngine::parseEvent(Common::Event event) { _saveLoadSlot = 10; sprintf(_saveLoadName, "Quicksave %d", _saveLoadSlot); - _saveLoadFlag = 2; + _saveLoadFlag = (event.kbd.flags == Common::KBD_ALT) ? 1 : 2; _saveTemporaryState = false; - } else if (event.kbd.keycode >= '0' && event.kbd.keycode <= '9' - && event.kbd.flags == Common::KBD_ALT && - canSaveGameStateCurrently()) { - _saveLoadSlot = event.kbd.keycode - '0'; - - // don't overwrite autosave (slot 0) - if (_saveLoadSlot == 0) - _saveLoadSlot = 10; - - sprintf(_saveLoadName, "Quicksave %d", _saveLoadSlot); - _saveLoadFlag = 1; - _saveTemporaryState = false; - } else if (event.kbd.flags == Common::KBD_CTRL && event.kbd.keycode == 'f') { - - - } else if (event.kbd.flags == Common::KBD_CTRL && event.kbd.keycode == 'f') { _fastMode ^= 1; } else if (event.kbd.flags == Common::KBD_CTRL && event.kbd.keycode == 'g') { |