[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.428,1.429
kirben
kirben at users.sourceforge.net
Sat Mar 12 03:06:29 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.208,1.209
- Next message: [Scummvm-cvs-logs] CVS: scummvm/dists/msvc8 saga.vcproj,1.2,1.2.2.1 scumm.vcproj,1.4,1.4.2.1 scummvm.vcproj,1.11,1.11.2.1 simon.vcproj,1.1,1.1.2.1 sword1.vcproj,1.1,1.1.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17237/scumm
Modified Files:
sound.cpp
Log Message:
Broke HE music looping
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -d -r1.428 -r1.429
--- sound.cpp 12 Mar 2005 00:47:16 -0000 1.428
+++ sound.cpp 12 Mar 2005 11:06:07 -0000 1.429
@@ -820,14 +820,14 @@
// getSoundStatus(), with a -1, will return the
// ID number of the first active music it finds.
if (_currentMusic)
- sound = _currentMusic;
+ return (_vm->_mixer->isSoundIDActive(_currentMusic) ? _currentMusic : 0);
else if (_vm->_imuse)
return (_vm->_imuse->getSoundStatus(sound));
} else if (sound >= 10000) {
// TODO report sound ID on channel
// channel = sound - 10000
if (sound == 10000)
- return _currentMusic;
+ return (_vm->_mixer->isSoundIDActive(_currentMusic) ? _currentMusic : 0);
else
return 0;
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.208,1.209
- Next message: [Scummvm-cvs-logs] CVS: scummvm/dists/msvc8 saga.vcproj,1.2,1.2.2.1 scumm.vcproj,1.4,1.4.2.1 scummvm.vcproj,1.11,1.11.2.1 simon.vcproj,1.1,1.1.2.1 sword1.vcproj,1.1,1.1.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list