diff options
| author | athrxx | 2011-09-17 22:15:29 +0200 |
|---|---|---|
| committer | athrxx | 2011-09-17 22:16:41 +0200 |
| commit | f8ee4f385f38a734fb9a872e79ed415cec21c7ff (patch) | |
| tree | 5e6786491136eb3d679edf251b9fc95c0eb46f22 /engines | |
| parent | 149fdbfb60b90d6659cc4ad426335e376b707311 (diff) | |
| download | scummvm-rg350-f8ee4f385f38a734fb9a872e79ed415cec21c7ff.tar.gz scummvm-rg350-f8ee4f385f38a734fb9a872e79ed415cec21c7ff.tar.bz2 scummvm-rg350-f8ee4f385f38a734fb9a872e79ed415cec21c7ff.zip | |
SCUMM FM-TOWNS: fix DS build
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/charset.cpp | 8 | ||||
| -rw-r--r-- | engines/scumm/verbs.cpp | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp index 5c53ac7b7a..4064853b6b 100644 --- a/engines/scumm/charset.cpp +++ b/engines/scumm/charset.cpp @@ -636,7 +636,11 @@ void CharsetRendererV3::printChar(int chr, bool ignoreCharsetMask) { _textScreenID = vs->number; } - if ((ignoreCharsetMask || !vs->hasTwoBuffers) && (_vm->_game.platform != Common::kPlatformFMTowns)) + if ((ignoreCharsetMask || !vs->hasTwoBuffers) +#ifndef DISABLE_TOWNS_DUAL_LAYER_MODE + && (_vm->_game.platform != Common::kPlatformFMTowns) +#endif + ) drawBits1(*vs, _left + vs->xstart, drawTop, charPtr, drawTop, origWidth, origHeight); else drawBits1(_vm->_textSurface, _left * _vm->_textSurfaceMultiplier, _top * _vm->_textSurfaceMultiplier, charPtr, drawTop, origWidth, origHeight); @@ -997,13 +1001,13 @@ void CharsetRendererTownsV3::drawBits1(Graphics::Surface &dest, int x, int y, co return; } #endif - byte *dst = (byte *)dest.getBasePtr(x, y); bool scale2x = ((&dest == &_vm->_textSurface) && (_vm->_textSurfaceMultiplier == 2) && !(_sjisCurChar >= 256 && _vm->_useCJKMode)); #endif byte bits = 0; uint8 col = _color; int pitch = dest.pitch - width * dest.format.bytesPerPixel; + byte *dst = (byte *)dest.getBasePtr(x, y); byte *dst2 = dst + dest.pitch; #ifndef DISABLE_TOWNS_DUAL_LAYER_MODE diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp index 0c1554840e..67ed17c024 100644 --- a/engines/scumm/verbs.cpp +++ b/engines/scumm/verbs.cpp @@ -1440,7 +1440,6 @@ void ScummEngine::drawVerb(int verb, int mode) { } void ScummEngine::restoreVerbBG(int verb) { - VerbSlot *vs; vs = &_verbs[verb]; |