From 53af3dc6700a6e7686fbf2e88cea283d6e335124 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 28 Jun 2004 00:06:31 +0000
Subject: Enhanced default directory support in the File class; now one can
 specify arbitrary many default search directories

svn-id: r14095
---
 simon/simon.cpp | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'simon')

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);
-- 
cgit v1.2.3