From 46be9c3a1c0cce6b7d5888eeb46398decd6ff466 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Thu, 23 Jul 2009 05:57:00 +0000
Subject: Simplify the code to check whether loading or saving a game is
 possible.

svn-id: r42672
---
 engines/scumm/input.cpp | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

(limited to 'engines')

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') {
-- 
cgit v1.2.3