[Scummvm-cvs-logs] SF.net SVN: scummvm:[55079] scummvm/trunk/engines/hugo

strangerke at users.sourceforge.net strangerke at users.sourceforge.net
Fri Dec 31 17:25:28 CET 2010


Revision: 55079
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55079&view=rev
Author:   strangerke
Date:     2010-12-31 16:25:28 +0000 (Fri, 31 Dec 2010)

Log Message:
-----------
HUGO: Saving a game is no longer authorized when gameOverFl is set

Modified Paths:
--------------
    scummvm/trunk/engines/hugo/parser_v1d.cpp
    scummvm/trunk/engines/hugo/parser_v1w.cpp

Modified: scummvm/trunk/engines/hugo/parser_v1d.cpp
===================================================================
--- scummvm/trunk/engines/hugo/parser_v1d.cpp	2010-12-31 15:46:57 UTC (rev 55078)
+++ scummvm/trunk/engines/hugo/parser_v1d.cpp	2010-12-31 16:25:28 UTC (rev 55079)
@@ -347,8 +347,12 @@
 		gameStatus.recallFl = true;
 		break;
 	case Common::KEYCODE_F4:                        // Save game
-		if (gameStatus.viewState == V_PLAY)
-			_vm->_file->saveGame(-1, Common::String());
+		if (gameStatus.viewState == V_PLAY) {
+			if (gameStatus.gameOverFl)
+				Utils::gameOverMsg();
+			else
+				_vm->_file->saveGame(-1, Common::String());
+		}
 		break;
 	case Common::KEYCODE_F5:                        // Restore game
 		_vm->_file->restoreGame(-1);

Modified: scummvm/trunk/engines/hugo/parser_v1w.cpp
===================================================================
--- scummvm/trunk/engines/hugo/parser_v1w.cpp	2010-12-31 15:46:57 UTC (rev 55078)
+++ scummvm/trunk/engines/hugo/parser_v1w.cpp	2010-12-31 16:25:28 UTC (rev 55079)
@@ -99,8 +99,12 @@
 		gameStatus.recallFl = true;
 		break;
 	case Common::KEYCODE_F4:                        // Save game
-		if (gameStatus.viewState == V_PLAY)
-			_vm->_file->saveGame(-1, Common::String());
+		if (gameStatus.viewState == V_PLAY) {
+			if (gameStatus.gameOverFl)
+				Utils::gameOverMsg();
+			else
+				_vm->_file->saveGame(-1, Common::String());
+		}
 		break;
 	case Common::KEYCODE_F5:                        // Restore game
 		_vm->_file->restoreGame(-1);
@@ -108,7 +112,9 @@
 		gameStatus.viewState = V_PLAY;
 		break;
 	case Common::KEYCODE_F6:                        // Inventory
-		if ((gameStatus.inventoryState == I_OFF) && (gameStatus.viewState == V_PLAY)) {
+		if (gameStatus.gameOverFl) {
+			Utils::gameOverMsg();
+	    } else if ((gameStatus.inventoryState == I_OFF) && (gameStatus.viewState == V_PLAY)) {
 			gameStatus.inventoryState = I_DOWN;
 			gameStatus.viewState = V_INVENT;
 		} else if (gameStatus.inventoryState == I_ACTIVE) {


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