diff options
author | Max Horn | 2004-03-22 01:40:24 +0000 |
---|---|---|
committer | Max Horn | 2004-03-22 01:40:24 +0000 |
commit | 838d3e3a9387d63819fd2c8b137d53041de9abdb (patch) | |
tree | 5b886711ee1735dc92b4ecb7c18a768368884bc8 /sword1 | |
parent | 4466a855986d08d20c6fc6296baec191e1f5e027 (diff) | |
download | scummvm-rg350-838d3e3a9387d63819fd2c8b137d53041de9abdb.tar.gz scummvm-rg350-838d3e3a9387d63819fd2c8b137d53041de9abdb.tar.bz2 scummvm-rg350-838d3e3a9387d63819fd2c8b137d53041de9abdb.zip |
some more cleanup
svn-id: r13359
Diffstat (limited to 'sword1')
-rw-r--r-- | sword1/animation.cpp | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/sword1/animation.cpp b/sword1/animation.cpp index f1ea311b1c..7f571e84a2 100644 --- a/sword1/animation.cpp +++ b/sword1/animation.cpp @@ -122,7 +122,7 @@ bool AnimationState::init(const char *name) { frameskipped = 0; ticks = _sys->get_msecs(); - /* Play audio - TODO: Sync with video?*/ + // Play audio sndfile = new File(); bgSoundStream = AudioStream::openStreamFile(name, sndfile); @@ -176,42 +176,19 @@ bool AnimationState::decodeFrame() { if (bgSoundStream && !bgSound.isActive()) return false; -#ifdef BACKEND_8BIT if (checkPaletteSwitch() || (bgSoundStream == NULL) || - ((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1) || frameskipped > 10) { + ((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1) || + frameskipped > 10) { if (frameskipped > 10) { warning("force frame %i redraw", framenum); frameskipped = 0; } +#ifdef BACKEND_8BIT _scr->plotYUV(lut, sequence_i->width, sequence_i->height, info->display_fbuf->buf); - - if (bgSoundStream) { - while ((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum) - _sys->delay_msecs(10); - } else { - ticks += 83; - while (_sys->get_msecs() < ticks) - _sys->delay_msecs(10); - } - - } else { - warning("dropped frame %i", framenum); - frameskipped++; - } - - buildLookup(palnum + 1, lutcalcnum); - #else - - if ((bgSoundStream == NULL) || - ((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1) || frameskipped > 10) { - if (frameskipped > 10) { - warning("force frame %i redraw", framenum); - frameskipped = 0; - } plotYUV(lookup, sequence_i->width, sequence_i->height, info->display_fbuf->buf); - _sys->copy_rect_overlay(overlay, MOVIE_WIDTH, 0, 40, MOVIE_WIDTH, MOVIE_HEIGHT); +#endif if (bgSoundStream) { while ((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum) @@ -227,6 +204,8 @@ bool AnimationState::decodeFrame() { frameskipped++; } +#ifdef BACKEND_8BIT + buildLookup(palnum + 1, lutcalcnum); #endif framenum++; |