libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 07:53:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LOOM PC-Engine: fix regression

Browse Source 
svn-id: r53113
This commit is contained in:
Florian Kagerer 2010-10-10 10:26:49 +00:00
parent bcf3b35285
commit 8e6ce812d1
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/scumm/charset.cpp
View File

@ -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 {

3
engines/scumm/player_towns.cpp
View File

@ -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);
}
}

2
engines/scumm/script_v5.cpp
View File

@ -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);