diff options
| author | Travis Howell | 2010-01-28 00:28:08 +0000 |
|---|---|---|
| committer | Travis Howell | 2010-01-28 00:28:08 +0000 |
| commit | 0702bdab820ee6099011868009112b1a79b9deee (patch) | |
| tree | 8d28a73da3010807a1de8b4bf0fb938476ddc31e /engines/scumm | |
| parent | ca7d670b4b701022d9f748bcc43d9dbf39f18984 (diff) | |
| download | scummvm-rg350-0702bdab820ee6099011868009112b1a79b9deee.tar.gz scummvm-rg350-0702bdab820ee6099011868009112b1a79b9deee.tar.bz2 scummvm-rg350-0702bdab820ee6099011868009112b1a79b9deee.zip | |
Fix regressions in Let's Explore the Jungle with Buzzy.
svn-id: r47622
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/palette.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/script.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/scumm.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/sound.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp index ed61f9ab3b..09da1b47c4 100644 --- a/engines/scumm/palette.cpp +++ b/engines/scumm/palette.cpp @@ -317,7 +317,7 @@ void ScummEngine::setPaletteFromPtr(const byte *ptr, int numcolor) { // Only SCUMM 5/6 games use 6/6/6 style palettes if (_game.version >= 5 && _game.version <= 6) { - if ((_game.heversion <= 73 && i < 15) || i == 15 || r < 252 || g < 252 || b < 252) { + if ((_game.heversion <= 74 && i < 15) || i == 15 || r < 252 || g < 252 || b < 252) { *dest++ = r; *dest++ = g; *dest++ = b; diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp index d01d38b463..be9f69ffb5 100644 --- a/engines/scumm/script.cpp +++ b/engines/scumm/script.cpp @@ -620,8 +620,8 @@ void ScummEngine::writeVar(uint var, int value) { assertRange(0, var, _numVariables - 1, "variable (writing)"); if (VAR_SUBTITLES != 0xFF && var == VAR_SUBTITLES) { - // Ignore default setting in HE72-73 games - if (_game.heversion <= 73 && vm.slot[_currentScript].number == 1) + // Ignore default setting in HE72-74 games + if (_game.heversion <= 74 && vm.slot[_currentScript].number == 1) return; assert(value == 0 || value == 1); ConfMan.setBool("subtitles", (value != 0)); diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index bc3715052b..9fd1e4052c 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -742,7 +742,7 @@ ScummEngine_v60he::~ScummEngine_v60he() { ScummEngine_v70he::ScummEngine_v70he(OSystem *syst, const DetectorResult &dr) : ScummEngine_v60he(syst, dr) { - if (_game.platform == Common::kPlatformMacintosh && (_game.heversion >= 72 && _game.heversion <= 73)) + if (_game.platform == Common::kPlatformMacintosh && (_game.heversion >= 72 && _game.heversion <= 74)) _resExtractor = new MacResExtractor(this); else _resExtractor = new Win32ResExtractor(this); diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index e4f5144eeb..2efab8acdd 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -962,7 +962,7 @@ BaseScummFile *Sound::openSfxFile() { tmp = basename[0] + "tlk"; } - if (file->open(tmp) && _vm->_game.heversion <= 73) + if (file->open(tmp) && _vm->_game.heversion <= 74) file->setEnc(0x69); _soundMode = kVOCMode; } else { |