aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2012-07-16 12:11:22 +0300
committerFilippos Karapetis2012-07-16 12:11:22 +0300
commit49c76c835bf000622bd5b078ef87275a335934fa (patch)
treef3c25e6e3be9179ce53684ed4812b292d90ad746
parent59ea9187457da7b771fbb760ad76805d3a6e3c6e (diff)
downloadscummvm-rg350-49c76c835bf000622bd5b078ef87275a335934fa.tar.gz
scummvm-rg350-49c76c835bf000622bd5b078ef87275a335934fa.tar.bz2
scummvm-rg350-49c76c835bf000622bd5b078ef87275a335934fa.zip
SCI: Only skip text in room 100 in the SQ6 demo
-rw-r--r--engines/sci/engine/kgraphics32.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp
index f0989f5f00..093920e148 100644
--- a/engines/sci/engine/kgraphics32.cpp
+++ b/engines/sci/engine/kgraphics32.cpp
@@ -173,9 +173,9 @@ 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())
+ // These values can be larger than the screen in the SQ6 demo, room 100
+ // TODO: Find out why. For now, don't show any text in that room.
+ if (g_sci->getGameId() == GID_SQ6 && g_sci->isDemo() && s->currentRoomNumber() == 100)
return NULL_REG;
return g_sci->_gfxText32->createTextBitmap(object, maxWidth, maxHeight);
}