1 files changed, 5 insertions, 6 deletions
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 27fbc9f55d..e8d4589d79 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -379,12 +379,9 @@ SciKernelFunction kfunct_mappers[] = {
 	{NULL, NULL, NULL} // Terminator
 };
 
-Kernel::Kernel(ResourceManager *resMan, Common::String gameId) : _resMan(resMan) {
+Kernel::Kernel(ResourceManager *resMan) : _resMan(resMan) {
 	loadSelectorNames();
 	mapSelectors();      // Map a few special selectors for later use
-
-	loadKernelNames(gameId);
-	mapFunctions();      // Map the kernel functions
 }
 
 Kernel::~Kernel() {
@@ -777,17 +774,19 @@ void Kernel::setDefaultKernelNames(Common::String gameId) {
 	}
 }
 
-bool Kernel::loadKernelNames(Common::String gameId) {
+bool Kernel::loadKernelNames(Common::String gameId, EngineState *s) {
 	_kernelNames.clear();
 
 #ifdef ENABLE_SCI32
 	if (getSciVersion() >= SCI_VERSION_2_1)
-		setKernelNamesSci21(gameId);
+		setKernelNamesSci21(s);
 	else if (getSciVersion() == SCI_VERSION_2)
 		setKernelNamesSci2();
 	else
 #endif
 		setDefaultKernelNames(gameId);
+
+	mapFunctions();
 	return true;
 }