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 /sword2 | |
| 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 'sword2')
| -rw-r--r-- | sword2/driver/animation.cpp | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/sword2/driver/animation.cpp b/sword2/driver/animation.cpp index 94302dc631..302300f051 100644 --- a/sword2/driver/animation.cpp +++ b/sword2/driver/animation.cpp @@ -222,14 +222,18 @@ 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 _vm->_graphics->plotYUV(lut, sequence_i->width, sequence_i->height, info->display_fbuf->buf); +#else + plotYUV(lookup, sequence_i->width, sequence_i->height, info->display_fbuf->buf); +#endif if (bgSoundStream) { while ((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum) @@ -239,38 +243,17 @@ bool AnimationState::decodeFrame() { _vm->sleepUntil(ticks); } +#ifdef BACKEND_8BIT _vm->_graphics->setNeedFullRedraw(); +#endif } else { warning("dropped frame %i", framenum); frameskipped++; } +#ifdef BACKEND_8BIT 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); - - if (bgSoundStream) { - while ((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum) - _sys->delay_msecs(10); - } else { - ticks += 83; - _vm->sleepUntil(ticks); - } - - } else { - warning("dropped frame %i", framenum); - frameskipped++; - } - #endif framenum++; |