[Scummvm-cvs-logs] CVS: scummvm/sword1 animation.cpp,1.29.2.1,1.29.2.2

Jonathan Gray khalek at users.sourceforge.net
Sat Jan 22 20:36:04 CET 2005


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

Modified Files:
      Tag: branch-0-7-0
	animation.cpp 
Log Message:
Back port fix for compiling with vorbis disabled and mpeg2 enabled.


Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/animation.cpp,v
retrieving revision 1.29.2.1
retrieving revision 1.29.2.2
diff -u -d -r1.29.2.1 -r1.29.2.2
--- animation.cpp	16 Dec 2004 15:28:36 -0000	1.29.2.1
+++ animation.cpp	23 Jan 2005 04:34:56 -0000	1.29.2.2
@@ -99,7 +99,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) {
@@ -165,7 +165,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) {





More information about the Scummvm-git-logs mailing list