[Scummvm-cvs-logs] CVS: scummvm/sky logic.cpp,1.70,1.71 sound.cpp,1.10,1.11
Robert G?ffringmann
lavosspawn at users.sourceforge.net
Sat May 31 20:50:02 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sky disk.cpp,1.25,1.26 disk.h,1.4,1.5 intro.cpp,1.22,1.23 logic.cpp,1.69,1.70 sky.cpp,1.46,1.47 sound.cpp,1.9,1.10 sound.h,1.5,1.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.198,2.199
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv16059/sky
Modified Files:
logic.cpp sound.cpp
Log Message:
whoops
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- logic.cpp 1 Jun 2003 03:44:07 -0000 1.70
+++ logic.cpp 1 Jun 2003 03:49:05 -0000 1.71
@@ -2074,7 +2074,6 @@
if (SkyState::isCDVersion(_gameVersion))
_skySound->fnStartSpeech((uint16)textNum);
-// warning("stdSpeak: speech not implemented yet");
//now form the text sprite
struct lowTextManager_t textInfo;
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sound.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sound.cpp 1 Jun 2003 03:44:07 -0000 1.10
+++ sound.cpp 1 Jun 2003 03:49:05 -0000 1.11
@@ -1087,7 +1087,6 @@
if (dataSize == dataLoop)
flags |= SoundMixer::FLAG_LOOP;
- //_mixer->stopAll();
if (_ingameSound > 0) _mixer->stop(_ingameSound - 1);
_mixer->setVolume(volume);
_mixer->playRaw(&_ingameSound, _soundData + dataOfs, dataSize, sampleRate, flags);
@@ -1154,5 +1153,4 @@
// TODO: implement pre_after_table_area to find and prefetch file for next speech
_mixer->playRaw(&_ingameSpeech, playBuffer, speechSize - 64, 11025, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
-
-}
\ No newline at end of file
+}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sky disk.cpp,1.25,1.26 disk.h,1.4,1.5 intro.cpp,1.22,1.23 logic.cpp,1.69,1.70 sky.cpp,1.46,1.47 sound.cpp,1.9,1.10 sound.h,1.5,1.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.198,2.199
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list