[Scummvm-git-logs] scummvm branch-2-3 -> 632bfd5c2103a2c83f0b4c86338f8f78ce148148

[mduggan]

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:
632bfd5c21 ULTIMA8: Provide message on why movies and sound don't work


Commit: 632bfd5c2103a2c83f0b4c86338f8f78ce148148
    https://github.com/scummvm/scummvm/commit/632bfd5c2103a2c83f0b4c86338f8f78ce148148
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-09-08T07:29:41+09:00

Commit Message:
ULTIMA8: Provide message on why movies and sound don't work

A few people have not noticed that the GOG version includes a CD image and some
files need to be taken from there.  This should help those people.

The same problem will happen for anyone who has an old install of the game and
forgets that it uses some files from the CD.

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


diff --git a/engines/ultima/ultima8/games/cru_game.cpp b/engines/ultima/ultima8/games/cru_game.cpp
index 433f15af83..701a9fe2ea 100644
--- a/engines/ultima/ultima8/games/cru_game.cpp
+++ b/engines/ultima/ultima8/games/cru_game.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/config-manager.h"
+#include "common/translation.h"
 
 #include "ultima/ultima8/misc/pent_include.h"
 #include "ultima/ultima8/games/cru_game.h"
@@ -43,6 +44,8 @@
 #include "ultima/ultima8/world/actors/npc_dat.h"
 #include "common/memstream.h"
 
+#include "gui/message.h"
+
 namespace Ultima {
 namespace Ultima8 {
 
@@ -159,7 +162,12 @@ ProcId CruGame::playIntroMovie(bool fade) {
 	if (_skipIntroMovie)
 		return 0;
 	const char *name = (GAME_IS_REMORSE ? "T01" : "origin");
-	return playMovie(name, fade, true);
+	ProcId pid = playMovie(name, fade, true);
+	if (!pid) {
+		GUI::MessageDialogWithURL dialog(_("Crusader intro movie file missing - check that the FLICS and SOUND directories have been copied from the CD.  More instructions are on the wiki: https://wiki.scummvm.org/index.php?title=Crusader:_No_Remorse."), "https://wiki.scummvm.org/index.php?title=Crusader:_No_Remorse");
+		dialog.runModal();
+	}
+	return pid;
 }
 
 ProcId CruGame::playIntroMovie2(bool fade) {