[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.387,1.388
Travis Howell
kirben at users.sourceforge.net
Sun Sep 12 19:33:01 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1372/scumm
Modified Files:
sound.cpp
Log Message:
Sound ids 10000 - 10008 seems to be sound channels in HE70+ games.
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -d -r1.387 -r1.388
--- sound.cpp 10 Sep 2004 12:07:53 -0000 1.387
+++ sound.cpp 13 Sep 2004 02:32:13 -0000 1.388
@@ -757,9 +757,8 @@
return pollCD();
if (_vm->_features & GF_HUMONGOUS) {
- if (sound == 10002) {
- return !_talkChannelHandle.isActive();
- } else if (sound == -2 || sound == 10001) {
+ if (sound == -2 || sound >= 10001) {
+ // Maybe checks sound channel?
return !isSfxFinished();
} else if (sound == -1 || sound == 10000 || sound == _currentMusic) {
// getSoundStatus(), with a -1, will return the
@@ -840,10 +839,8 @@
int i;
if (_vm->_features & GF_HUMONGOUS) {
- if (sound == 10002) {
- _vm->stopTalk();
- } else if (sound == -2 || sound == 10001) {
- // Stop current sfx
+ if (sound == -2 || sound >= 10001) {
+ // Maybe stops sound channel?
} else if (sound == -1 || sound == 10000) {
// Stop current music
if (_vm->_heversion >= 70 || _currentMusic)
More information about the Scummvm-git-logs
mailing list