[Scummvm-git-logs] scummvm master -> 133e93aad535e240d61c51c5854dbee9e3903b07

[bluegr]

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

Summary:
843f49446c ULTIMA8: Report mising U8SAVE.000 file on startup
133e93aad5 ULTIMA8: Update POTFILES


Commit: 843f49446cf6d55c086a9efe7ef6737043ffb19a
    https://github.com/scummvm/scummvm/commit/843f49446cf6d55c086a9efe7ef6737043ffb19a
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2024-11-08T18:44:44+02:00

Commit Message:
ULTIMA8: Report mising U8SAVE.000 file on startup

The game can't really start without this data, no need to continue.

This fixes #12790.

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


diff --git a/engines/ultima/ultima8/games/u8_game.cpp b/engines/ultima/ultima8/games/u8_game.cpp
index a3b250edeff..f8bc32848f4 100644
--- a/engines/ultima/ultima8/games/u8_game.cpp
+++ b/engines/ultima/ultima8/games/u8_game.cpp
@@ -21,6 +21,9 @@
 
 #include "common/config-manager.h"
 #include "common/file.h"
+#include "common/translation.h"
+
+#include "gui/error.h"
 
 #include "ultima/ultima8/misc/debugger.h"
 
@@ -101,8 +104,14 @@ bool U8Game::startGame() {
 
 	auto *savers = new Common::File();
 	if (!savers->open("savegame/u8save.000")) {
-		warning("Unable to load savegame/u8save.000.");
+		Common::U32String errmsg = _(
+			"Missing Required File\n\n"
+			"Starting a game requires SAVEGAME/U8SAVE.000\n"
+			"from an original installation.\n\n"
+			"Please check you have copied all the files correctly.");
+		::GUI::displayErrorDialog(errmsg);
 		delete savers;
+		error("Unable to load savegame/u8save.000");
 		return false;
 	}
 	U8SaveFile *u8save = new U8SaveFile(savers);
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index a889b41894b..674d6031c27 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -386,7 +386,10 @@ void Ultima8Engine::pauseEngineIntern(bool pause) {
 			midiPlayer->pause(pause);
 	}
 
-	_avatarMoverProcess->resetMovementFlags();
+	// This will normally be non-null except in the case of
+	// a fatal error on startup (eg missing files)
+	if (_avatarMoverProcess)
+		_avatarMoverProcess->resetMovementFlags();
 }
 
 bool Ultima8Engine::hasFeature(EngineFeature f) const {


Commit: 133e93aad535e240d61c51c5854dbee9e3903b07
    https://github.com/scummvm/scummvm/commit/133e93aad535e240d61c51c5854dbee9e3903b07
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-08T18:44:44+02:00

Commit Message:
ULTIMA8: Update POTFILES

Changed paths:
    engines/ultima/POTFILES


diff --git a/engines/ultima/POTFILES b/engines/ultima/POTFILES
index 11f59ce48c0..2065446d56a 100644
--- a/engines/ultima/POTFILES
+++ b/engines/ultima/POTFILES
@@ -11,4 +11,5 @@ engines/ultima/nuvie/save/save_game.cpp
 engines/ultima/ultima8/metaengine.cpp
 engines/ultima/ultima8/ultima8.cpp
 engines/ultima/ultima8/games/cru_game.cpp
+engines/ultima/ultima8/games/u8_game.cpp
 engines/ultima/ultima8/gumps/u8_save_gump.cpp