From a1c339ea4f70d4f93310fbece51a6b3348e769f4 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Wed, 4 May 2011 02:26:50 +0200
Subject: 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.
---
 engines/gob/draw_v2.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'engines/gob/draw_v2.cpp')

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;
-- 
cgit v1.2.3


From 69b1485a22dc2b8a2cfe0bd10edcbaad0da0cf6e Mon Sep 17 00:00:00 2001
From: strangerke
Date: Thu, 12 May 2011 01:13:57 +0200
Subject: GIT: Clean up: Suppress SVN tags, now useless

---
 engines/gob/draw_v2.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'engines/gob/draw_v2.cpp')

diff --git a/engines/gob/draw_v2.cpp b/engines/gob/draw_v2.cpp
index c07f8de69d..cc8f6b5e3c 100644
--- a/engines/gob/draw_v2.cpp
+++ b/engines/gob/draw_v2.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "common/endian.h"
-- 
cgit v1.2.3