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

bgk at users.sourceforge.net bgk at users.sourceforge.net
Mon Nov 29 22:02:39 CET 2010


Revision: 54644
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54644&view=rev
Author:   bgk
Date:     2010-11-29 21:02:39 +0000 (Mon, 29 Nov 2010)

Log Message:
-----------
MOHAWK: Set the initial stack back to the intro

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

Modified: scummvm/trunk/engines/mohawk/myst.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst.cpp	2010-11-29 21:02:25 UTC (rev 54643)
+++ scummvm/trunk/engines/mohawk/myst.cpp	2010-11-29 21:02:39 UTC (rev 54644)
@@ -250,12 +250,12 @@
 	else if (getFeatures() & GF_DEMO)
 		changeToStack(kDemoStack);
 	else
-		changeToStack(kSeleniticStack);
+		changeToStack(kIntroStack);
 
 	if (getFeatures() & GF_DEMO)
 		changeToCard(2000, true);
 	else
-		changeToCard(1285, true);
+		changeToCard(1, true);
 
 	// Load game from launcher/command line if requested
 	if (ConfMan.hasKey("save_slot") && !(getFeatures() & GF_DEMO)) {

Modified: scummvm/trunk/engines/mohawk/myst_scripts_myst.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst_scripts_myst.cpp	2010-11-29 21:02:25 UTC (rev 54643)
+++ scummvm/trunk/engines/mohawk/myst_scripts_myst.cpp	2010-11-29 21:02:39 UTC (rev 54644)
@@ -2136,22 +2136,22 @@
 		//        change is performed.
 
 		// Play Intro Movies..
-//		if ((_vm->getFeatures() & GF_ME) && _vm->getPlatform() == Common::kPlatformMacintosh) {
-//			_vm->_video->playMovieCentered(_vm->wrapMovieFilename("mattel", kIntroStack));
-//			_vm->_video->playMovieCentered(_vm->wrapMovieFilename("presto", kIntroStack));
-//		} else
-//			_vm->_video->playMovieCentered(_vm->wrapMovieFilename("broder", kIntroStack));
-//
-//		_vm->_video->playMovieCentered(_vm->wrapMovieFilename("cyanlogo", kIntroStack));
-//
-//		if (!(_vm->getFeatures() & GF_DEMO)) { // The demo doesn't have the intro video
-//			if ((_vm->getFeatures() & GF_ME) && _vm->getPlatform() == Common::kPlatformMacintosh)
-//				// intro.mov uses Sorenson, introc uses Cinepak. Otherwise, they're the same.
-//				_vm->_video->playMovieCentered(_vm->wrapMovieFilename("introc", kIntroStack));
-//			else
-//				_vm->_video->playMovieCentered(_vm->wrapMovieFilename("intro", kIntroStack));
-//		}
+		if ((_vm->getFeatures() & GF_ME) && _vm->getPlatform() == Common::kPlatformMacintosh) {
+			_vm->_video->playMovieCentered(_vm->wrapMovieFilename("mattel", kIntroStack));
+			_vm->_video->playMovieCentered(_vm->wrapMovieFilename("presto", kIntroStack));
+		} else
+			_vm->_video->playMovieCentered(_vm->wrapMovieFilename("broder", kIntroStack));
 
+		_vm->_video->playMovieCentered(_vm->wrapMovieFilename("cyanlogo", kIntroStack));
+
+		if (!(_vm->getFeatures() & GF_DEMO)) { // The demo doesn't have the intro video
+			if ((_vm->getFeatures() & GF_ME) && _vm->getPlatform() == Common::kPlatformMacintosh)
+				// intro.mov uses Sorenson, introc uses Cinepak. Otherwise, they're the same.
+				_vm->_video->playMovieCentered(_vm->wrapMovieFilename("introc", kIntroStack));
+			else
+				_vm->_video->playMovieCentered(_vm->wrapMovieFilename("intro", kIntroStack));
+		}
+
 		_vm->changeToCard(_vm->getCurCard()+1, true);
 		break;
 	case kSeleniticStack:


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