[Scummvm-cvs-logs] scummvm master -> 29a866217f2e8ae5928b53c200b5dba059471894

digitall digitall at scummvm.org
Tue May 8 18:00:48 CEST 2012


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0cff5c547c DREAMWEB: Add _speechDirName to remove duplication of Directory name.
29a866217f DREAMWEB: Fix Speech Directory Name for SP/FR CD Variant.


Commit: 0cff5c547c4051f920fde17f772bad4634895be9
    https://github.com/scummvm/scummvm/commit/0cff5c547c4051f920fde17f772bad4634895be9
Author: D G Turner (digitall at scummvm.org)
Date: 2012-05-08T08:48:01-07:00

Commit Message:
DREAMWEB: Add _speechDirName to remove duplication of Directory name.

Changed paths:
    engines/dreamweb/dreamweb.cpp
    engines/dreamweb/dreamweb.h
    engines/dreamweb/sound.cpp



diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 299dd74..cdc1789 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -63,6 +63,7 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
 	_channel1 = 0;
 
 	_datafilePrefix = "DREAMWEB.";
+	_speechDirName = "SPEECH";
 	// ES and FR CD release use a different data file prefix
 	if (isCD()) {
 		switch(getLanguage()) {
@@ -381,7 +382,7 @@ Common::Error DreamWebEngine::run() {
 
 	ConfMan.registerDefault("originalsaveload", "false");
 	ConfMan.registerDefault("bright_palette", true);
-	_hasSpeech = Common::File::exists("speech/r01c0000.raw") && !ConfMan.getBool("speech_mute");
+	_hasSpeech = Common::File::exists(_speechDirName + "/r01c0000.raw") && !ConfMan.getBool("speech_mute");
 	_brightPalette = ConfMan.getBool("bright_palette");
 
 	_timer->installTimerProc(vSyncInterrupt, 1000000 / 70, this, "dreamwebVSync");
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 4065e5a..6744b53 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -164,6 +164,7 @@ private:
 	const DreamWebGameDescription	*_gameDescription;
 	Common::RandomSource			_rnd;
 	Common::String _datafilePrefix;
+	Common::String _speechDirName;
 
 	uint _speed;
 	bool _turbo;
diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp
index b51527a..800936e 100644
--- a/engines/dreamweb/sound.cpp
+++ b/engines/dreamweb/sound.cpp
@@ -177,7 +177,7 @@ bool DreamWebEngine::loadSpeech(const Common::String &filename) {
 		return false;
 
 	Common::File file;
-	if (!file.open("speech/" + filename))
+	if (!file.open(_speechDirName + "/" + filename))
 		return false;
 
 	debug(1, "loadSpeech(%s)", filename.c_str());


Commit: 29a866217f2e8ae5928b53c200b5dba059471894
    https://github.com/scummvm/scummvm/commit/29a866217f2e8ae5928b53c200b5dba059471894
Author: D G Turner (digitall at scummvm.org)
Date: 2012-05-08T08:58:43-07:00

Commit Message:
DREAMWEB: Fix Speech Directory Name for SP/FR CD Variant.

This should fix the remaining issues on bug #3524362 "DREAMWEB: Problem
with Spanish/French version".

Changed paths:
    engines/dreamweb/dreamweb.cpp



diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index cdc1789..11e8e3f 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -65,13 +65,16 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
 	_datafilePrefix = "DREAMWEB.";
 	_speechDirName = "SPEECH";
 	// ES and FR CD release use a different data file prefix
+	// and speech directory naming.
 	if (isCD()) {
 		switch(getLanguage()) {
 		case Common::ES_ESP:
 			_datafilePrefix = "DREAMWSP.";
+			_speechDirName = "SPANISH";
 			break;
 		case Common::FR_FRA:
 			_datafilePrefix = "DREAMWFR.";
+			_speechDirName = "FRENCH";
 			break;
 		default:
 			// Nothing to do






More information about the Scummvm-git-logs mailing list