SCUMM: Try harder to open the Loom Macintosh executable.

Try the Mac OS Roman form, the UTF-8 form and the filename without
any trademark glyph.

1 files changed, 5 insertions, 4 deletions

diff --git a/engines/scumm/player_v3m.cpp b/engines/scumm/player_v3m.cpp
index 2d7c2eadc4..a1e69e2434 100644
--- a/engines/scumm/player_v3m.cpp
+++ b/engines/scumm/player_v3m.cpp
@@ -107,9 +107,10 @@ Player_V3M::Player_V3M(ScummEngine *scumm, Audio::Mixer *mixer)
 
 bool Player_V3M::checkMusicAvailable() {
 	Common::MacResManager resource;
-	// \252 is a trademark glyph. I don't think we should assume that it
-	// will be preserved when copying from the Mac disk.
-	if (!resource.exists("Loom\252") && !resource.exists("Loom")) {
+	// \xAA is a trademark glyph in Mac OS Roman. We try that, but also the
+	// UTF-8 version, and just plain without in case the file system can't
+	// handle exotic characters like that.
+	if (!resource.exists("Loom\xAA") && !resource.exists("Loom\xE2\x84\xA2") && !resource.exists("Loom")) {
 		GUI::MessageDialog dialog(_(
 			"Could not find the 'Loom' Macintosh executable to read the\n"
 			"instruments from. Music will be disabled."), _("OK"));
@@ -122,7 +123,7 @@ bool Player_V3M::checkMusicAvailable() {
 
 bool Player_V3M::loadMusic(const byte *ptr) {
 	Common::MacResManager resource;
-	if (!resource.open("Loom\252") && !resource.open("Loom")) {
+	if (!resource.open("Loom\xAA") && !resource.open("Loom\xE2\x84\xA2") && !resource.open("Loom")) {
 		return false;
 	}