[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.577,1.578 sound.cpp,1.477,1.478

[Jonathan Gray]

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

Modified Files:
	scumm.cpp sound.cpp 
Log Message:
Move the check for >= v5 further up the calling chain
for deciding whether we want to open an sfxfile.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.577
retrieving revision 1.578
diff -u -d -r1.577 -r1.578
--- scumm.cpp	14 Sep 2005 08:20:37 -0000	1.577
+++ scumm.cpp	14 Sep 2005 10:49:52 -0000	1.578
@@ -1699,9 +1699,7 @@
 		_imuse->setBase(res.address[rtSound]);
 	}
 
-	// Since MM NES and C64 targets substitute whole file class we get monster.sou file
-	// name badly generated, so avoid even attempts to open it
-	if (!((_platform == Common::kPlatformNES) || (_platform == Common::kPlatformC64)))
+	if (_version >= 5)
 		_sound->setupSound();
 
 	// Create debugger

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -d -r1.477 -r1.478
--- sound.cpp	14 Sep 2005 10:38:07 -0000	1.477
+++ sound.cpp	14 Sep 2005 10:49:53 -0000	1.478
@@ -1075,8 +1075,7 @@
 void Sound::setupSound() {
 	delete _sfxFile;
 
-	if (_vm->_version >= 5)
-		_sfxFile = openSfxFile();
+	_sfxFile = openSfxFile();
 
 	if (_vm->_heversion >= 70) {
 		setupHEMusicFile();