[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.171,1.172
Travis Howell
kirben at users.sourceforge.net
Thu Jul 17 05:28:07 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv26383/scumm
Modified Files:
sound.cpp
Log Message:
Revert part of last changes.
Caused indy3ega/loom to try to use amiga sound sometimes, when Amiga option was enabled.
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -d -r1.171 -r1.172
--- sound.cpp 17 Jul 2003 11:56:47 -0000 1.171
+++ sound.cpp 17 Jul 2003 12:27:13 -0000 1.172
@@ -489,22 +489,19 @@
if ((_scumm->_features & GF_AMIGA) && (_scumm->_version == 3))
{
// experimental support for Indy3 Amiga sound effects
- bool amigatest = (READ_BE_UINT16(ptr + 26) == 0x00FF) || (READ_BE_UINT16(ptr + 26) == 0x0001) || (READ_BE_UINT16(ptr + 26) == 0x0101);
- if (amigatest) {
- if (READ_BE_UINT16(ptr + 26) == 0x00FF) // looped sound
- // TODO: support looping sounds
- // ptr + 14 seems to be looping duration
- flags = 0;
- else if (READ_BE_UINT16(ptr + 26) == 0x0001) // nonlooped sound
- flags = 0; //
- else if (READ_BE_UINT16(ptr + 26) == 0x0101) // background music
- // TODO: support music
- return;
- size = READ_BE_UINT16(ptr + 12);
- rate = 11000;
- _scumm->_mixer->playRaw(NULL, ptr + 28, size, rate, flags, soundID);
+ if (READ_BE_UINT16(ptr + 26) == 0x00FF) // looped sound
+ // TODO: support looping sounds
+ // ptr + 14 seems to be looping duration
+ flags = 0;
+ else if (READ_BE_UINT16(ptr + 26) == 0x0001) // nonlooped sound
+ flags = 0; //
+ else if (READ_BE_UINT16(ptr + 26) == 0x0101) // background music
+ // TODO: support music
return;
- }
+ size = READ_BE_UINT16(ptr + 12);
+ rate = 11000;
+ _scumm->_mixer->playRaw(NULL, ptr + 28, size, rate, flags, soundID);
+ return;
}
if (_scumm->_features & GF_OLD_BUNDLE) {
More information about the Scummvm-git-logs
mailing list