From 3738507d7fac1b9a349e658e59eb6532a63fa9c5 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Tue, 19 Jan 2010 19:21:31 +0000
Subject: Add support for the flyby videos in Myst ME Macintosh.

svn-id: r47388
---
 engines/mohawk/myst.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'engines/mohawk/myst.cpp')

diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index cf9837043f..753ab83b7b 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -118,6 +118,10 @@ static const char *mystFiles[] = {
 // qtw/myst/libelev.mov:	libup.mov is basically the same with sound
 
 Common::String MohawkEngine_Myst::wrapMovieFilename(Common::String movieName, uint16 stack) {
+	// The Macintosh release of Myst ME stores its videos in a different folder
+	if ((getFeatures() & GF_ME) && getPlatform() == Common::kPlatformMacintosh)
+		return Common::String("CD Data/m/") + movieName + ".mov";
+
 	const char* prefix;
 	
 	switch (stack) {
@@ -151,9 +155,6 @@ Common::String MohawkEngine_Myst::wrapMovieFilename(Common::String movieName, ui
 		break;
 	}
 
-	if ((getFeatures() & GF_ME) && getPlatform() == Common::kPlatformMacintosh)
-		return Common::String("CD Data/m/") + movieName + ".mov";
-
 	return Common::String("qtw/") + prefix + movieName + ".mov";
 }
 
-- 
cgit v1.2.3