[Scummvm-cvs-logs] SF.net SVN: scummvm:[55303] scummvm/trunk/engines/mohawk/myst.cpp

[mthreepwood at users.sourceforge.net]

Revision: 55303
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55303&view=rev
Author:   mthreepwood
Date:     2011-01-18 17:08:17 +0000 (Tue, 18 Jan 2011)

Log Message:
-----------
MOHAWK: Cleanup wrapMovieFilename()

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/myst.cpp

Modified: scummvm/trunk/engines/mohawk/myst.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst.cpp	2011-01-18 17:03:21 UTC (rev 55302)
+++ scummvm/trunk/engines/mohawk/myst.cpp	2011-01-18 17:08:17 UTC (rev 55303)
@@ -196,7 +196,9 @@
 // Mechanical Stack Movie "sstairs" referenced in executable, but not used?
 
 // NOTE: cl1wg1.mov etc. found in the root directory in versions of Myst
-// Original are duplicates of those in /qtw/myst directory and thus not necessary.
+// Original are duplicates of those in qtw/myst directory and thus not necessary.
+// However, this *is* a problem for Myst ME Mac. Right now it will use the qtw/myst
+// video, but this is most likely going to fail for the standalone Mac version.
 
 // The following movies are not referenced in RLST or hardcoded into the executables.
 // It is likely they are unused:
@@ -206,11 +208,11 @@
 
 Common::String MohawkEngine_Myst::wrapMovieFilename(const Common::String &movieName, uint16 stack) {
 	// The Macintosh release of Myst ME stores its videos in a different folder
-	// WORKAROUND: The gear rotation videos are not in the CD Data folder
+	// WORKAROUND: The gear rotation videos are not in the CD Data folder. See above comments.
 	if ((getFeatures() & GF_ME) && getPlatform() == Common::kPlatformMacintosh && !movieName.matchString("cl1wg?"))
 		return Common::String("CD Data/m/") + movieName + ".mov";
 
-	const char* prefix;
+	Common::String prefix;
 
 	switch (stack) {
 	case kIntroStack:
@@ -239,7 +241,7 @@
 		prefix = "stone/";
 		break;
 	default:
-		prefix = ""; // Masterpiece Edition Only Movies
+		// Masterpiece Edition Only Movies
 		break;
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.