diff options
| author | Paul Gilbert | 2017-07-16 11:07:39 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-07-16 11:07:39 -0400 |
| commit | 9cda101b89b81b5e12b64a5d5f4846347eed0129 (patch) | |
| tree | 8f6288e62b01304a510dc32b4d49b7594f05ebfa | |
| parent | b789c1ef4a6a47508b222e61818be00e35718ba5 (diff) | |
| download | scummvm-rg350-9cda101b89b81b5e12b64a5d5f4846347eed0129.tar.gz scummvm-rg350-9cda101b89b81b5e12b64a5d5f4846347eed0129.tar.bz2 scummvm-rg350-9cda101b89b81b5e12b64a5d5f4846347eed0129.zip | |
TINSEL: Fix some DW2 text/voice not playing all the way through
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | engines/tinsel/tinlib.cpp | 5 |
2 files changed, 6 insertions, 2 deletions
@@ -63,6 +63,9 @@ For a more comprehensive changelog of the latest experimental code, see: party room with the large golden head inside the museum (room 350). This bug is also present, when using the original interpreter. + Tinsel: + - Fixed some Discworld 2 text/voice not displaying & playing all the way through + TsAGE: - Fixed recently introduced bug preventing animations in Return to Ringworld from playing. diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp index 0bc83868de..9cc567b910 100644 --- a/engines/tinsel/tinlib.cpp +++ b/engines/tinsel/tinlib.cpp @@ -2050,6 +2050,7 @@ static void PrintObj(CORO_PARAM, const SCNHANDLE hText, const INV_OBJECT *pinvo, int timeout; bool bTookControl; int myEscape; + int myLeftEvent; CORO_END_CONTEXT(_ctx); CORO_BEGIN_CODE(_ctx); @@ -2186,7 +2187,7 @@ static void PrintObj(CORO_PARAM, const SCNHANDLE hText, const INV_OBJECT *pinvo, /* * PrintObj() called from other event */ - _ctx->myEscape = GetLeftEvents(); + _ctx->myLeftEvent = GetLeftEvents(); _ctx->bTookControl = GetControl(); // Display for a time, but abort if conversation gets hidden @@ -2200,7 +2201,7 @@ static void PrintObj(CORO_PARAM, const SCNHANDLE hText, const INV_OBJECT *pinvo, // Abort if left click - hardwired feature for talky-print! // Abort if sample times out // Abort if conversation hidden - if (LeftEventChange(_ctx->myEscape) + if (LeftEventChange(_ctx->myLeftEvent) || --_ctx->timeout <= 0 || ConvIsHidden()) break; |