[Scummvm-git-logs] scummvm master -> db1ed9c754c8ed21b5fe71aec486247038086998

[sev-]

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

Summary:
838e9cf1f3 MOHAWK: RIVEN: Fix autosave on exit during cutscene
c9e4acbf11 MOHAWK: RIVEN: Improve calling autosave on exit
db1ed9c754 JANITORIAL: Remove stray space


Commit: 838e9cf1f362244211287f4b17a44e88aca3d6fd
    https://github.com/scummvm/scummvm/commit/838e9cf1f362244211287f4b17a44e88aca3d6fd
Author: macca8 (brugenerol at tpg.com.au)
Date: 2023-05-14T22:39:12+02:00

Commit Message:
MOHAWK: RIVEN: Fix autosave on exit during cutscene

Reposition autosave call to precede any changes to game state that follow the exit call.

Changed paths:
    engines/mohawk/riven.cpp


diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index 5094c179e14..da2e805cce7 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -201,9 +201,6 @@ Common::Error MohawkEngine_Riven::run() {
 	while (!hasGameEnded())
 		doFrame();
 
-	// Attempt to autosave before exiting from the GMM / when closing the window
-	saveAutosaveIfEnabled();
-
 	return Common::kNoError;
 }
 
@@ -218,6 +215,11 @@ void MohawkEngine_Riven::doFrame() {
 	}
 
 	processInput();
+	
+	if (hasGameEnded()) {
+		// Attempt to autosave before exiting
+		saveAutosaveIfEnabled();
+	}
 
 	_stack->onFrame();
 


Commit: c9e4acbf115bb679e59daa8a16e94531f23a7535
    https://github.com/scummvm/scummvm/commit/c9e4acbf115bb679e59daa8a16e94531f23a7535
Author: macca8 (brugenerol at tpg.com.au)
Date: 2023-05-14T22:39:12+02:00

Commit Message:
MOHAWK: RIVEN: Improve calling autosave on exit

Changed paths:
    engines/mohawk/riven.cpp


diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index da2e805cce7..d3cb5801865 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -216,11 +216,6 @@ void MohawkEngine_Riven::doFrame() {
 
 	processInput();
 	
-	if (hasGameEnded()) {
-		// Attempt to autosave before exiting
-		saveAutosaveIfEnabled();
-	}
-
 	_stack->onFrame();
 
 	if (!_scriptMan->runningQueuedScripts()) {
@@ -285,6 +280,11 @@ void MohawkEngine_Riven::processInput() {
 				} else if (!isGameVariant(GF_25TH)) {
 					openMainMenuDialog();
 				}
+					
+				if (!isGameVariant(GF_DEMO) && hasGameEnded()) {
+					// Attempt to autosave before exiting
+					saveAutosaveIfEnabled();
+				}	
 				break;
 			case kRivenActionPlayIntroVideos:
 				// Play the intro videos in the demo
@@ -309,6 +309,11 @@ void MohawkEngine_Riven::processInput() {
 				break;
 			}
 			break;
+		case Common::EVENT_QUIT:
+		case Common::EVENT_RETURN_TO_LAUNCHER:
+			// Attempt to autosave before exiting
+			saveAutosaveIfEnabled();
+			break;
 		default:
 			break;
 		}


Commit: db1ed9c754c8ed21b5fe71aec486247038086998
    https://github.com/scummvm/scummvm/commit/db1ed9c754c8ed21b5fe71aec486247038086998
Author: macca8 (brugenerol at tpg.com.au)
Date: 2023-05-14T22:39:12+02:00

Commit Message:
JANITORIAL: Remove stray space

Changed paths:
    engines/mohawk/riven.cpp


diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index d3cb5801865..3b609a16852 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -215,7 +215,7 @@ void MohawkEngine_Riven::doFrame() {
 	}
 
 	processInput();
-	
+
 	_stack->onFrame();
 
 	if (!_scriptMan->runningQueuedScripts()) {