[Scummvm-cvs-logs] scummvm master -> 9561d5f6f8d5fab355ee56f70879443177b58ee1
m-kiewitz
m_kiewitz at users.sourceforge.net
Sat Nov 1 00:57:14 CET 2014
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:
9561d5f6f8 SCI: revert r55034, fixes bug #6539
Commit: 9561d5f6f8d5fab355ee56f70879443177b58ee1
https://github.com/scummvm/scummvm/commit/9561d5f6f8d5fab355ee56f70879443177b58ee1
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2014-11-01T00:57:26+01:00
Commit Message:
SCI: revert r55034, fixes bug #6539
original bug wasn't solved properly
will reopen the original bug #5334
and figure out that one instead
Changed paths:
engines/sci/graphics/text16.cpp
diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
index 245d699..808ce45 100644
--- a/engines/sci/graphics/text16.cpp
+++ b/engines/sci/graphics/text16.cpp
@@ -337,8 +337,6 @@ int16 GfxText16::Size(Common::Rect &rect, const char *text, GuiResourceId fontId
maxTextWidth = MAX(textWidth, maxTextWidth);
totalHeight += textHeight;
curPos += charCount;
- while (*curPos == ' ')
- curPos++; // skip over breaking spaces
}
rect.bottom = totalHeight;
rect.right = maxWidth ? maxWidth : MIN(rect.right, maxTextWidth);
@@ -458,8 +456,6 @@ void GfxText16::Box(const char *text, bool show, const Common::Rect &rect, TextA
hline += textHeight;
text += charCount;
- while (*text == ' ')
- text++; // skip over breaking spaces
}
SetFont(previousFontId);
_ports->penColor(previousPenColor);
More information about the Scummvm-git-logs
mailing list