[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.166,1.167
Travis Howell
kirben at users.sourceforge.net
Tue Jul 15 00:30:03 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv7644/scumm
Modified Files:
sound.cpp
Log Message:
Remove warning in simon
Add INDY3EGA Amiga - experimental support for sound effects, patch #771355
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- sound.cpp 14 Jul 2003 22:24:18 -0000 1.166
+++ sound.cpp 15 Jul 2003 07:29:23 -0000 1.167
@@ -486,6 +486,26 @@
return;
}
+ if ((_scumm->_features & GF_AMIGA) && (_scumm->_version == 3))
+ {
+ // experimental support for Indy3 Amiga sound effects
+ 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;
+ else
+ debug(3,"Unknown sound type detected!");
+ 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) {
//TODO: support maniac v1 sounds
if ((_scumm->_version == 1) && (_scumm->_gameId == GID_MANIAC))
More information about the Scummvm-git-logs
mailing list