aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2010-06-09 15:21:10 +0000
committerFilippos Karapetis2010-06-09 15:21:10 +0000
commit3c9ab81a0764298baf1b604914a7c2e3f33f6b1a (patch)
tree9d103ad322196cd39b40860e5782a20f59fadce2 /engines
parent32d7f7ddb09c908104dc83217aa08f6083189d17 (diff)
downloadscummvm-rg350-3c9ab81a0764298baf1b604914a7c2e3f33f6b1a.tar.gz
scummvm-rg350-3c9ab81a0764298baf1b604914a7c2e3f33f6b1a.tar.bz2
scummvm-rg350-3c9ab81a0764298baf1b604914a7c2e3f33f6b1a.zip
Fixed regression from commit #49537
svn-id: r49543
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/engine/kernel.cpp1
-rw-r--r--engines/sci/engine/kernel.h2
-rw-r--r--engines/sci/sci.cpp1
3 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 995ecc72a4..4d0e981f31 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 b79ba8caaa..2f1c867474 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 22c93c1de0..8f5cfbba65 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();