[Scummvm-git-logs] scummvm master -> 9cda101b89b81b5e12b64a5d5f4846347eed0129

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9cda101b89 TINSEL: Fix some DW2 text/voice not playing all the way through


Commit: 9cda101b89b81b5e12b64a5d5f4846347eed0129
    https://github.com/scummvm/scummvm/commit/9cda101b89b81b5e12b64a5d5f4846347eed0129
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-16T11:07:39-04:00

Commit Message:
TINSEL: Fix some DW2 text/voice not playing all the way through

Changed paths:
    NEWS
    engines/tinsel/tinlib.cpp


diff --git a/NEWS b/NEWS
index 9576927..88d48ff 100644
--- a/NEWS
+++ b/NEWS
@@ -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 0bc8386..9cc567b 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;