[Scummvm-cvs-logs] scummvm master -> 7ecab9a982e68e6f500b8c056987acafb1ae1552

eriktorbjorn eriktorbjorn at telia.com
Mon Feb 14 20:47:32 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7ecab9a982 TOON: Disable quick save/load from the main menu screen.


Commit: 7ecab9a982e68e6f500b8c056987acafb1ae1552
    https://github.com/scummvm/scummvm/commit/7ecab9a982e68e6f500b8c056987acafb1ae1552
Author: eriktorbjorn (eriktorbjorn at users.sourceforge.net)
Date: 2011-02-14T11:44:18-08:00

Commit Message:
TOON: Disable quick save/load from the main menu screen.

Saving is pointless and loading doesn't work right. Unless it's
really easy, making quick load work from the main menu is hardly
worth it, since it has a perfectly usable load button already.

Changed paths:
    engines/toon/state.cpp
    engines/toon/state.h
    engines/toon/toon.cpp



diff --git a/engines/toon/state.cpp b/engines/toon/state.cpp
index 7167468..abd8a40 100644
--- a/engines/toon/state.cpp
+++ b/engines/toon/state.cpp
@@ -80,6 +80,7 @@ State::State(void) {
 
 	_showConversationIcons = false;
 
+	_inMenu = false;
 	_inCloseUp = false;
 	_inConversation = false;
 
diff --git a/engines/toon/state.h b/engines/toon/state.h
index 283e378..d31ff4f 100644
--- a/engines/toon/state.h
+++ b/engines/toon/state.h
@@ -62,6 +62,7 @@ public:
 	int16 _confiscatedInventory[35];
 	int32 _numInventoryItems;
 	int32 _numConfiscatedInventoryItems;
+	bool _inMenu;
 	bool _inCloseUp;
 	bool _inCutaway;
 	bool _inConversation;
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index 79e153a..d2b98c2 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -185,7 +185,7 @@ void ToonEngine::parseInput() {
 
 		bool hasModifier = event.kbd.hasFlags(Common::KBD_ALT|Common::KBD_CTRL|Common::KBD_SHIFT);
 		switch (event.type) {
-		case Common::EVENT_KEYUP:
+		case Common::EVENT_KEYDOWN:
 			if ((event.kbd.ascii == 27 || event.kbd.ascii == 32) && !hasModifier) {
 				_audioManager->stopCurrentVoice();
 			}
@@ -588,6 +588,8 @@ bool ToonEngine::showMainmenu(bool &loadedGame) {
 	AudioStreamInstance *mainmenuMusic = NULL;
 	bool musicPlaying = false;
 
+	_gameState->_inMenu = true;
+
 	while (!doExit) {
 		clickingOn = MAINMENUHOTSPOT_NONE;
 		clickRelease = false;
@@ -700,6 +702,8 @@ bool ToonEngine::showMainmenu(bool &loadedGame) {
 		}
 	}
 
+	_gameState->_inMenu = false;
+
 	//delete mainmenuMusic;
 	for (int entryNr = 0; entryNr < MAINMENU_ENTRYCOUNT; entryNr++)
 		delete entries[entryNr].animation;
@@ -2956,11 +2960,11 @@ void ToonEngine::pauseEngineIntern(bool pause) {
 }
 
 bool ToonEngine::canSaveGameStateCurrently() {
-	return !_gameState->_inInventory && !_gameState->_inConversation && !_gameState->_inCutaway && !_gameState->_mouseHidden && !_moviePlayer->isPlaying();
+	return !_gameState->_inMenu && !_gameState->_inInventory && !_gameState->_inConversation && !_gameState->_inCutaway && !_gameState->_mouseHidden && !_moviePlayer->isPlaying();
 }
 
 bool ToonEngine::canLoadGameStateCurrently() {
-	return !_gameState->_inInventory && !_gameState->_inConversation && !_gameState->_inCutaway && !_gameState->_mouseHidden && !_moviePlayer->isPlaying();
+	return !_gameState->_inMenu && !_gameState->_inInventory && !_gameState->_inConversation && !_gameState->_inCutaway && !_gameState->_mouseHidden && !_moviePlayer->isPlaying();
 }
 
 Common::String ToonEngine::getSavegameName(int nr) {






More information about the Scummvm-git-logs mailing list