aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Hesse2011-05-04 02:26:50 +0200
committerSven Hesse2011-05-04 02:34:37 +0200
commita1c339ea4f70d4f93310fbece51a6b3348e769f4 (patch)
treecd2b3bc578e6fda1adb81a34690684517c2f27aa
parent30f7cdb49ac42ecabf7abfb1030319e3ce68e9b4 (diff)
downloadscummvm-rg350-a1c339ea4f70d4f93310fbece51a6b3348e769f4.tar.gz
scummvm-rg350-a1c339ea4f70d4f93310fbece51a6b3348e769f4.tar.bz2
scummvm-rg350-a1c339ea4f70d4f93310fbece51a6b3348e769f4.zip
GOB: Don't overwrite _destSpriteX after PRINTTEXT
Don't overwrite _destSpriteX after PRINTTEXT with a value that's only appropriate for monospaced fonts; support for non-monospaced fonts has been introduced with Woodruff. This should fix bug #3295889.
-rw-r--r--engines/gob/draw_v2.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/engines/gob/draw_v2.cpp b/engines/gob/draw_v2.cpp
index 15a8f7ff8e..c07f8de69d 100644
--- a/engines/gob/draw_v2.cpp
+++ b/engines/gob/draw_v2.cpp
@@ -899,17 +899,12 @@ void Draw_v2::spriteOperation(int16 operation) {
_spriteTop = spriteTop;
_spriteRight = spriteRight;
_spriteBottom = spriteBottom;
- _destSpriteX = destSpriteX;
+ if (operation != DRAW_PRINTTEXT)
+ _destSpriteX = destSpriteX;
_destSpriteY = destSpriteY;
_destSurface = destSurface;
_sourceSurface = sourceSurface;
- if (operation == DRAW_PRINTTEXT) {
- len = _fonts[_fontIndex]->getCharWidth();
- adjustCoords(1, &len, 0);
- _destSpriteX += len * strlen(_textToPrint);
- }
-
if ((_renderFlags & RENDERFLAG_USEDELTAS) && !deltaVeto) {
if (_sourceSurface == kBackSurface) {
_spriteLeft -= _backDeltaX;