[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.187,1.188 sound.cpp,1.318,1.319

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2718/scumm

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

Hack no longer required.
Add stub for HE games.


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -d -r1.187 -r1.188
--- resource.cpp	6 Feb 2004 21:05:57 -0000	1.187
+++ resource.cpp	11 Feb 2004 03:21:21 -0000	1.188
@@ -1804,13 +1804,6 @@
 	if (!res.address[type])
 		return;
 
-	// FIXME hack around insanely high string resource idx's
-	if ((_features & GF_HUMONGOUS) && (type == 7 && idx > res.num[7])) {
-		warning("nukeResource: type %d index %d > max %d", type, idx,
-				res.num[7]);
-		return;
-	}
-
 	assert(idx >= 0 && idx < res.num[type]);
 
 	if ((ptr = res.address[type][idx]) != NULL) {

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -d -r1.318 -r1.319
--- sound.cpp	8 Feb 2004 23:01:15 -0000	1.318
+++ sound.cpp	11 Feb 2004 03:21:21 -0000	1.319
@@ -699,6 +699,14 @@
 void Sound::stopSound(int a) {
 	int i;
 
+	if (_vm->_features & GF_HUMONGOUS) {
+		if (a == -2) {
+			// Stop current sfx
+		} else if (a == -1) {
+			// Stop current music
+		}
+	}
+
 	if (a != 0 && a == _currentCDSound) {
 		_currentCDSound = 0;
 		stopCD();