Adjust for HE73.

svn-id: r18208
This commit is contained in:
Travis Howell
2005-05-21 14:28:21 +00:00
parent 2b2c6a404f
commit 3833202950
4 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -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;
+1 -1
View File
@@ -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);
+1 -1
View File
@@ -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;
}
+1 -1
View File
@@ -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)