[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.108,1.109

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Mon Dec 29 05:42:02 CET 2003


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

Modified Files:
	imuse_digi.cpp 
Log Message:
Emergency bugfix to keep Full Throttle from crashing as soon as someone
tries to speak. I don't know this code well enough to know if there is a
more appropriate way of fixing this...


Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- imuse_digi.cpp	27 Dec 2003 21:32:37 -0000	1.108
+++ imuse_digi.cpp	29 Dec 2003 13:41:20 -0000	1.109
@@ -791,7 +791,7 @@
 			byte *data;
 
 			if ((sound == kTalkSoundID) && (_voiceVocData) || (READ_UINT32(ptr) == MKID('Crea'))) {
-				if (READ_UINT32(ptr) == MKID('Crea')) {
+				if (ptr && READ_UINT32(ptr) == MKID('Crea')) {
 					int loops = 0;
 					voc_src = readVOCFromMemory(ptr, voc_size, voc_rate, loops);
 				}





More information about the Scummvm-git-logs mailing list