[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.460,1.461 sound.cpp,1.446,1.447

[kirben]

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

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

Corection a few more heversion checks, caused music regression.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -d -r1.460 -r1.461
--- scumm.cpp	23 Apr 2005 16:52:11 -0000	1.460
+++ scumm.cpp	24 Apr 2005 10:26:30 -0000	1.461
@@ -1751,7 +1751,7 @@
 		_musicEngine = new Player_V2(this, _midiDriver != MD_PCSPK);;
 	} else if (((_midiDriver == MD_PCJR) || (_midiDriver == MD_PCSPK)) && ((_version > 2) && (_version < 5))) {
 		_musicEngine = new Player_V2(this, _midiDriver != MD_PCSPK);
-	} else if (_version > 2 && _heversion <= 60) {
+	} else if (_version > 2 && _heversion <= 61) {
 		MidiDriver *nativeMidiDriver = MidiDriver::createMidi(_midiDriver);
 		if (nativeMidiDriver != NULL && _native_mt32)
 			nativeMidiDriver->property (MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
@@ -1769,7 +1769,7 @@
 				_imuse->property(IMuse::PROP_TEMPO_BASE, ConfMan.getInt("tempo"));
 			_imuse->property(IMuse::PROP_NATIVE_MT32, _native_mt32);
 			_imuse->property(IMuse::PROP_GS, _enable_gs);
-			if (_heversion == 60 || midi == MDT_TOWNS) {
+			if (_heversion >= 60 || midi == MDT_TOWNS) {
 				_imuse->property(IMuse::PROP_LIMIT_PLAYERS, 1);
 				_imuse->property(IMuse::PROP_RECYCLE_PLAYERS, 1);
 			}
@@ -2125,7 +2125,7 @@
 			((ScummEngine_v90he *)this)->spritesProcessWiz(false);
 		}
 
-		if (_version >= 4 && _heversion <= 60)
+		if (_version >= 4 && _heversion <= 61)
 			cyclePalette();
 		palManipulate();
 		if (_doEffect) {

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -d -r1.446 -r1.447
--- sound.cpp	20 Apr 2005 18:21:08 -0000	1.446
+++ sound.cpp	24 Apr 2005 10:26:31 -0000	1.447
@@ -1133,7 +1133,7 @@
 	}
 
 	if (!file->isOpen()) {
-		if ((_vm->_heversion == 60 && _vm->_platform == Common::kPlatformMacintosh) || (_vm->_heversion >= 70)) {
+		if ((_vm->_heversion <= 61 && _vm->_platform == Common::kPlatformMacintosh) || (_vm->_heversion >= 70)) {
 			sprintf(buf, "%s.he2", _vm->getGameName());
 		} else {
 			sprintf(buf, "%s.tlk", _vm->getGameName());