[Scummvm-cvs-logs] CVS: scummvm/sword2/driver d_draw.cpp,1.48,1.49 d_sound.cpp,1.84,1.85

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Wed Dec 17 03:53:01 CET 2003


Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv24578/driver

Modified Files:
	d_draw.cpp d_sound.cpp 
Log Message:
My last commit didn't work on big-endian. Maybe this one does...


Index: d_draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_draw.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- d_draw.cpp	17 Dec 2003 11:07:40 -0000	1.48
+++ d_draw.cpp	17 Dec 2003 11:52:05 -0000	1.49
@@ -177,6 +177,12 @@
 
 		bool skipCutscene = false;
 
+		uint32 flags = SoundMixer::FLAG_16BITS;
+
+#ifndef SCUMM_BIG_ENDIAN
+		flags |= SoundMixer::FLAG_LITTLE_ENDIAN;
+#endif
+
 		while (1) {
 			if (!text[textCounter])
 				break;
@@ -186,7 +192,7 @@
 				openTextObject(text[textCounter]);
 				drawTextObject(text[textCounter]);
 				if (text[textCounter]->speech) {
-					_vm->_mixer->playRaw(&handle, text[textCounter]->speech, text[textCounter]->speechBufferSize, 22050, SoundMixer::FLAG_16BITS | SoundMixer::FLAG_LITTLE_ENDIAN);
+					_vm->_mixer->playRaw(&handle, text[textCounter]->speech, text[textCounter]->speechBufferSize, 22050, flags);
 				}
 			}
 

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- d_sound.cpp	17 Dec 2003 11:07:40 -0000	1.84
+++ d_sound.cpp	17 Dec 2003 11:52:05 -0000	1.85
@@ -398,7 +398,11 @@
 
 		_speechPaused = true;
 			
-		uint32 flags = SoundMixer::FLAG_16BITS | SoundMixer::FLAG_LITTLE_ENDIAN | SoundMixer::FLAG_AUTOFREE;
+		uint32 flags = SoundMixer::FLAG_16BITS | SoundMixer::FLAG_AUTOFREE;
+
+#ifndef SCUMM_BIG_ENDIAN
+		flags |= SoundMixer::FLAG_LITTLE_ENDIAN;
+#endif
 
 		_vm->_mixer->playRaw(&_soundHandleSpeech, data16, bufferSize, 22050, flags, -1, volume, p);
 





More information about the Scummvm-git-logs mailing list