aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2012-07-16 12:04:34 +0300
committerFilippos Karapetis2012-07-16 12:04:34 +0300
commit59ea9187457da7b771fbb760ad76805d3a6e3c6e (patch)
treec7d8144e6cbfa0ba8e565862d0b8741255acb4b3
parent1a90ca5ecd9eeaaca3b6de79dd940e9b29e472aa (diff)
downloadscummvm-rg350-59ea9187457da7b771fbb760ad76805d3a6e3c6e.tar.gz
scummvm-rg350-59ea9187457da7b771fbb760ad76805d3a6e3c6e.tar.bz2
scummvm-rg350-59ea9187457da7b771fbb760ad76805d3a6e3c6e.zip
SCI: Temporarily disable text display in the demo of SQ6 to stop crashes
-rw-r--r--engines/sci/engine/kgraphics32.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp
index 16e54a5429..f0989f5f00 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: {