diff options
| author | Travis Howell | 2005-05-21 14:28:21 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-05-21 14:28:21 +0000 |
| commit | 3833202950f01cffde9f072452b671d44ae4be9e (patch) | |
| tree | 3eccecb59fed867db5e82622cee6362862414a2f | |
| parent | 2b2c6a404f840096d977e20c1b48d307770c783e (diff) | |
| download | scummvm-rg350-3833202950f01cffde9f072452b671d44ae4be9e.tar.gz scummvm-rg350-3833202950f01cffde9f072452b671d44ae4be9e.tar.bz2 scummvm-rg350-3833202950f01cffde9f072452b671d44ae4be9e.zip | |
Adjust for HE73.
svn-id: r18208
| -rw-r--r-- | scumm/palette.cpp | 2 | ||||
| -rw-r--r-- | scumm/scumm.cpp | 2 | ||||
| -rw-r--r-- | scumm/sound.cpp | 2 | ||||
| -rw-r--r-- | scumm/vars.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/scumm/palette.cpp b/scumm/palette.cpp index bb4684ccc2..45fe354024 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 0f1b92c196..f5a17ea4d6 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 69fd30579d..afb83043c1 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 a86c090c45..b608dfce99 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) |