libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed the "seamless" flag. It was something I added to cope with the fade

Browse Source 
in/out behaviour of the MPEG cutscene player, and no longer seems to be needed.

svn-id: r40734
This commit is contained in:
Torbjörn Andersson 2009-05-20 04:07:34 +00:00
parent 40dd214789
commit 358b1a7c7e
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
engines/sword2/animation.cpp
View File

@ -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;

1
engines/sword2/animation.h
View File

@ -61,7 +61,6 @@ struct MovieText {
struct MovieInfo {
const char *name;
int frames;
bool seamless;
};
class DXADecoderWithSound : public Graphics::DXADecoder {