[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.110,1.111
Max Horn
fingolfin at users.sourceforge.net
Sat May 3 13:46:16 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.60,1.61
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.78,1.79 costume.cpp,1.33,1.34 gfx.cpp,2.65,2.66 saveload.cpp,1.61,1.62 script_v5.cpp,1.61,1.62 scumm.h,1.176,1.177 scummvm.cpp,2.120,2.121
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv24717
Modified Files:
sound.cpp
Log Message:
reordered iMuseDigital stuff to be next to each other
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- sound.cpp 3 May 2003 12:41:35 -0000 1.110
+++ sound.cpp 3 May 2003 20:45:31 -0000 1.111
@@ -179,8 +179,13 @@
ptr = _scumm->getResourceAddress(rtSound, soundID);
if (ptr) {
if (READ_UINT32_UNALIGNED(ptr) == MKID('iMUS')){
- if (_scumm->_imuseDigital)
- _scumm->_imuseDigital->startSound(soundID);
+ assert(_scumm->_imuseDigital);
+ _scumm->_imuseDigital->startSound(soundID);
+ return;
+ }
+ else if (READ_UINT32_UNALIGNED(ptr) == MKID('Crea')) {
+ assert(_scumm->_imuseDigital);
+ _scumm->_imuseDigital->startSound(soundID);
return;
}
else if (READ_UINT32_UNALIGNED(ptr) == MKID('SOUN')) {
@@ -257,10 +262,6 @@
out.close();
}
- return;
- }
- else if (READ_UINT32_UNALIGNED(ptr) == MKID('Crea')) {
- _scumm->_imuseDigital->startSound(soundID);
return;
}
else if (READ_UINT32_UNALIGNED(ptr) == MKID('ADL ')) {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.60,1.61
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.78,1.79 costume.cpp,1.33,1.34 gfx.cpp,2.65,2.66 saveload.cpp,1.61,1.62 script_v5.cpp,1.61,1.62 scumm.h,1.176,1.177 scummvm.cpp,2.120,2.121
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list