diff options
| author | Paul Gilbert | 2008-12-13 10:24:28 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2008-12-13 10:24:28 +0000 |
| commit | 5f9bbd3444fcd0740db12742804679271c2b8daa (patch) | |
| tree | 7347d328e2b04f5e42236c898f6cb91ccfb19b96 /engines | |
| parent | 0e2864692e617c1bc2953ebe9efea54f378b79a3 (diff) | |
| download | scummvm-rg350-5f9bbd3444fcd0740db12742804679271c2b8daa.tar.gz scummvm-rg350-5f9bbd3444fcd0740db12742804679271c2b8daa.tar.bz2 scummvm-rg350-5f9bbd3444fcd0740db12742804679271c2b8daa.zip | |
Bugfixes for text display and animations in DW1 demo
svn-id: r35333
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/tinsel/play.cpp | 2 | ||||
| -rw-r--r-- | engines/tinsel/tinlib.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/engines/tinsel/play.cpp b/engines/tinsel/play.cpp index 27b2ea1bf5..697fdbb1bf 100644 --- a/engines/tinsel/play.cpp +++ b/engines/tinsel/play.cpp @@ -460,7 +460,7 @@ static void t1PlayReel(CORO_PARAM, const PPINIT *ppi) { _ctx->reelActor = (int32)FROM_LE_32(pmi->mulID); /**** New (experimental? bit 5/1/95 ****/ - if (!actorAlive(_ctx->reelActor)) + if (!TinselV0 && !actorAlive(_ctx->reelActor)) return; /**** Delete a bit down there if this stays ****/ diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp index 048371c835..2fd6d33958 100644 --- a/engines/tinsel/tinlib.cpp +++ b/engines/tinsel/tinlib.cpp @@ -3307,7 +3307,8 @@ static void TalkOrSay(CORO_PARAM, SPEECH_TYPE speechType, SCNHANDLE hText, int x if ((_ctx->whatSort == IS_SAY) || (_ctx->whatSort == IS_TALK)) GetActorMidTop(_ctx->actor, &_ctx->x, &_ctx->y); - SetTextPal(GetActorRGB(_ctx->actor)); + if (!TinselV0) + SetTextPal(GetActorRGB(_ctx->actor)); if (TinselV2) LoadSubString(hText, _ctx->sub, TextBufferAddr(), TBUFSZ); else { |