[Scummvm-cvs-logs] scummvm master -> f8ee4f385f38a734fb9a872e79ed415cec21c7ff
athrxx
athrxx at scummvm.org
Sat Sep 17 22:30:34 CEST 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f8ee4f385f SCUMM FM-TOWNS: fix DS build
Commit: f8ee4f385f38a734fb9a872e79ed415cec21c7ff
https://github.com/scummvm/scummvm/commit/f8ee4f385f38a734fb9a872e79ed415cec21c7ff
Author: athrxx (athrxx at scummvm.org)
Date: 2011-09-17T13:16:41-07:00
Commit Message:
SCUMM FM-TOWNS: fix DS build
Changed paths:
engines/scumm/charset.cpp
engines/scumm/verbs.cpp
diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index 5c53ac7..4064853 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 0c15548..67ed17c 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];
More information about the Scummvm-git-logs
mailing list