aboutsummaryrefslogtreecommitdiff
path: root/engines/dreamweb
diff options
context:
space:
mode:
authorD G Turner2012-05-08 16:48:01 +0100
committerD G Turner2012-05-08 16:48:01 +0100
commit0cff5c547c4051f920fde17f772bad4634895be9 (patch)
tree97cbb57a54234954b796f4b7b0ef8399c6cb0481 /engines/dreamweb
parent4161d83cba5ab549b46fe993bda84464d1dbfe5a (diff)
downloadscummvm-rg350-0cff5c547c4051f920fde17f772bad4634895be9.tar.gz
scummvm-rg350-0cff5c547c4051f920fde17f772bad4634895be9.tar.bz2
scummvm-rg350-0cff5c547c4051f920fde17f772bad4634895be9.zip
DREAMWEB: Add _speechDirName to remove duplication of Directory name.
Diffstat (limited to 'engines/dreamweb')
-rw-r--r--engines/dreamweb/dreamweb.cpp3
-rw-r--r--engines/dreamweb/dreamweb.h1
-rw-r--r--engines/dreamweb/sound.cpp2
3 files changed, 4 insertions, 2 deletions
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 299dd74b53..cdc1789e3e 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 4065e5a860..6744b53ebc 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 b51527a8cd..800936e8e8 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());