[Scummvm-cvs-logs] scummvm master -> 0da6b15539c4dbb1371cd18ae77b90688ef3f764

bluegr md5 at scummvm.org
Mon Feb 14 17:17:32 CET 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:
0da6b15539 SCI2+: Point out that there is a hack in the text splitting code


Commit: 0da6b15539c4dbb1371cd18ae77b90688ef3f764
    https://github.com/scummvm/scummvm/commit/0da6b15539c4dbb1371cd18ae77b90688ef3f764
Author: md5 (md5 at scummvm.org)
Date: 2011-02-14T08:16:35-08:00

Commit Message:
SCI2+: Point out that there is a hack in the text splitting code

This particular hack causes issues in GK1, when talking with Grace, because the
width of the associated plane isn't set correctly.

Changed paths:
    engines/sci/graphics/frameout.cpp



diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 5b690f2..026a2ff 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -584,6 +584,11 @@ void GfxFrameout::kernelFrameout() {
 					uint16 startX = itemEntry->x + it->planeRect.left;
 					uint16 curY = itemEntry->y + it->planeRect.top;
 					const char *txt = text.c_str();
+					// HACK. The plane sometimes doesn't contain the correct width. This
+					// hack breaks the dialog options when speaking with Grace, but it's
+					// the best we got up to now.
+					// TODO: Remove this, and figure out why the plane in question isn't
+					// initialized correctly (its width is 0).
 					uint16 w = it->planeRect.width() >= 20 ? it->planeRect.width() : _screen->getWidth() - 10;
 					int16 charCount;
 






More information about the Scummvm-git-logs mailing list