[Scummvm-cvs-logs] SF.net SVN: scummvm:[40734] scummvm/trunk/engines/sword2

[eriktorbjorn at users.sourceforge.net]

Revision: 40734
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40734&view=rev
Author:   eriktorbjorn
Date:     2009-05-20 04:07:34 +0000 (Wed, 20 May 2009)

Log Message:
-----------
Removed the "seamless" flag. It was something I added to cope with the fade
in/out behaviour of the MPEG cutscene player, and no longer seems to be needed.

Modified Paths:
--------------
    scummvm/trunk/engines/sword2/animation.cpp
    scummvm/trunk/engines/sword2/animation.h

Modified: scummvm/trunk/engines/sword2/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword2/animation.cpp	2009-05-19 21:09:43 UTC (rev 40733)
+++ scummvm/trunk/engines/sword2/animation.cpp	2009-05-20 04:07:34 UTC (rev 40734)
@@ -47,25 +47,25 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 static const MovieInfo sequenceList[19] = {
-	{ "carib",    222, false },
-	{ "escape",   187, false },
-	{ "eye",      248, false },
-	{ "finale",  1485, false },
-	{ "guard",     75, false },
-	{ "intro",   1800, false },
-	{ "jungle",   186, false },
-	{ "museum",   167, false },
-	{ "pablo",     75, false },
-	{ "pyramid",   60, false },
-	{ "quaram",   184, false },
-	{ "river",    656, false },
-	{ "sailing",  138, false },
-	{ "shaman",   788, true  },
-	{ "stone1",    34, true  },
-	{ "stone2",   282, false },
-	{ "stone3",    65, true  },
-	{ "demo",      60, false },
-	{ "enddemo",  110, false }
+	{ "carib",    222 },
+	{ "escape",   187 },
+	{ "eye",      248 },
+	{ "finale",  1485 },
+	{ "guard",     75 },
+	{ "intro",   1800 },
+	{ "jungle",   186 },
+	{ "museum",   167 },
+	{ "pablo",     75 },
+	{ "pyramid",   60 },
+	{ "quaram",   184 },
+	{ "river",    656 },
+	{ "sailing",  138 },
+	{ "shaman",   788 },
+	{ "stone1",    34 },
+	{ "stone2",   282 },
+	{ "stone3",    65 },
+	{ "demo",      60 },
+	{ "enddemo",  110 }
 };
 
 MoviePlayer::MoviePlayer(Sword2Engine *vm, Audio::Mixer *snd, OSystem *system, Audio::SoundHandle *bgSoundHandle, Graphics::VideoDecoder *decoder, DecoderType decoderType)
@@ -128,10 +128,7 @@
 	if (_vm->shouldQuit())
 		return;
 
-	bool seamless = false;
-
 	if (_id >= 0) {
-		seamless = sequenceList[_id].seamless;
 		_numFrames = sequenceList[_id].frames;
 		if (_numFrames > 60)
 			_leadOutFrame = _numFrames - 60;

Modified: scummvm/trunk/engines/sword2/animation.h
===================================================================
--- scummvm/trunk/engines/sword2/animation.h	2009-05-19 21:09:43 UTC (rev 40733)
+++ scummvm/trunk/engines/sword2/animation.h	2009-05-20 04:07:34 UTC (rev 40734)
@@ -61,7 +61,6 @@
 struct MovieInfo {
 	const char *name;
 	int frames;
-	bool seamless;
 };
 
 class DXADecoderWithSound : public Graphics::DXADecoder {


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