[Scummvm-cvs-logs] SF.net SVN: scummvm: [23966] scummvm/branches/branch-0-9-0

[sev at users.sourceforge.net]

Revision: 23966
          http://svn.sourceforge.net/scummvm/?rev=23966&view=rev
Author:   sev
Date:     2006-09-21 10:49:42 -0700 (Thu, 21 Sep 2006)

Log Message:
-----------
Backport fix for bug #1550974: "SMUSH: changing subtitle settings during
SMUSH doesn't work"

Modified Paths:
--------------
    scummvm/branches/branch-0-9-0/NEWS
    scummvm/branches/branch-0-9-0/engines/scumm/smush/smush_player.cpp
    scummvm/branches/branch-0-9-0/engines/scumm/smush/smush_player.h

Modified: scummvm/branches/branch-0-9-0/NEWS
===================================================================
--- scummvm/branches/branch-0-9-0/NEWS	2006-09-21 17:46:19 UTC (rev 23965)
+++ scummvm/branches/branch-0-9-0/NEWS	2006-09-21 17:49:42 UTC (rev 23966)
@@ -15,6 +15,7 @@
      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.

Modified: scummvm/branches/branch-0-9-0/engines/scumm/smush/smush_player.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/engines/scumm/smush/smush_player.cpp	2006-09-21 17:46:19 UTC (rev 23965)
+++ scummvm/branches/branch-0-9-0/engines/scumm/smush/smush_player.cpp	2006-09-21 17:49:42 UTC (rev 23966)
@@ -253,7 +253,6 @@
 	_seekPos = -1;
 
 	_skipNext = false;
-	_subtitles = ConfMan.getBool("subtitles");
 	_dst = NULL;
 	_storeFrame = false;
 	_compressedFileMode = false;
@@ -573,7 +572,11 @@
 	}
 
 	// 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];

Modified: scummvm/branches/branch-0-9-0/engines/scumm/smush/smush_player.h
===================================================================
--- scummvm/branches/branch-0-9-0/engines/scumm/smush/smush_player.h	2006-09-21 17:46:19 UTC (rev 23965)
+++ scummvm/branches/branch-0-9-0/engines/scumm/smush/smush_player.h	2006-09-21 17:49:42 UTC (rev 23966)
@@ -57,7 +57,6 @@
 	int32 _seekFrame;
 
 	bool _skipNext;
-	bool _subtitles;
 	bool _skips[37];
 	int32 _frame;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.