aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorMax Horn2004-06-28 00:06:31 +0000
committerMax Horn2004-06-28 00:06:31 +0000
commit53af3dc6700a6e7686fbf2e88cea283d6e335124 (patch)
treedcb1a4ffb7c717e5be3ddd909b604d5845d23597 /simon
parentb1de21accbea8c333b24db91c47235bb5a8d14ef (diff)
downloadscummvm-rg350-53af3dc6700a6e7686fbf2e88cea283d6e335124.tar.gz
scummvm-rg350-53af3dc6700a6e7686fbf2e88cea283d6e335124.tar.bz2
scummvm-rg350-53af3dc6700a6e7686fbf2e88cea283d6e335124.zip
Enhanced default directory support in the File class; now one can specify arbitrary many default search directories
svn-id: r14095
Diffstat (limited to 'simon')
-rw-r--r--simon/simon.cpp22
1 files changed, 17 insertions, 5 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 624f601aba..a273088bbf 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -269,17 +269,29 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst)
SOUND_INDEX_BASE = 0;
}
- if (_game & GF_MAC)
+ if (_game & GF_MAC) {
gss = PTR(simon2mac_settings);
- else if ((_game & GF_SIMON2) && (_game & GF_TALKIE))
+
+ // Add default file directories
+ File::addDefaultDirectory(_gameDataPath + "/voices/");
+ File::addDefaultDirectory(_gameDataPath + "/VOICES/");
+ } else if ((_game & GF_SIMON2) && (_game & GF_TALKIE))
gss = PTR(simon2win_settings);
else if (_game & GF_SIMON2)
gss = PTR(simon2dos_settings);
- else if (_game & GF_ACORN)
+ else if (_game & GF_ACORN) {
gss = PTR(simon1acorn_settings);
- else if (_game & GF_AMIGA)
+
+ // Add default file directories
+ File::addDefaultDirectory(_gameDataPath + "/execute/");
+ File::addDefaultDirectory(_gameDataPath + "/EXECUTE/");
+ } else if (_game & GF_AMIGA) {
gss = PTR(simon1amiga_settings);
- else if (_game & GF_DEMO)
+
+ // Add default file directories
+ File::addDefaultDirectory(_gameDataPath + "/voices/");
+ File::addDefaultDirectory(_gameDataPath + "/VOICES/");
+ } else if (_game & GF_DEMO)
gss = PTR(simon1demo_settings);
else
gss = PTR(simon1_settings);