diff options
| author | Paul Gilbert | 2009-08-09 01:05:47 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2009-08-09 01:05:47 +0000 |
| commit | 5dbd11abad7c5e1f069a67a63b9be66cbfafc255 (patch) | |
| tree | be1888e84710dceede9315997a08620a4a6857ba | |
| parent | 256a27350a1896137a4416eb5db26662c7fab2ee (diff) | |
| download | scummvm-rg350-5dbd11abad7c5e1f069a67a63b9be66cbfafc255.tar.gz scummvm-rg350-5dbd11abad7c5e1f069a67a63b9be66cbfafc255.tar.bz2 scummvm-rg350-5dbd11abad7c5e1f069a67a63b9be66cbfafc255.zip | |
Changed subtitles display speed to also include the time taken to say voice samples (if voices are turned on). This means subtitles will display for the same time irrespective of whether voices are on or not
svn-id: r43150
| -rw-r--r-- | engines/tinsel/tinlib.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp index 4b5e0ce450..957c4f7626 100644 --- a/engines/tinsel/tinlib.cpp +++ b/engines/tinsel/tinlib.cpp @@ -2196,6 +2196,10 @@ static void PrintObj(CORO_PARAM, const SCNHANDLE hText, const INV_OBJECT *pinvo, _ctx->bSample = false; } } + + // Decrement the subtitles timeout counter + if (_ctx->ticks > 0) --_ctx->ticks; + } else { // No sample - just depends on time if (_ctx->ticks-- <= 0) @@ -2327,6 +2331,10 @@ static void PrintObjNonPointed(CORO_PARAM, const SCNHANDLE text, const OBJECT *p _ctx->bSample = false; } } + + // Decrement the subtitles timeout counter + if (_ctx->ticks > 0) --_ctx->ticks; + } else { // No sample - just depends on time if (_ctx->ticks-- <= 0) @@ -3437,6 +3445,10 @@ static void TalkOrSay(CORO_PARAM, SPEECH_TYPE speechType, SCNHANDLE hText, int x _ctx->bSample = false; } } + + // Decrement the subtitles timeout counter + if (_ctx->ticks > 0) --_ctx->ticks; + } else { // No sample - just depends on time if (_ctx->ticks-- <= 0) |