[Scummvm-cvs-logs] SF.net SVN: scummvm:[42672] scummvm/trunk/engines/scumm/input.cpp
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Thu Jul 23 07:57:00 CEST 2009
Revision: 42672
http://scummvm.svn.sourceforge.net/scummvm/?rev=42672&view=rev
Author: Kirben
Date: 2009-07-23 05:57:00 +0000 (Thu, 23 Jul 2009)
Log Message:
-----------
Simplify the code to check whether loading or saving a game is possible.
Modified Paths:
--------------
scummvm/trunk/engines/scumm/input.cpp
Modified: scummvm/trunk/engines/scumm/input.cpp
===================================================================
--- scummvm/trunk/engines/scumm/input.cpp 2009-07-23 05:48:20 UTC (rev 42671)
+++ scummvm/trunk/engines/scumm/input.cpp 2009-07-23 05:57:00 UTC (rev 42672)
@@ -110,9 +110,9 @@
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,25 +120,9 @@
_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') {
_fastMode ^= 2;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list