[Scummvm-cvs-logs] SF.net SVN: scummvm:[47388] scummvm/trunk/engines/mohawk
mthreepwood at users.sourceforge.net
mthreepwood at users.sourceforge.net
Tue Jan 19 20:21:33 CET 2010
Revision: 47388
http://scummvm.svn.sourceforge.net/scummvm/?rev=47388&view=rev
Author: mthreepwood
Date: 2010-01-19 19:21:31 +0000 (Tue, 19 Jan 2010)
Log Message:
-----------
Add support for the flyby videos in Myst ME Macintosh.
Modified Paths:
--------------
scummvm/trunk/engines/mohawk/myst.cpp
scummvm/trunk/engines/mohawk/myst_scripts.cpp
Modified: scummvm/trunk/engines/mohawk/myst.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst.cpp 2010-01-19 19:20:33 UTC (rev 47387)
+++ scummvm/trunk/engines/mohawk/myst.cpp 2010-01-19 19:21:31 UTC (rev 47388)
@@ -118,6 +118,10 @@
// 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 @@
break;
}
- if ((getFeatures() & GF_ME) && getPlatform() == Common::kPlatformMacintosh)
- return Common::String("CD Data/m/") + movieName + ".mov";
-
return Common::String("qtw/") + prefix + movieName + ".mov";
}
Modified: scummvm/trunk/engines/mohawk/myst_scripts.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst_scripts.cpp 2010-01-19 19:20:33 UTC (rev 47387)
+++ scummvm/trunk/engines/mohawk/myst_scripts.cpp 2010-01-19 19:21:31 UTC (rev 47388)
@@ -1334,25 +1334,42 @@
while (_vm->_mixer->isSoundHandleActive(*handle))
_vm->_system->delayMillis(10);
- // Play Flyby Entry Movie on Masterpiece Edition..
+ // Play Flyby Entry Movie on Masterpiece Edition. The Macintosh version is currently hooked
+ // up to the Cinepak versions of the video (the 'c' suffix) until the SVQ1 decoder is completed.
if ((_vm->getFeatures() & GF_ME)) {
switch (stack_map[_vm->_varStore->getVar(var)]) {
case kSeleniticStack:
- _vm->_video->playMovieCentered(_vm->wrapMovieFilename("selenitic flyby", kMasterpieceOnly));
+ if (_vm->getPlatform() == Common::kPlatformMacintosh)
+ _vm->_video->playMovieCentered(_vm->wrapMovieFilename("FLY_SEc", kMasterpieceOnly));
+ else
+ _vm->_video->playMovieCentered(_vm->wrapMovieFilename("selenitic flyby", kMasterpieceOnly));
break;
case kStoneshipStack:
- _vm->_video->playMovieCentered(_vm->wrapMovieFilename("stoneship flyby", kMasterpieceOnly));
+ if (_vm->getPlatform() == Common::kPlatformMacintosh)
+ _vm->_video->playMovieCentered(_vm->wrapMovieFilename("FLY_STc", kMasterpieceOnly));
+ else
+ _vm->_video->playMovieCentered(_vm->wrapMovieFilename("stoneship flyby", kMasterpieceOnly));
break;
// Myst Flyby Movie not used in Original Masterpiece Edition Engine
case kMystStack:
- if (_vm->_tweaksEnabled)
- _vm->_video->playMovieCentered(_vm->wrapMovieFilename("myst flyby", kMasterpieceOnly));
+ if (_vm->_tweaksEnabled) {
+ if (_vm->getPlatform() == Common::kPlatformMacintosh)
+ _vm->_video->playMovieCentered(_vm->wrapMovieFilename("FLY_MYc", kMasterpieceOnly));
+ else
+ _vm->_video->playMovieCentered(_vm->wrapMovieFilename("myst flyby", kMasterpieceOnly));
+ }
break;
case kMechanicalStack:
- _vm->_video->playMovieCentered(_vm->wrapMovieFilename("mech age flyby", kMasterpieceOnly));
+ if (_vm->getPlatform() == Common::kPlatformMacintosh)
+ _vm->_video->playMovieCentered(_vm->wrapMovieFilename("FLY_MEc", kMasterpieceOnly));
+ else
+ _vm->_video->playMovieCentered(_vm->wrapMovieFilename("mech age flyby", kMasterpieceOnly));
break;
case kChannelwoodStack:
- _vm->_video->playMovieCentered(_vm->wrapMovieFilename("channelwood flyby", kMasterpieceOnly));
+ if (_vm->getPlatform() == Common::kPlatformMacintosh)
+ _vm->_video->playMovieCentered(_vm->wrapMovieFilename("FLY_CHc", kMasterpieceOnly));
+ else
+ _vm->_video->playMovieCentered(_vm->wrapMovieFilename("channelwood flyby", kMasterpieceOnly));
break;
default:
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list