From 3833202950f01cffde9f072452b671d44ae4be9e Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Sat, 21 May 2005 14:28:21 +0000 Subject: [PATCH] Adjust for HE73. svn-id: r18208 --- scumm/palette.cpp | 2 +- scumm/scumm.cpp | 2 +- scumm/sound.cpp | 2 +- scumm/vars.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scumm/palette.cpp b/scumm/palette.cpp index bb4684ccc27..45fe354024f 100644 --- a/scumm/palette.cpp +++ b/scumm/palette.cpp @@ -255,7 +255,7 @@ void ScummEngine::setPaletteFromPtr(const byte *ptr, int numcolor) { // Only SCUMM 5/6 games use 6/6/6 style palettes if (_version >= 5 && _version <= 6) { - if ((_heversion <= 72 && i < 15) || i == 15 || r < 252 || g < 252 || b < 252) { + if ((_heversion <= 73 && i < 15) || i == 15 || r < 252 || g < 252 || b < 252) { *dest++ = r; *dest++ = g; *dest++ = b; diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 0f1b92c1962..f5a17ea4d6b 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -1311,7 +1311,7 @@ ScummEngine_v6::ScummEngine_v6(GameDetector *detector, OSystem *syst, const Scum #ifndef DISABLE_HE ScummEngine_v70he::ScummEngine_v70he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex) : ScummEngine_v60he(detector, syst, gs, md5sum, substResFileNameIndex) { - if (_platform == Common::kPlatformMacintosh && _heversion == 72) + if (_platform == Common::kPlatformMacintosh && (_heversion >= 72 && _heversion <= 73)) _resExtractor = new MacResExtractor(this); else _resExtractor = new Win32ResExtractor(this); diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 69fd30579da..afb83043c1e 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -1160,7 +1160,7 @@ ScummFile *Sound::openSfxFile() { _vm->generateSubstResFileName(buf, buf1, sizeof(buf1)); strcpy(buf, buf1); } - if (file->open(buf) && _vm->_heversion <= 72) + if (file->open(buf) && _vm->_heversion <= 73) file->setEnc(0x69); _soundMode = kVOCMode; } diff --git a/scumm/vars.cpp b/scumm/vars.cpp index a86c090c452..b608dfce996 100644 --- a/scumm/vars.cpp +++ b/scumm/vars.cpp @@ -276,7 +276,7 @@ void ScummEngine_v72he::setupScummVars() { VAR_MOUSE_STATE = 75; VAR_POLYGONS_ONLY = 76; - if (_heversion == 72) { + if (_heversion <= 73) { VAR_NUM_SOUND_CHANNELS = 56; } if (_heversion >= 80)