[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.15,1.16

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Sat Jun 14 01:56:07 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv4933

Modified Files:
	imuse_digi.cpp 
Log Message:
Format string/argument mismatch fixes.


Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- imuse_digi.cpp	7 Jun 2003 00:49:36 -0000	1.15
+++ imuse_digi.cpp	14 Jun 2003 08:55:13 -0000	1.16
@@ -844,7 +844,7 @@
 						case MKID_BE('REGN'):
 							ptr += 4;
 							if (_channel[l]._numRegions >= MAX_IMUSE_REGIONS) {
-								warning("IMuseDigital::startSound(%d) Not enough space for Region");
+								warning("IMuseDigital::startSound(%d) Not enough space for Region", sound);
 								ptr += 8;
 								break;
 							}
@@ -859,7 +859,7 @@
 						case MKID_BE('JUMP'):
 							ptr += 4;
 							if (_channel[l]._numJumps >= MAX_IMUSE_JUMPS) {
-								warning("IMuseDigital::startSound(%d) Not enough space for Jump");
+								warning("IMuseDigital::startSound(%d) Not enough space for Jump", sound);
 								ptr += 16;
 								break;
 							}
@@ -874,7 +874,7 @@
 							size = READ_BE_UINT32_UNALIGNED(ptr); ptr += 4;
 						break;
 						default:
-							error("IMuseDigital::startSound(%d) Unknown sfx header %c%c%c%c", tag>>24, tag>>16, tag>>8, tag);
+							error("IMuseDigital::startSound(%d) Unknown sfx header %c%c%c%c", sound, (byte)(tag >> 24), (byte)(tag >> 16), (byte)(tag >> 8), (byte)tag);
 					}
 					if (tag == MKID_BE('DATA')) break;
 				}





More information about the Scummvm-git-logs mailing list