diff options
| author | Jonathan Gray | 2005-01-23 03:26:54 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2005-01-23 03:26:54 +0000 |
| commit | 81e9e0da7232bbcaad371affa9306d6338215b2d (patch) | |
| tree | 0570ed8340259a90c5a01ef4f1f2fc200bc4dc32 /sword1/animation.cpp | |
| parent | 4f68706f3ca05f882a616cb7277e1c68cd31130e (diff) | |
| download | scummvm-rg350-81e9e0da7232bbcaad371affa9306d6338215b2d.tar.gz scummvm-rg350-81e9e0da7232bbcaad371affa9306d6338215b2d.tar.bz2 scummvm-rg350-81e9e0da7232bbcaad371affa9306d6338215b2d.zip | |
Fix compilation when vorbis is disabled and mpeg2 is enabled.
Pointed out by Michael Sterrett on irc.
svn-id: r16620
Diffstat (limited to 'sword1/animation.cpp')
| -rw-r--r-- | sword1/animation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sword1/animation.cpp b/sword1/animation.cpp index 1f9ed0a46a..8761454d89 100644 --- a/sword1/animation.cpp +++ b/sword1/animation.cpp @@ -100,7 +100,7 @@ MoviePlayer::~MoviePlayer(void) { * @param id the id of the file */ void MoviePlayer::play(uint32 id) { -#ifdef USE_MPEG2 +#if defined(USE_MPEG2) && defined(USE_VORBIS) AnimationState *anim = new AnimationState(_scr, _snd, _sys); AudioStream *stream = NULL; if (SwordEngine::_systemVars.cutscenePackVersion == 1) { @@ -166,7 +166,7 @@ void MoviePlayer::play(uint32 id) { while (!anim->soundFinished()) _sys->delayMillis(100); delete anim; -#endif // USE_MPEG2 +#endif // USE_MPEG2 && USE_VORBIS } void MoviePlayer::insertOverlay(OverlayColor *buf, uint8 *ovl, OverlayColor *pal) { |