[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.165,2.166 sound.cpp,1.115,1.116

[Jonathan Gray]

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

Modified Files:
	scummvm.cpp sound.cpp 
Log Message:
enable midi for non puttdemo humongous games. need to properly return the result of whether music is running though...

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.165
retrieving revision 2.166
diff -u -d -r2.165 -r2.166
--- scummvm.cpp	19 May 2003 00:17:34 -0000	2.165
+++ scummvm.cpp	19 May 2003 08:04:47 -0000	2.166
@@ -687,6 +687,7 @@
 
 	if (!(_features & GF_SMALL_NAMES) && !(_features & GF_AFTER_V8))
 		loadCharset(1);
+		
 	if (_features & GF_OLD_BUNDLE)
 		loadCharset(0);	// FIXME - HACK ?
 
@@ -818,9 +819,9 @@
 		VAR(VAR_VIDEOMODE) = 0x13;
 		VAR(VAR_HEAPSPACE) = 1400;
 		VAR(VAR_MOUSEPRESENT) = true; // FIXME - used to be 0, but that seems odd?!?
-//		if (_features & GF_HUMONGOUS) // FIXME uncomment when XMI support is added
-//			VAR(VAR_SOUNDPARAM) = 1; // soundblaster for music
-//		else
+		if ((_features & GF_HUMONGOUS) && (_gameId != GID_PUTTDEMO))
+			VAR(VAR_SOUNDPARAM) = 1; // soundblaster for music
+		else 
 			VAR(VAR_SOUNDPARAM) = 0;
 		VAR(VAR_SOUNDPARAM2) = 0;
 		VAR(VAR_SOUNDPARAM3) = 0;

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- sound.cpp	19 May 2003 05:14:18 -0000	1.115
+++ sound.cpp	19 May 2003 08:04:47 -0000	1.116
@@ -234,7 +234,7 @@
 			_scumm->_mixer->playRaw(NULL, sound, size, rate, flags, soundID);
 			return;
 		}
-		// XMI MIDI
+		// XMIDI 
 		else if ((READ_UINT32_UNALIGNED(ptr) == MKID('MIDI')) && (_scumm->_features & GF_HUMONGOUS)) {
 			// skip HSHD
 			ptr += 8 + READ_BE_UINT32_UNALIGNED(ptr+12);
@@ -244,8 +244,8 @@
 			size = READ_BE_UINT32_UNALIGNED(ptr+4) - 8;
 			ptr += 8; // don't need SDAT block anymore
 
-			// XMI playing stuff goes here
-			// ptr should be pointing to XMI file in memory
+			// XMIDI playing stuff goes here
+			// ptr should be pointing to XMIDI file in memory
 			// HACK (Jamieson630): Just to see if it works.
 			static MidiParser *parser = 0;
 
@@ -632,6 +632,14 @@
 
 	if (sound == _scumm->current_cd_sound)
 		return pollCD();
+	
+	if (_scumm->_features & GF_HUMONGOUS) {
+			if (sound == -2) {
+				return isSfxFinished();
+			// FIXME are we playing music?
+			} else if (sound == -1)
+				return 1;
+	}
 	
 	_scumm->_mixer->stopID(sound);