From 29532320c198241d598206e182bc5cfa4c271424 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sun, 24 Apr 2005 10:26:31 +0000
Subject: Corection a few more heversion checks, caused music regression.

svn-id: r17785
---
 scumm/scumm.cpp | 6 +++---
 scumm/sound.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 4ef1d024a3..1ff99b974a 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1751,7 +1751,7 @@ void ScummEngine::setupMusic(int midi) {
 		_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 @@ void ScummEngine::setupMusic(int midi) {
 				_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 @@ load_game:
 			((ScummEngine_v90he *)this)->spritesProcessWiz(false);
 		}
 
-		if (_version >= 4 && _heversion <= 60)
+		if (_version >= 4 && _heversion <= 61)
 			cyclePalette();
 		palManipulate();
 		if (_doEffect) {
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 0f8009f422..63a573f990 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -1133,7 +1133,7 @@ ScummFile *Sound::openSfxFile() {
 	}
 
 	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());
-- 
cgit v1.2.3