[Scummvm-cvs-logs] scummvm master -> 8571083700e8bc9c81d05bb17e55b49dcd0771e7

bluegr md5 at scummvm.org
Sat Feb 26 05:14:17 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:
8571083700 SCI2+: Mention that the actual problem with text wrapping happens because of the unimplemented kTextSize kernel call in 


Commit: 8571083700e8bc9c81d05bb17e55b49dcd0771e7
    https://github.com/scummvm/scummvm/commit/8571083700e8bc9c81d05bb17e55b49dcd0771e7
Author: md5 (md5 at scummvm.org)
Date: 2011-02-25T20:13:08-08:00

Commit Message:
SCI2+: Mention that the actual problem with text wrapping happens because of the unimplemented kTextSize kernel call in SCI32

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



diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index 2bcf590..afcc2d1 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -364,6 +364,7 @@ reg_t kTextSize(EngineState *s, int argc, reg_t *argv) {
 	if (!g_sci->_gfxText16) {
 		// TODO: Implement this
 		textWidth = 0; textHeight = 0;
+		warning("TODO: implement kTextSize for SCI32");
 	} else
 #endif
 		g_sci->_gfxText16->kernelTextSize(g_sci->strSplit(text.c_str(), sep).c_str(), font_nr, maxwidth, &textWidth, &textHeight);
diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index ab4a2c9..87acfde 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -592,9 +592,9 @@ void GfxFrameout::kernelFrameout() {
 					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).
+					// the best we got up to now. This happens because of the unimplemented
+					// kTextWidth function in SCI32.
+					// TODO: Remove this once kTextWidth has been implemented.
 					uint16 w = it->planeRect.width() >= 20 ? it->planeRect.width() : _screen->getWidth() - 10;
 					int16 charCount;
 






More information about the Scummvm-git-logs mailing list