[Scummvm-cvs-logs] scummvm master -> 7db571812ac5786d6e5a676a4b792ff440d79cbe

digitall digitall at scummvm.org
Tue Dec 27 04:35:33 CET 2011


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:
7db571812a DREAMWEB: Move kSubtitles out of data blob.


Commit: 7db571812ac5786d6e5a676a4b792ff440d79cbe
    https://github.com/scummvm/scummvm/commit/7db571812ac5786d6e5a676a4b792ff440d79cbe
Author: D G Turner (digitall at scummvm.org)
Date: 2011-12-26T19:34:54-08:00

Commit Message:
DREAMWEB: Move kSubtitles out of data blob.

Changed paths:
    devtools/tasmrecover/tasm-recover
    engines/dreamweb/dreambase.h
    engines/dreamweb/dreamgen.cpp
    engines/dreamweb/dreamgen.h
    engines/dreamweb/sound.cpp
    engines/dreamweb/stubs.cpp



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index c4292f9..e14b3fe 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -44,6 +44,7 @@ p = parser(skip_binary_data = [
 	'extradata',
 	'keybuffer',
 	'spritename1',
+	'subtitles',
 	'icongraphics0',
 	'icongraphics1',
 	'savenames',
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 6c09d41..23714ad 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -115,6 +115,7 @@ public:
 	DreamBase(DreamWeb::DreamWebEngine *en);
 
 	bool _quitRequested;
+	bool _subtitles;
 
 	// from backdrop.cpp
 	void doBlocks();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index ce871c4..eda7dce 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -75,7 +75,7 @@ void DreamGenContext::__start() {
 		//0x0150: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0160: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, };
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 66c6aef..b608cfa 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -307,8 +307,7 @@ static const uint16 kCh1playing = 374;
 static const uint16 kCh1blockstocopy = 375;
 static const uint16 kCurrentsample = 377;
 static const uint16 kRoomssample = 378;
-static const uint16 kSubtitles = 379;
-static const uint16 kForeignrelease = 380;
+static const uint16 kForeignrelease = 379;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp
index 247935b..289bca9 100644
--- a/engines/dreamweb/sound.cpp
+++ b/engines/dreamweb/sound.cpp
@@ -204,7 +204,7 @@ bool DreamWebEngine::loadSpeech(const Common::String &filename) {
 }
 
 void DreamWebEngine::soundHandler() {
-	_base.data.byte(DreamGen::kSubtitles) = ConfMan.getBool("subtitles");
+	_base._subtitles = ConfMan.getBool("subtitles");
 	_base.volumeAdjust();
 
 	uint volume = _base.data.byte(DreamGen::kVolume);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 1ef1e5e..2b91034 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -893,7 +893,7 @@ void DreamBase::setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8
 		// FIXME: This fallthrough does not properly support subtitles+speech
 		// mode. The parameters to setuptimedtemp() are sometimes different
 		// for speech and for subtitles. See e.g., madmantext()
-		if ((data.byte(kSpeechloaded) == 1) && (data.byte(kSubtitles) != 1))
+		if ((data.byte(kSpeechloaded) == 1) && !_subtitles)
 			return;
 	}
 #endif






More information about the Scummvm-git-logs mailing list