diff options
| author | Torbjörn Andersson | 2009-05-20 04:07:34 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2009-05-20 04:07:34 +0000 |
| commit | 358b1a7c7ea08e60c88e7318345494d3e775cda2 (patch) | |
| tree | 271e0547b5a1614c9aff21ee2168b0142ed7b8f5 /engines/sword2 | |
| parent | 40dd214789ec627624a7703798907b7afbf50b8e (diff) | |
| download | scummvm-rg350-358b1a7c7ea08e60c88e7318345494d3e775cda2.tar.gz scummvm-rg350-358b1a7c7ea08e60c88e7318345494d3e775cda2.tar.bz2 scummvm-rg350-358b1a7c7ea08e60c88e7318345494d3e775cda2.zip | |
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.
svn-id: r40734
Diffstat (limited to 'engines/sword2')
| -rw-r--r-- | engines/sword2/animation.cpp | 41 | ||||
| -rw-r--r-- | engines/sword2/animation.h | 1 |
2 files changed, 19 insertions, 23 deletions
diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp index 7e7d1f9acf..52f2376dc5 100644 --- a/engines/sword2/animation.cpp +++ b/engines/sword2/animation.cpp @@ -47,25 +47,25 @@ namespace Sword2 { /////////////////////////////////////////////////////////////////////////////// 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 @@ void MoviePlayer::play(MovieText *movieTexts, uint32 numMovieTexts, uint32 leadI if (_vm->shouldQuit()) return; - bool seamless = false; - if (_id >= 0) { - seamless = sequenceList[_id].seamless; _numFrames = sequenceList[_id].frames; if (_numFrames > 60) _leadOutFrame = _numFrames - 60; diff --git a/engines/sword2/animation.h b/engines/sword2/animation.h index cfb1ecf1b1..9586b24c47 100644 --- a/engines/sword2/animation.h +++ b/engines/sword2/animation.h @@ -61,7 +61,6 @@ struct MovieText { struct MovieInfo { const char *name; int frames; - bool seamless; }; class DXADecoderWithSound : public Graphics::DXADecoder { |