[Scummvm-cvs-logs] CVS: scummvm/sword1 animation.cpp,1.41,1.42 music.cpp,1.47,1.48 sound.cpp,1.48,1.49 sword1.cpp,1.91,1.92

[Jonathan Gray]

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

Modified Files:
	animation.cpp music.cpp sound.cpp sword1.cpp 
Log Message:
Don't explicity check for tremor and vorbis everywhere and
require both USE_TREMOR and USE_VORBIS to be defined when
using tremor.


Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/animation.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- animation.cpp	10 Aug 2005 06:16:26 -0000	1.41
+++ animation.cpp	10 Aug 2005 12:42:56 -0000	1.42
@@ -100,7 +100,7 @@
  * @param id the id of the file
  */
 void MoviePlayer::play(uint32 id) {
-#if defined(USE_MPEG2) && (defined(USE_VORBIS) || defined(USE_TREMOR))
+#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 && (USE_VORBIS || USE_TREMOR)
+#endif // USE_MPEG2 && USE_VORBIS
 }
 
 void MoviePlayer::insertOverlay(OverlayColor *buf, uint8 *ovl, OverlayColor *pal) {

Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/music.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- music.cpp	10 Aug 2005 06:16:26 -0000	1.47
+++ music.cpp	10 Aug 2005 12:42:56 -0000	1.48
@@ -114,7 +114,7 @@
 	case MusicMp3:
 		return makeMP3Stream(&_file, _file.size());
 #endif
-#if defined(USE_VORBIS) || defined(USE_TREMOR)
+#ifdef USE_VORBIS
 	case MusicVorbis:
 		return makeVorbisStream(&_file, _file.size());
 #endif
@@ -138,7 +138,7 @@
 	if (_file.open(fileName))
 		_musicMode = MusicMp3;
 #endif
-#if defined(USE_VORBIS) || defined(USE_TREMOR)
+#ifdef USE_VORBIS
 	if (!_file.isOpen()) { // mp3 doesn't exist (or not compiled with MAD support)
 		sprintf(fileName, "%s.ogg", fileBase);
 		if (_file.open(fileName))

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sound.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- sound.cpp	10 Aug 2005 06:16:26 -0000	1.48
+++ sound.cpp	10 Aug 2005 12:42:56 -0000	1.49
@@ -203,7 +203,7 @@
 			_waveVolPos = 0;
 		}
 #endif
-#if defined(USE_VORBIS) || defined(USE_TREMOR)
+#ifdef USE_VORBIS
 		else if (_cowMode == CowVorbis) {
 			_cowFile.seek(index);
 			_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_speechHandle, makeVorbisStream(&_cowFile, sampleSize), SOUND_SPEECH_ID, speechVol, speechPan);
@@ -329,7 +329,7 @@
 		_cowMode = CowMp3;
 	}
 #endif
-#if defined(USE_VORBIS) || defined(USE_TREMOR)
+#ifdef USE_VORBIS
 	if (!_cowFile.isOpen()) {
 		sprintf(cowName, "SPEECH%d.CLV", SwordEngine::_systemVars.currentCD);
 		_cowFile.open(cowName);

Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- sword1.cpp	10 Aug 2005 06:16:26 -0000	1.91
+++ sword1.cpp	10 Aug 2005 12:42:56 -0000	1.92
@@ -297,7 +297,7 @@
 	,{ "speech1.cl3", FLAG_SPEECH1 },
 	 { "speech2.cl3", FLAG_SPEECH2 }
 #endif
-#if defined(USE_VORBIS) || defined(USE_TREMOR)
+#ifdef USE_VORBIS
 	,{ "speech1.clv", FLAG_SPEECH1 },
 	 { "speech2.clv", FLAG_SPEECH2 }
 #endif