[Scummvm-cvs-logs] CVS: scummvm/sword1 animation.cpp,1.40,1.41 music.cpp,1.46,1.47 sound.cpp,1.47,1.48 sword1.cpp,1.90,1.91
Jonathan Gray
khalek at users.sourceforge.net
Tue Aug 9 23:17:56 CEST 2005
Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19296/sword1
Modified Files:
animation.cpp music.cpp sound.cpp sword1.cpp
Log Message:
Rest of the changes required for tremor to actually work.
Based on patches against 0.7.1 by Jolan Luff.
Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/animation.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- animation.cpp 10 May 2005 23:48:46 -0000 1.40
+++ animation.cpp 10 Aug 2005 06:16:26 -0000 1.41
@@ -100,7 +100,7 @@
* @param id the id of the file
*/
void MoviePlayer::play(uint32 id) {
-#if defined(USE_MPEG2) && defined(USE_VORBIS)
+#if defined(USE_MPEG2) && (defined(USE_VORBIS) || defined(USE_TREMOR))
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
+#endif // USE_MPEG2 && (USE_VORBIS || USE_TREMOR)
}
void MoviePlayer::insertOverlay(OverlayColor *buf, uint8 *ovl, OverlayColor *pal) {
Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/music.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- music.cpp 30 Jul 2005 21:11:45 -0000 1.46
+++ music.cpp 10 Aug 2005 06:16:26 -0000 1.47
@@ -114,7 +114,7 @@
case MusicMp3:
return makeMP3Stream(&_file, _file.size());
#endif
-#ifdef USE_VORBIS
+#if defined(USE_VORBIS) || defined(USE_TREMOR)
case MusicVorbis:
return makeVorbisStream(&_file, _file.size());
#endif
@@ -138,7 +138,7 @@
if (_file.open(fileName))
_musicMode = MusicMp3;
#endif
-#ifdef USE_VORBIS
+#if defined(USE_VORBIS) || defined(USE_TREMOR)
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.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- sound.cpp 30 Jul 2005 21:11:45 -0000 1.47
+++ sound.cpp 10 Aug 2005 06:16:26 -0000 1.48
@@ -203,7 +203,7 @@
_waveVolPos = 0;
}
#endif
-#ifdef USE_VORBIS
+#if defined(USE_VORBIS) || defined(USE_TREMOR)
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
-#ifdef USE_VORBIS
+#if defined(USE_VORBIS) || defined(USE_TREMOR)
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.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- sword1.cpp 30 Jul 2005 21:11:45 -0000 1.90
+++ sword1.cpp 10 Aug 2005 06:16:26 -0000 1.91
@@ -297,7 +297,7 @@
,{ "speech1.cl3", FLAG_SPEECH1 },
{ "speech2.cl3", FLAG_SPEECH2 }
#endif
-#ifdef USE_VORBIS
+#if defined(USE_VORBIS) || defined(USE_TREMOR)
,{ "speech1.clv", FLAG_SPEECH1 },
{ "speech2.clv", FLAG_SPEECH2 }
#endif
More information about the Scummvm-git-logs
mailing list