[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.127,1.128 sound.cpp,1.200,1.201
Travis Howell
kirben at users.sourceforge.net
Thu Aug 14 10:19:07 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv27298/scumm
Modified Files:
resource.cpp sound.cpp
Log Message:
Revert bad change
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- resource.cpp 14 Aug 2003 08:47:47 -0000 1.127
+++ resource.cpp 14 Aug 2003 09:27:33 -0000 1.128
@@ -1053,14 +1053,6 @@
if (*src_ptr == 0x80) {
// 0x80: is music; otherwise not.
- if (_gameId == GID_MONKEY_VGA || _gameId == GID_MONKEY_EGA) {
- // FIXME: This evil hack works around the fact that in some
- // places in MonkeyVGA, the music is never explicitly stopped.
- // Rather it seems that starting a new music is supposed to
- // automatically stop the old song.
- _imuse->stop_all_sounds();
- }
-
// The "speed" of the song
ticks = *(src_ptr + 1);
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -d -r1.200 -r1.201
--- sound.cpp 14 Aug 2003 02:52:52 -0000 1.200
+++ sound.cpp 14 Aug 2003 09:27:33 -0000 1.201
@@ -453,6 +453,23 @@
return;
}
+ if (_scumm->_gameId == GID_MONKEY_VGA || _scumm->_gameId == GID_MONKEY_EGA) {
+ // Sound is currently not supported at all in the amiga versions of these games
+ if (_scumm->_features & GF_AMIGA)
+ return;
+
+ // FIXME: This evil hack works around the fact that in some
+ // places in MonkeyVGA, the music is never explicitly stopped.
+ // Rather it seems that starting a new music is supposed to
+ // automatically stop the old song.
+ // This hack relays on the fact that we currently don't support SFX
+ // in these games, only music. Once we add SFX support, we'll have to
+ // revise it / replace it by a proper fix.
+ if (ptr) {
+ _scumm->_imuse->stop_all_sounds();
+ }
+ }
+
if (_scumm->_playerV2)
_scumm->_playerV2->startSound (soundID, ptr);
More information about the Scummvm-git-logs
mailing list