[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
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen display.cpp,1.37,1.38 resource.cpp,1.34,1.35 resource.h,1.25,1.26 sound.cpp,1.25,1.26 talk.cpp,1.61,1.62 talk.h,1.24,1.25
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword1 sound.cpp,1.19,1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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);
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen display.cpp,1.37,1.38 resource.cpp,1.34,1.35 resource.h,1.25,1.26 sound.cpp,1.25,1.26 talk.cpp,1.61,1.62 talk.h,1.24,1.25
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword1 sound.cpp,1.19,1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list