[Scummvm-cvs-logs] scummvm master -> 59ea9187457da7b771fbb760ad76805d3a6e3c6e

[bluegr]

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:
59ea918745 SCI: Temporarily disable text display in the demo of SQ6 to stop crashes


Commit: 59ea9187457da7b771fbb760ad76805d3a6e3c6e
    https://github.com/scummvm/scummvm/commit/59ea9187457da7b771fbb760ad76805d3a6e3c6e
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-07-16T02:04:34-07:00

Commit Message:
SCI: Temporarily disable text display in the demo of SQ6 to stop crashes

Changed paths:
    engines/sci/engine/kgraphics32.cpp



diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp
index 16e54a5..f0989f5 100644
--- a/engines/sci/engine/kgraphics32.cpp
+++ b/engines/sci/engine/kgraphics32.cpp
@@ -173,6 +173,10 @@ reg_t kCreateTextBitmap(EngineState *s, int argc, reg_t *argv) {
 		debugC(kDebugLevelStrings, "%s", text.c_str());
 		uint16 maxWidth = argv[1].toUint16();	// nsRight - nsLeft + 1
 		uint16 maxHeight = argv[2].toUint16();	// nsBottom - nsTop + 1
+		// These values can be larger than the screen in the SQ6 demo
+		// TODO: Find out why. For now, don't show any text in the SQ6 demo.
+		if (g_sci->getGameId() == GID_SQ6 && g_sci->isDemo())
+			return NULL_REG;
 		return g_sci->_gfxText32->createTextBitmap(object, maxWidth, maxHeight);
 	}
 	case 1: {