thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More cutscene fixes from roever

Browse source 
svn-id: r12774
This commit is contained in:
Travis Howell 2004-02-08 14:11:11 +00:00
parent a745b3a7d0
commit 587622d664
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
sword1/animation.cpp
View file

@ -40,8 +40,10 @@ AnimationState::~AnimationState() {
delete sndfile; delete sndfile;
#ifndef BACKEND_8BIT #ifndef BACKEND_8BIT
_sys->hide_overlay(); _sys->hide_overlay();
delete overlay; free(overlay);
#endif #endif
if (bgSoundStream)
delete bgSoundStream;
#endif #endif
} }
@ -137,7 +139,7 @@ bool AnimationState::init(const char *basename) {
sprintf(tempFile, "%s.ogg", basename); sprintf(tempFile, "%s.ogg", basename);
if (sndfile->open(tempFile)) { if (sndfile->open(tempFile)) {
bgSoundStream = makeVorbisStream(sndfile, sndfile->size()); bgSoundStream = makeVorbisStream(sndfile, sndfile->size());
_snd->playInputStream(&bgSound, bgSoundStream, false, 255, 0, -1); _snd->playInputStream(&bgSound, bgSoundStream, false, 255, 0, -1, false);
} }
#endif #endif
@ -315,8 +317,6 @@ bool AnimationState::decodeFrame() {
* events are processed. * events are processed.
*/ */
OSystem::Event event;
#ifdef BACKEND_8BIT #ifdef BACKEND_8BIT
if (checkPaletteSwitch() || (bgSoundStream == NULL) || if (checkPaletteSwitch() || (bgSoundStream == NULL) ||
(bgSoundStream->getSamplesPlayed()*12/bgSoundStream->getRate()) < (framenum+3)){ (bgSoundStream->getSamplesPlayed()*12/bgSoundStream->getRate()) < (framenum+3)){
@ -330,7 +330,6 @@ bool AnimationState::decodeFrame() {
while (_sys->get_msecs() < ticks) while (_sys->get_msecs() < ticks)
_sys->delay_msecs(10); _sys->delay_msecs(10);
} }
_sys->poll_event(&event);
} else } else
warning("dropped frame %i", framenum); warning("dropped frame %i", framenum);
@ -350,7 +349,6 @@ bool AnimationState::decodeFrame() {
while (_sys->get_msecs() < ticks) while (_sys->get_msecs() < ticks)
_sys->delay_msecs(10); _sys->delay_msecs(10);
} }
_sys->poll_event(&event);
} else } else
warning("dropped frame %i", framenum); warning("dropped frame %i", framenum);
@ -388,6 +386,16 @@ void MoviePlayer::play(const char *filename) {
_sys->update_screen(); _sys->update_screen();
#endif #endif
// FIXME: check for ESC and abbort animation be just returning from the function // FIXME: check for ESC and abbort animation be just returning from the function
OSystem::Event event;
while (_sys->poll_event(&event)) {
if ((event.event_code == OSystem::EVENT_KEYDOWN) &&
(event.kbd.keycode == 27)) {
delete anim;
return;
}
if (event.event_code == OSystem::EVENT_QUIT)
_sys->quit();
}
} }
} }