diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp index 995ecc72a4e..4d0e981f31b 100644 --- a/engines/sci/engine/kernel.cpp +++ b/engines/sci/engine/kernel.cpp @@ -392,7 +392,6 @@ SciKernelFunction kfunct_mappers[] = { }; Kernel::Kernel(ResourceManager *resMan, SegManager *segMan) : _resMan(resMan), _segMan(segMan) { - loadKernelNames(); loadSelectorNames(); mapSelectors(); // Map a few special selectors for later use } diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h index b79ba8caaad..2f1c867474d 100644 --- a/engines/sci/engine/kernel.h +++ b/engines/sci/engine/kernel.h @@ -207,7 +207,6 @@ public: */ Common::String lookupText(reg_t address, int index); -private: /** * Loads the kernel function names. * @@ -218,6 +217,7 @@ private: */ 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 22c93c1de00..8f5cfbba650 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -217,6 +217,7 @@ Common::Error SciEngine::run() { } script_adjust_opcode_formats(_gamestate); + _kernel->loadKernelNames(); SciVersion soundVersion = _features->detectDoSoundType();