[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.119,1.120 sound.cpp,1.196,1.197

Travis Howell kirben at users.sourceforge.net
Tue Aug 12 18:50:04 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv30991/scumm

Modified Files:
	resource.cpp sound.cpp 
Log Message:

temp. fixme for music in monkeyega/vga


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- resource.cpp	12 Aug 2003 16:09:40 -0000	1.119
+++ resource.cpp	13 Aug 2003 01:46:48 -0000	1.120
@@ -21,6 +21,7 @@
  */
 
 #include "stdafx.h"
+#include "imuse.h"
 #include "scumm.h"
 #include "resource.h"
 #include "bundle.h"
@@ -1048,6 +1049,14 @@
 
 	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.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- sound.cpp	12 Aug 2003 16:09:41 -0000	1.196
+++ sound.cpp	13 Aug 2003 01:46:48 -0000	1.197
@@ -529,23 +529,6 @@
 		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->_imuse) {
 		_scumm->getResourceAddress(rtSound, soundID);
 		_scumm->_imuse->startSound(soundID);





More information about the Scummvm-git-logs mailing list