From 5f9bbd3444fcd0740db12742804679271c2b8daa Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 13 Dec 2008 10:24:28 +0000 Subject: Bugfixes for text display and animations in DW1 demo svn-id: r35333 --- engines/tinsel/play.cpp | 2 +- engines/tinsel/tinlib.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'engines/tinsel') 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 { -- cgit v1.2.3