Fix bug #1550974: "SMUSH: changing subtitle settings during SMUSH doesn't work"

svn-id: r23965

3 files changed, 6 insertions, 3 deletions

diff --git a/NEWS b/NEWS
index 8759253fa8..887b5fa582 100644
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,7 @@ For a more comprehensive changelog for the latest experimental SVN code, see:
      Time.
    - Fixed FM-TOWNS version of Indy3 failing on Amiga port.
    - Fixed crash in MM NES when clicking on top screen area
+   - Now it is possible to turn on or off subtitles during SMUSH movies
 
  Simon:
    - Improved support for international versions of the Feeble Files.
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;