diff options
| author | Torbjörn Andersson | 2005-01-11 08:32:10 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2005-01-11 08:32:10 +0000 |
| commit | c5e83de099dcffca0f5c0d791305c0189467e9d9 (patch) | |
| tree | 043f8eff7f879a221c18a68e6e164e2bd9510417 /sword2/driver/animation.cpp | |
| parent | 9eecc9406dba5b7f7a16713c7802bd2bb2f3292a (diff) | |
| download | scummvm-rg350-c5e83de099dcffca0f5c0d791305c0189467e9d9.tar.gz scummvm-rg350-c5e83de099dcffca0f5c0d791305c0189467e9d9.tar.bz2 scummvm-rg350-c5e83de099dcffca0f5c0d791305c0189467e9d9.zip | |
Use Fingolfin's new WAV code.
svn-id: r16540
Diffstat (limited to 'sword2/driver/animation.cpp')
| -rw-r--r-- | sword2/driver/animation.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sword2/driver/animation.cpp b/sword2/driver/animation.cpp index 3a1a30f630..91c6847080 100644 --- a/sword2/driver/animation.cpp +++ b/sword2/driver/animation.cpp @@ -168,7 +168,7 @@ void MoviePlayer::drawTextObject(AnimationState *anim, MovieTextObject *obj) { * @param musicOut lead-out music */ -int32 MoviePlayer::play(const char *filename, MovieTextObject *text[], byte *musicOut) { +int32 MoviePlayer::play(const char *filename, MovieTextObject *text[], byte *musicOut, uint32 musicOutLen) { // This happens if the user quits during the "eye" smacker if (_vm->_quit) return RD_OK; @@ -188,7 +188,7 @@ int32 MoviePlayer::play(const char *filename, MovieTextObject *text[], byte *mus if (!anim->init(filename)) { delete anim; // Missing Files? Use the old 'Narration Only' hack - playDummy(filename, text, musicOut); + playDummy(filename, text, musicOut, musicOutLen); return RD_OK; } @@ -253,7 +253,7 @@ int32 MoviePlayer::play(const char *filename, MovieTextObject *text[], byte *mus frameCounter++; if (frameCounter == leadOutFrame && musicOut) - _vm->_sound->playFx(0, musicOut, 0, 0, RDSE_FXLEADOUT); + _vm->_sound->playFx(0, musicOutLen, musicOut, 0, 0, RDSE_FXLEADOUT); OSystem::Event event; while (_sys->pollEvent(event)) { @@ -334,7 +334,7 @@ int32 MoviePlayer::play(const char *filename, MovieTextObject *text[], byte *mus return RD_OK; #else // No MPEG2? Use the old 'Narration Only' hack - playDummy(filename, text, musicOut); + playDummy(filename, text, musicOut, musicOutLen); return RD_OK; #endif } @@ -344,7 +344,7 @@ int32 MoviePlayer::play(const char *filename, MovieTextObject *text[], byte *mus * are missing. */ -int32 MoviePlayer::playDummy(const char *filename, MovieTextObject *text[], byte *musicOut) { +int32 MoviePlayer::playDummy(const char *filename, MovieTextObject *text[], byte *musicOut, uint32 musicOutLen) { int frameCounter = 0, textCounter = 0; if (text) { byte oldPal[256 * 4]; @@ -484,7 +484,7 @@ int32 MoviePlayer::playDummy(const char *filename, MovieTextObject *text[], byte // that have subtitles. if (!skipCutscene && musicOut) { - _vm->_sound->playFx(0, musicOut, 0, 0, RDSE_FXLEADOUT); + _vm->_sound->playFx(0, musicOutLen, musicOut, 0, 0, RDSE_FXLEADOUT); _vm->_sound->waitForLeadOut(); } |