aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/vm.cpp
diff options
context:
space:
mode:
authorMartin Kiewitz2010-07-08 21:22:59 +0000
committerMartin Kiewitz2010-07-08 21:22:59 +0000
commit7e05d6e62bd8e887ccea2302ad191a775150ccf8 (patch)
treeb6e4bfe8df724627be9676b04bb6881021f359c4 /engines/sci/engine/vm.cpp
parent07fef4c6e6a385732c508fb8129b70dcc4a43571 (diff)
downloadscummvm-rg350-7e05d6e62bd8e887ccea2302ad191a775150ccf8.tar.gz
scummvm-rg350-7e05d6e62bd8e887ccea2302ad191a775150ccf8.tar.bz2
scummvm-rg350-7e05d6e62bd8e887ccea2302ad191a775150ccf8.zip
SCI: part of subfunction signature&mapping implemented, little cleanup
svn-id: r50750
Diffstat (limited to 'engines/sci/engine/vm.cpp')
-rw-r--r--engines/sci/engine/vm.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index b1e6eead0e..6973694ea9 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -786,7 +786,7 @@ static void callKernelFunc(EngineState *s, int kernelFuncNr, int argc) {
if (kernelFuncNr >= (int)kernel->_kernelFuncs.size())
error("Invalid kernel function 0x%x requested", kernelFuncNr);
- const KernelFuncWithSignature &kernelCall = kernel->_kernelFuncs[kernelFuncNr];
+ const KernelFunction &kernelCall = kernel->_kernelFuncs[kernelFuncNr];
if (kernelCall.signature
&& !kernel->signatureMatch(kernelCall.signature, argc, s->xs->sp + 1)) {
@@ -817,7 +817,7 @@ static void callKernelFunc(EngineState *s, int kernelFuncNr, int argc) {
xstack->type = EXEC_STACK_TYPE_KERNEL;
// Call kernel function
- s->r_acc = kernelCall.func(s, argc, argv);
+ s->r_acc = kernelCall.function(s, argc, argv);
#if 0
// Used for debugging