[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.199,1.200 sound.cpp,1.400,1.401

[Travis Howell]

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

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

Unfortunately still not perfect.


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -d -r1.199 -r1.200
--- script.cpp	7 Oct 2004 10:33:46 -0000	1.199
+++ script.cpp	8 Oct 2004 01:07:44 -0000	1.200
@@ -695,7 +695,8 @@
 			ss->cutsceneOverride = 0;
 		}
 	}
-	nukeArrays(ss->number);
+	// FIXME Sometimes nukes the incorrect array in HE games
+	// nukeArrays(ss->number);
 	ss->number = 0;
 	ss->status = ssDead;
 	_currentScript = 0xFF;

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -d -r1.400 -r1.401
--- sound.cpp	29 Sep 2004 09:47:37 -0000	1.400
+++ sound.cpp	8 Oct 2004 01:07:44 -0000	1.401
@@ -767,6 +767,8 @@
 				return (_musicChannelHandle.isActive()) ? 1 : 0;
 			else if (_vm->_imuse)
 				return (_vm->_imuse->getSoundStatus(sound));
+		} else if (sound > _vm->_numSounds) {
+			return _vm->_mixer->isSoundIDActive(sound);
 		}
 	}