aboutsummaryrefslogtreecommitdiff
path: root/engines/mohawk
diff options
context:
space:
mode:
authorMatthew Hoops2011-01-18 17:08:17 +0000
committerMatthew Hoops2011-01-18 17:08:17 +0000
commit5cd4bd3ce774b9880882561e28aadcaa6125f92a (patch)
tree5cb2bb9378058f48dcfb4bc438913b6bb0ae1da7 /engines/mohawk
parentb956f102d90aad0a166020c05d1e5994aca36242 (diff)
downloadscummvm-rg350-5cd4bd3ce774b9880882561e28aadcaa6125f92a.tar.gz
scummvm-rg350-5cd4bd3ce774b9880882561e28aadcaa6125f92a.tar.bz2
scummvm-rg350-5cd4bd3ce774b9880882561e28aadcaa6125f92a.zip
MOHAWK: Cleanup wrapMovieFilename()
svn-id: r55303
Diffstat (limited to 'engines/mohawk')
-rw-r--r--engines/mohawk/myst.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index f44096080d..cf12fea541 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -196,7 +196,9 @@ static const char *mystFiles[] = {
// 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 @@ static const char *mystFiles[] = {
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 @@ Common::String MohawkEngine_Myst::wrapMovieFilename(const Common::String &movieN
prefix = "stone/";
break;
default:
- prefix = ""; // Masterpiece Edition Only Movies
+ // Masterpiece Edition Only Movies
break;
}