Detect whether to use the modified SCI2 or SCI2.1 kernel table based on the kDoSound call used in Sound::play(), which fixes at least my version of KQ7 - probably others. The kernel table initialization now occurs after the script signatures are adjusted as we need it adjusted before checking through Sound::play for the kDoSound call.

svn-id: r47645

1 files changed, 13 insertions, 13 deletions

diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h
index 3eccf7bd72..4516b814f9 100644
--- a/engines/sci/engine/kernel.h
+++ b/engines/sci/engine/kernel.h
@@ -112,7 +112,7 @@ public:
 	/**
 	 * Initializes the SCI kernel
 	 */
-	Kernel(ResourceManager *resMan, Common::String gameId);
+	Kernel(ResourceManager *resMan);
 	~Kernel();
 
 	uint getSelectorNamesSize() const;
@@ -122,6 +122,17 @@ public:
 	const Common::String &getKernelName(uint number) const;
 
 	/**
+	 * Loads the kernel function names.
+	 *
+	 * This function reads the kernel function name table from resource_map,
+	 * and fills the _kernelNames array with them.
+	 * The resulting list has the same format regardless of the format of the
+	 * name table of the resource (the format changed between version 0 and 1).
+	 * @return true on success, false on failure
+	 */
+	bool loadKernelNames(Common::String gameId, EngineState *s);
+
+	/**
 	 * Determines the selector ID of a selector by its name
 	 * @param selectorName Name of the selector to look up
 	 * @return The appropriate selector ID, or -1 on error
@@ -139,17 +150,6 @@ public:
 
 private:
 	/**
-	 * Loads the kernel function names.
-	 *
-	 * This function reads the kernel function name table from resource_map,
-	 * and fills the _kernelNames array with them.
-	 * The resulting list has the same format regardless of the format of the
-	 * name table of the resource (the format changed between version 0 and 1).
-	 * @return true on success, false on failure
-	 */
-	bool loadKernelNames(Common::String gameId);
-
-	/**
 	 * Sets the default kernel function names, based on the SCI version used
 	 */
 	void setDefaultKernelNames(Common::String gameId);
@@ -163,7 +163,7 @@ private:
 	/**
 	 * Sets the default kernel function names to the SCI2.1 kernel functions
 	 */
-	void setKernelNamesSci21(Common::String gameId);
+	void setKernelNamesSci21(EngineState *s);
 #endif
 
 	/**