[Scummvm-cvs-logs] scummvm master -> a1c339ea4f70d4f93310fbece51a6b3348e769f4
DrMcCoy
drmccoy at drmccoy.de
Wed May 4 02:36:54 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:
a1c339ea4f GOB: Don't overwrite _destSpriteX after PRINTTEXT
Commit: a1c339ea4f70d4f93310fbece51a6b3348e769f4
https://github.com/scummvm/scummvm/commit/a1c339ea4f70d4f93310fbece51a6b3348e769f4
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2011-05-03T17:34:37-07:00
Commit Message:
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.
Changed paths:
engines/gob/draw_v2.cpp
diff --git a/engines/gob/draw_v2.cpp b/engines/gob/draw_v2.cpp
index 15a8f7f..c07f8de 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;
More information about the Scummvm-git-logs
mailing list