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

[Kirben at users.sourceforge.net]

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

Log Message:
-----------
Change the work around for sq3.san, so it doesn't alter global smush frame rate (Which is a regression).

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

Modified: scummvm/trunk/engines/scumm/script_v6.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v6.cpp	2009-05-10 06:46:24 UTC (rev 40407)
+++ scummvm/trunk/engines/scumm/script_v6.cpp	2009-05-10 06:54:45 UTC (rev 40408)
@@ -2459,13 +2459,14 @@
 			if (args[1] == 0) {
 				const char *videoname = (const char *)getStringAddressVar(VAR_VIDEONAME);
 				assert(videoname);
-				if (strcmp(videoname, "sq3.san") == 0)
-					_smushFrameRate = 14;
 
 				// Correct incorrect smush filename in Macintosh FT demo
 				if ((_game.id == GID_FT) && (_game.features & GF_DEMO) && (_game.platform == Common::kPlatformMacintosh) &&
-					(strcmp(videoname, "jumpgorge.san") == 0))
+					(!strcmp(videoname, "jumpgorge.san")))
 					_splayer->play("jumpgorg.san", _smushFrameRate);
+				// TODO: Document exactly why this is required
+				else if (_game.id == GID_DIG && !strcmp(videoname, "sq3.san"))
+					_splayer->play(videoname, 14);
 				else
 					_splayer->play(videoname, _smushFrameRate);
 


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