diff options
| author | Eugene Sandulenko | 2006-09-21 17:46:19 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2006-09-21 17:46:19 +0000 |
| commit | 0e244c9510f83a37c144a6aa57803805601c2118 (patch) | |
| tree | 1b24d699448a4d419be219eb433502e9991d7181 /engines/scumm | |
| parent | 6fdc053a6bb8ec64f5695302b7ea7ca374948a94 (diff) | |
| download | scummvm-rg350-0e244c9510f83a37c144a6aa57803805601c2118.tar.gz scummvm-rg350-0e244c9510f83a37c144a6aa57803805601c2118.tar.bz2 scummvm-rg350-0e244c9510f83a37c144a6aa57803805601c2118.zip | |
Fix bug #1550974: "SMUSH: changing subtitle settings during SMUSH doesn't work"
svn-id: r23965
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/smush/smush_player.cpp | 7 | ||||
| -rw-r--r-- | engines/scumm/smush/smush_player.h | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index 1c4ab0e732..122640e6a6 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -253,7 +253,6 @@ SmushPlayer::SmushPlayer(ScummEngine_v6 *scumm, int speed) { _seekPos = -1; _skipNext = false; - _subtitles = ConfMan.getBool("subtitles"); _dst = NULL; _storeFrame = false; _compressedFileMode = false; @@ -567,7 +566,11 @@ void SmushPlayer::handleTextResource(Chunk &b) { } // if subtitles disabled and bit 3 is set, then do not draw - if ((!_subtitles) && ((flags & 8) == 8)) + // + // Query ConfMan here. However it may be slower, but + // player may want to switch the subtitles on or off during the + // playback. This fixes bug #1550974 + if ((!ConfMan.getBool("subtitles")) && ((flags & 8) == 8)) return; SmushFont *sf = _sf[0]; diff --git a/engines/scumm/smush/smush_player.h b/engines/scumm/smush/smush_player.h index 05dd5c362a..e5ea8be04e 100644 --- a/engines/scumm/smush/smush_player.h +++ b/engines/scumm/smush/smush_player.h @@ -57,7 +57,6 @@ private: int32 _seekFrame; bool _skipNext; - bool _subtitles; bool _skips[37]; int32 _frame; |