[Scummvm-git-logs] scummvm branch-1-9 -> 483d123dc6f9b42a06da29dd9e8b60a0602f302f
dreammaster
dreammaster at scummvm.org
Sun Jul 16 17:25:30 CEST 2017
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:
483d123dc6 TINSEL: Fix some DW2 text/voice not playing all the way through
Commit: 483d123dc6f9b42a06da29dd9e8b60a0602f302f
https://github.com/scummvm/scummvm/commit/483d123dc6f9b42a06da29dd9e8b60a0602f302f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-16T11:15:18-04:00
Commit Message:
TINSEL: Fix some DW2 text/voice not playing all the way through
Conflicts:
NEWS
Changed paths:
NEWS
engines/tinsel/tinlib.cpp
diff --git a/NEWS b/NEWS
index d626436..2339c27 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,9 @@ For a more comprehensive changelog of the latest experimental code, see:
MADS:
- Fixed a bug that caused a crash after starting Rex Nebular and the Cosmic Gender Bender.
+ 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;
More information about the Scummvm-git-logs
mailing list