From 260a2019b6c57646ef32274c2fb197658f542803 Mon Sep 17 00:00:00 2001
From: Walter van Niftrik
Date: Mon, 17 Aug 2009 15:49:22 +0000
Subject: SCI: Add autodetection for DoSound. Cleanup.

svn-id: r43482
---
 engines/sci/engine/kernel.h | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'engines/sci/engine/kernel.h')

diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h
index bb5563a876..8be51549f6 100644
--- a/engines/sci/engine/kernel.h
+++ b/engines/sci/engine/kernel.h
@@ -60,9 +60,7 @@ struct KernelFuncWithSignature {
 enum AutoDetectedFeatures {
 	kFeatureOldScriptHeader = 1 << 0,
 	kFeatureOldGfxFunctions = 1 << 1,
-	kFeatureLofsAbsolute    = 1 << 2,
-	kFeatureSci01Sound      = 1 << 3,
-	kFeatureSci1Sound       = 1 << 4
+	kFeatureLofsAbsolute    = 1 << 2
 };
 
 class Kernel {
@@ -119,16 +117,6 @@ public:
 	 */
 	bool hasLofsAbsolute() const { return (features & kFeatureLofsAbsolute); }
 
-	/**
-	 * Determines if the game is using SCI01 sound functions
-	 */
-	bool usesSci01SoundFunctions() const { return (features & kFeatureSci01Sound); }
-
-	/**
-	 * Determines if the game is using SCI1 sound functions
-	 */
-	bool usesSci1SoundFunctions() const { return (features & kFeatureSci1Sound); }
-
 	// Script dissection/dumping functions
 	void dissectScript(int scriptNumber, Vocabulary *vocab);
 	void dumpScriptObject(char *data, int seeker, int objsize);
-- 
cgit v1.2.3


From db0cd620f6f5766b6287bb0f0aa1ac9c866c4cba Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 18 Aug 2009 14:10:31 +0000
Subject: Started rewriting the SCI engine to use FSNode instead of file names.
 This is the proper solution for removing the hack in the fallback detector,
 but it still needs work. Also, reduced the things needed to be initialized a
 bit, so that the detection is a bit faster

svn-id: r43510
---
 engines/sci/engine/kernel.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'engines/sci/engine/kernel.h')

diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h
index 8be51549f6..997cdaea77 100644
--- a/engines/sci/engine/kernel.h
+++ b/engines/sci/engine/kernel.h
@@ -65,7 +65,12 @@ enum AutoDetectedFeatures {
 
 class Kernel {
 public:
-	Kernel(ResourceManager *resmgr);
+	/**
+	 * Initializes the SCI kernel
+	 * @param minimalLoad If true, only the selector names are loaded, to detect game features.
+	 * It's set to true by the advanced game detector to speed it up
+	 */
+	Kernel(ResourceManager *resmgr, bool minimalLoad = false);
 	~Kernel();
 
 	uint getOpcodesSize() const { return _opcodes.size(); }
-- 
cgit v1.2.3


From 60af2db2fdd8c0ca0d597033798bdf4b4efa4938 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 23 Aug 2009 21:57:30 +0000
Subject: - Added more mappings from Sierra's internal IDs to our own ones.
 Hopefully, all SCI0-SCI11 games can now be detected correctly from the
 fallback detector - Simplified some checks for old script types

svn-id: r43678
---
 engines/sci/engine/kernel.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'engines/sci/engine/kernel.h')

diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h
index 997cdaea77..a85025f514 100644
--- a/engines/sci/engine/kernel.h
+++ b/engines/sci/engine/kernel.h
@@ -67,10 +67,8 @@ class Kernel {
 public:
 	/**
 	 * Initializes the SCI kernel
-	 * @param minimalLoad If true, only the selector names are loaded, to detect game features.
-	 * It's set to true by the advanced game detector to speed it up
 	 */
-	Kernel(ResourceManager *resmgr, bool minimalLoad = false);
+	Kernel(ResourceManager *resmgr);
 	~Kernel();
 
 	uint getOpcodesSize() const { return _opcodes.size(); }
-- 
cgit v1.2.3