[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.20,1.21 sound.h,1.6,1.7

Pawe? Ko?odziejski aquadran at users.sourceforge.net
Mon Sep 30 16:00:02 CEST 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv3748

Modified Files:
	sound.cpp sound.h 
Log Message:
changed from byte to int16 to handle sound number greater than 255

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- sound.cpp	30 Sep 2002 19:31:41 -0000	1.20
+++ sound.cpp	30 Sep 2002 22:59:42 -0000	1.21
@@ -68,7 +68,7 @@
 }
 
 void Sound::processSoundQues() {
-	byte d;
+	int d;
 	int i, j;
 	int num;
 	int16 data[16];
@@ -597,7 +597,7 @@
 	}
 
 	for (i = 0; i < 10; i++)
-		if (_soundQue2[i] == (byte)a)
+		if (_soundQue2[i] == a)
 			_soundQue2[i] = 0;
 }
 

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sound.h	21 Sep 2002 13:48:03 -0000	1.6
+++ sound.h	30 Sep 2002 22:59:42 -0000	1.7
@@ -39,7 +39,7 @@
 };
 
 	int16 _soundQuePos, _soundQue[0x100];
-	byte _soundQue2Pos, _soundQue2[10];
+	int16 _soundQue2Pos, _soundQue2[10];
 	bool _soundsPaused2;
 	bool _soundVolumePreset;
 





More information about the Scummvm-git-logs mailing list