diff options
author | Martin Kiewitz | 2010-07-09 21:10:14 +0000 |
---|---|---|
committer | Martin Kiewitz | 2010-07-09 21:10:14 +0000 |
commit | d27e4a475bde10c00e7f7f67ce7f4e14cc634db2 (patch) | |
tree | 445fa7e0fae1f83c64d901069cf59c544bf52b37 /engines/sci/engine/vm.cpp | |
parent | 3fe205ba7f376bcc7f4f87226b61918acb9ce925 (diff) | |
download | scummvm-rg350-d27e4a475bde10c00e7f7f67ce7f4e14cc634db2.tar.gz scummvm-rg350-d27e4a475bde10c00e7f7f67ce7f4e14cc634db2.tar.bz2 scummvm-rg350-d27e4a475bde10c00e7f7f67ce7f4e14cc634db2.zip |
SCI: removing origName from KernelFunction struct, adding debugCalls boolean for later use
svn-id: r50769
Diffstat (limited to 'engines/sci/engine/vm.cpp')
-rw-r--r-- | engines/sci/engine/vm.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index a0f38c634c..e8a28780fb 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -798,7 +798,7 @@ static void callKernelFunc(EngineState *s, int kernelFuncNr, int argc) { workaround = trackOriginAndFindWorkaround(0, kernelCall.workarounds, workaroundFound, &originReply); if (!workaroundFound) { kernel->signatureDebug(kernelCall.signature, argc, argv); - error("[VM] k%s (%x) signature mismatch via method %s::%s (script %d, localCall %x)", kernel->getKernelName(kernelFuncNr).c_str(), kernelFuncNr, originReply.objectName.c_str(), originReply.methodName.c_str(), originReply.scriptNr, originReply.localCallOffset); + error("[VM] k%s (%x) signature mismatch via method %s::%s (script %d, localCall %x)", kernelCall.name, kernelFuncNr, originReply.objectName.c_str(), originReply.methodName.c_str(), originReply.scriptNr, originReply.localCallOffset); } // FIXME: implement some real workaround type logic - ignore call, still do call etc. if (workaround.segment) @@ -827,7 +827,7 @@ static void callKernelFunc(EngineState *s, int kernelFuncNr, int argc) { argc--; argv++; if (subId >= kernelCall.subFunctionCount) - error("[VM] k%s: subfunction-id %d requested, but not available", kernelCall.origName, subId); + error("[VM] k%s: subfunction-id %d requested, but not available", kernelCall.name, subId); const KernelSubFunction &kernelSubCall = kernelCall.subFunctions[subId]; if (!kernel->signatureMatch(kernelSubCall.signature, argc, argv)) { // Signature mismatch @@ -857,7 +857,7 @@ static void callKernelFunc(EngineState *s, int kernelFuncNr, int argc) { if (s->_executionStack.begin() != s->_executionStack.end()) s->_executionStack.pop_back(); } else { - Common::String warningMsg = "Dummy function " + kernelCall.origName + + Common::String warningMsg = "Dummy function " + kernel->getKernelName(kernelFuncNr) + Common::String::printf("[0x%x]", kernelFuncNr) + " invoked - ignoring. Params: " + Common::String::printf("%d", argc) + " ("; @@ -871,7 +871,7 @@ static void callKernelFunc(EngineState *s, int kernelFuncNr, int argc) { // Make sure that the game doesn't call a function that is considered unused. If // that happens, error out. - if (kernelCall.origName == "Dummy") + if (kernel->getKernelName(kernelFuncNr) == "Dummy") error("Kernel function %d was called, which was considered to be unused", kernelFuncNr); } } |