[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.430,1.431

[Eugene Sandulenko]

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

Modified Files:
	scumm.cpp 
Log Message:
Fix bug #1182206 "Maniac Mansion (NES) doesn't run anymore after Apr 10 commit"


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -d -r1.430 -r1.431
--- scumm.cpp	13 Apr 2005 10:40:06 -0000	1.430
+++ scumm.cpp	13 Apr 2005 13:32:58 -0000	1.431
@@ -1402,7 +1402,11 @@
 	if (_imuse) {
 		_imuse->setBase(res.address[rtSound]);
 	}
-	_sound->setupSound();
+
+	// Since MM NES substitutes whole file class we get monster.sou file
+	// name badly generated, so avoid even attempts to open it
+	if (!(_features & GF_NES))
+		_sound->setupSound();
 
 	// Create debugger
 	if (!_debugger)