[Scummvm-cvs-logs] CVS: scummvm/sword1 animation.cpp,1.33,1.34

[Jonathan Gray]

Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13762

Modified Files:
	animation.cpp 
Log Message:
Fix compilation when vorbis is disabled and mpeg2 is enabled.
Pointed out by Michael Sterrett on irc.


Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/animation.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- animation.cpp	10 Jan 2005 22:06:20 -0000	1.33
+++ animation.cpp	23 Jan 2005 03:26:54 -0000	1.34
@@ -100,7 +100,7 @@
  * @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 @@
 	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) {