[Scummvm-git-logs] scummvm master -> 0c9b5a93f36fc1b97c2bbd9a6dcbf7aed7b390a6

[NMIError]

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:
0c9b5a93f3 ULTIMA6: Fix journey onwards


Commit: 0c9b5a93f36fc1b97c2bbd9a6dcbf7aed7b390a6
    https://github.com/scummvm/scummvm/commit/0c9b5a93f36fc1b97c2bbd9a6dcbf7aed7b390a6
Author: Coen Rampen (crampen at gmail.com)
Date: 2021-08-16T21:58:11+02:00

Commit Message:
ULTIMA6: Fix journey onwards

The Journey Onwards menu option would not actually load a savegame if the user
selected it from the main menu; it would just start a new game. Changed this to
loading the savegame in the last slot used for saving. This fixes bug #12531.

Changed paths:
    engines/ultima/nuvie/nuvie.cpp


diff --git a/engines/ultima/nuvie/nuvie.cpp b/engines/ultima/nuvie/nuvie.cpp
index 00c5fc9a46..d9b14c0d1d 100644
--- a/engines/ultima/nuvie/nuvie.cpp
+++ b/engines/ultima/nuvie/nuvie.cpp
@@ -355,6 +355,12 @@ bool NuvieEngine::journeyOnwards() {
 		return _savegame->load_new();
 	}
 
+	// Load the savegame from the last slot which was used for saving
+	if (ConfMan.hasKey("latest_save")) {
+		int saveSlot = ConfMan.getInt("latest_save");
+		return loadGameState(saveSlot).getCode() == Common::kNoError;
+	}
+
 	// Otherwise start a new game
 	return _savegame->load_new();
 }