[Scummvm-cvs-logs] SF.net SVN: scummvm:[40407] scummvm/trunk/engines/scumm

[Kirben at users.sourceforge.net]

Revision: 40407
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40407&view=rev
Author:   Kirben
Date:     2009-05-10 06:46:24 +0000 (Sun, 10 May 2009)

Log Message:
-----------
Correct and move initial SMUSH frame rate value, for the demo version of The Dig.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/script_v6.cpp
    scummvm/trunk/engines/scumm/scumm.cpp

Modified: scummvm/trunk/engines/scumm/script_v6.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v6.cpp	2009-05-10 06:24:58 UTC (rev 40406)
+++ scummvm/trunk/engines/scumm/script_v6.cpp	2009-05-10 06:46:24 UTC (rev 40407)
@@ -2455,9 +2455,6 @@
 		grabCursor(args[1], args[2], args[3], args[4]);
 		break;
 	case 6: {
-			if (_smushFrameRate == 0)
-				_smushFrameRate = 14;
-
 			// SMUSH movie playback
 			if (args[1] == 0) {
 				const char *videoname = (const char *)getStringAddressVar(VAR_VIDEONAME);

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2009-05-10 06:24:58 UTC (rev 40406)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2009-05-10 06:46:24 UTC (rev 40407)
@@ -1207,7 +1207,10 @@
 #ifdef ENABLE_SCUMM_7_8
 void ScummEngine_v7::setupScumm() {
 
-	_smushFrameRate = (_game.id == GID_FT) ? 10 : 12;
+	if (_game.id == GID_DIG && (_game.features & GF_DEMO))
+		_smushFrameRate = 15;
+	else
+		_smushFrameRate = (_game.id == GID_FT) ? 10 : 12;
 
 	_musicEngine = _imuseDigital = new IMuseDigital(this, _mixer, 10);
 


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