[Scummvm-cvs-logs] SF.net SVN: scummvm:[48801] scummvm/trunk/engines/tucker

cyx at users.sourceforge.net cyx at users.sourceforge.net
Sun Apr 25 23:53:27 CEST 2010


Revision: 48801
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48801&view=rev
Author:   cyx
Date:     2010-04-25 21:53:27 +0000 (Sun, 25 Apr 2010)

Log Message:
-----------
fix missing sound effects during introduction with non French versions.

Modified Paths:
--------------
    scummvm/trunk/engines/tucker/sequences.cpp
    scummvm/trunk/engines/tucker/staticres.cpp

Modified: scummvm/trunk/engines/tucker/sequences.cpp
===================================================================
--- scummvm/trunk/engines/tucker/sequences.cpp	2010-04-25 21:53:09 UTC (rev 48800)
+++ scummvm/trunk/engines/tucker/sequences.cpp	2010-04-25 21:53:27 UTC (rev 48801)
@@ -535,6 +535,12 @@
 			if (_seqNum == 1) {
 				break;
 			}
+			// budttle2.flc is shorter in french version ; start the background music
+			// earlier and skip any sounds effects
+			if (_seqNum == 19 && _flicPlayer[0].getFrameCount() == 126) {
+				_soundSeqDataIndex = 6;
+				_frameCounter = 80;
+			}
 		}
 		(this->*(_updateFunc[_updateFuncIndex].play))();
 		if (_changeToNextSequence) {
@@ -765,8 +771,8 @@
 		_flicPlayer[index].copyFrameToBuffer(_offscreenBuffer, 0, 0, kScreenWidth);
 	} else {
 		_flicPlayer[index].copyDirtyRectsToBuffer(_offscreenBuffer, kScreenWidth);
-		++_frameCounter;
 	}
+	++_frameCounter;
 	if (index == 0) {
 		if (_flicPlayer[index].paletteChanged()) {
 			getRGBPalette(index);

Modified: scummvm/trunk/engines/tucker/staticres.cpp
===================================================================
--- scummvm/trunk/engines/tucker/staticres.cpp	2010-04-25 21:53:09 UTC (rev 48800)
+++ scummvm/trunk/engines/tucker/staticres.cpp	2010-04-25 21:53:27 UTC (rev 48801)
@@ -340,7 +340,7 @@
 	{   1,  80, 13,  9, 43, _soundDataSeq15_16 },
 	{   1,  80, 11,  0, 11, _soundDataSeq27_28 },
 	{ 104, 100,  0,  0,  0, 0 },
-	{   0, 100,  4,  0,  7, _soundDataSeq19_20 }
+	{   0,   0,  4,  0,  7, _soundDataSeq19_20 }
 };
 
 const char *AnimationSequencePlayer::_audioFileNamesTable[] = {


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