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

[bluegr]

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:
d0195f4760 ULTIMA8: Error out if required game resources aren't found on startup


Commit: d0195f4760a0c2ecac8fbb15ef3eb48201cfe588
    https://github.com/scummvm/scummvm/commit/d0195f4760a0c2ecac8fbb15ef3eb48201cfe588
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-07T03:24:02+02:00

Commit Message:
ULTIMA8: Error out if required game resources aren't found on startup

This stops the game from running if a required game data file is
missing, such as U8SAVE.000. Fixes bug 12790

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


diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 8546b18910b..a889b41894b 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -585,7 +585,8 @@ Common::Error Ultima8Engine::startupGame() {
 	if (saveSlot == -1 && ConfMan.hasKey("lastSave"))
 		saveSlot = ConfMan.getInt("lastSave");
 
-	newGame(saveSlot);
+	if (!newGame(saveSlot))
+		return Common::kNoGameDataFoundError;
 
 	debug(1, "-- Game Initialized --");
 	return Common::kNoError;
@@ -1121,7 +1122,8 @@ bool Ultima8Engine::newGame(int saveSlot) {
 
 	setupCoreGumps();
 
-	_game->startGame();
+	if (!_game->startGame())
+		return false;
 
 	debug(1, "Create Camera...");
 	CameraProcess::SetCameraProcess(new CameraProcess(kMainActorId));