Proper fix for kernel name loading (regression from commit #49537)

svn-id: r49544

3 files changed, 2 insertions, 2 deletions

diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 4d0e981f31..93af161219 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -394,6 +394,7 @@ SciKernelFunction kfunct_mappers[] = {
 Kernel::Kernel(ResourceManager *resMan, SegManager *segMan) : _resMan(resMan), _segMan(segMan) {
 	loadSelectorNames();
 	mapSelectors();      // Map a few special selectors for later use
+	loadKernelNames();	// must be called after the selectors are set
 }
 
 Kernel::~Kernel() {
diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h
index 2f1c867474..b79ba8caaa 100644
--- a/engines/sci/engine/kernel.h
+++ b/engines/sci/engine/kernel.h
@@ -207,6 +207,7 @@ public:
 	 */
 	Common::String lookupText(reg_t address, int index);
 
+private:
 	/**
 	 * Loads the kernel function names.
 	 *
@@ -217,7 +218,6 @@ public:
 	 */
 	void loadKernelNames();
 
-private:
 	/**
 	 * Sets the default kernel function names, based on the SCI version used
 	 */
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 8f5cfbba65..22c93c1de0 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -217,7 +217,6 @@ Common::Error SciEngine::run() {
 	}
 
 	script_adjust_opcode_formats(_gamestate);
-	_kernel->loadKernelNames();
 
 	SciVersion soundVersion = _features->detectDoSoundType();