diff options
| -rw-r--r-- | engines/scumm/charset.cpp | 6 | ||||
| -rw-r--r-- | engines/scumm/player_towns.cpp | 3 | ||||
| -rw-r--r-- | engines/scumm/script_v5.cpp | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp index 6bf6238386..c8682a98c6 100644 --- a/engines/scumm/charset.cpp +++ b/engines/scumm/charset.cpp @@ -1014,11 +1014,11 @@ void CharsetRendererClassic::printCharIntern(bool is2byte, const byte *charPtr, } else { Graphics::Surface dstSurface; Graphics::Surface backSurface; - if ( + if ((ignoreCharsetMask || !vs->hasTwoBuffers) #ifndef DISABLE_TOWNS_DUAL_LAYER_MODE - _vm->_game.platform != Common::kPlatformFMTowns && + && (_vm->_game.platform != Common::kPlatformFMTowns) #endif - (ignoreCharsetMask || !vs->hasTwoBuffers) && !(_vm->_useCJKMode && _vm->_textSurfaceMultiplier == 2)) { + ) { dstSurface = *vs; dstPtr = vs->getPixels(_left, drawTop); } else { diff --git a/engines/scumm/player_towns.cpp b/engines/scumm/player_towns.cpp index 4b9bbecefa..06f97fd671 100644 --- a/engines/scumm/player_towns.cpp +++ b/engines/scumm/player_towns.cpp @@ -628,17 +628,14 @@ void Player_Towns_v2::startSound(int sound) { uint8 pan = _soundOverride[sound].pan ? _soundOverride[sound].pan - 1 : 64; uint8 pri = ptr[9]; _soundOverride[sound].velo = _soundOverride[sound].pan = 0; - playPcmTrack(sound, ptr + 8, velo, pan, ptr[52], pri); } else if (READ_BE_UINT32(ptr) == MKID_BE('SBL ')) { _soundOverride[sound].type = 5; - playVocTrack(ptr + 27); } else { _soundOverride[sound].type = 3; - _imuse->startSound(sound); } } diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp index bc88a0a800..ea903fc108 100644 --- a/engines/scumm/script_v5.cpp +++ b/engines/scumm/script_v5.cpp @@ -1617,7 +1617,7 @@ void ScummEngine_v5::o5_resourceRoutines() { void ScummEngine_v5::o5_roomOps() { int a = 0, b = 0, c, d, e; - const bool paramsBeforeOpcode = (_game.version == 3 && (_game.platform != Common::kPlatformPCEngine || _game.platform != Common::kPlatformFMTowns)); + const bool paramsBeforeOpcode = ((_game.version == 3) && (_game.platform != Common::kPlatformPCEngine)); if (paramsBeforeOpcode) { a = getVarOrDirectWord(PARAM_1); |