[Scummvm-cvs-logs] SF.net SVN: scummvm: [25716] scummvm/trunk/engines/scumm

[kirben at users.sourceforge.net]

Revision: 25716
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25716&view=rev
Author:   kirben
Date:     2007-02-19 01:46:45 -0800 (Mon, 19 Feb 2007)

Log Message:
-----------
Move SCUMM version checks for settings up monst.er.sou file, to higher level.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/scumm.cpp
    scummvm/trunk/engines/scumm/sound.cpp

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2007-02-19 09:31:43 UTC (rev 25715)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2007-02-19 09:46:45 UTC (rev 25716)
@@ -1088,7 +1088,7 @@
 		_imuse->setBase(_res->address[rtSound]);
 	}
 
-	if (_game.version >= 5)
+	if (_game.version >= 5 && _game.version <= 7)
 		_sound->setupSound();
 
 	updateSoundSettings();
@@ -2150,7 +2150,7 @@
 	}
 
 	// Reinit sound engine
-	if (_game.version >= 5)
+	if (_game.version >= 5 && _game.version <= 7)
 		_sound->setupSound();
 
 	// Re-run bootscript

Modified: scummvm/trunk/engines/scumm/sound.cpp
===================================================================
--- scummvm/trunk/engines/scumm/sound.cpp	2007-02-19 09:31:43 UTC (rev 25715)
+++ scummvm/trunk/engines/scumm/sound.cpp	2007-02-19 09:46:45 UTC (rev 25716)
@@ -934,7 +934,7 @@
 		if (file->open(tmp) && _vm->_game.heversion <= 73)
 			file->setEnc(0x69);
 		_soundMode = kVOCMode;
-	} else if (_vm->_game.version >= 5 && _vm->_game.version <= 7) {
+	} else {
 		for (uint j = 0; j < 2 && !file->isOpen(); ++j) {
 			for (int i = 0; extensions[i].ext; ++i) {
 				tmp = basename[j] + extensions[i].ext;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.