aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/console.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2011-01-07 20:24:49 +0000
committerFilippos Karapetis2011-01-07 20:24:49 +0000
commit2b87eebdb0da3b2f0c47220854cb81d28e271a38 (patch)
tree415e74cac15e47ede610ed40e71f43b1efac2643 /engines/sci/console.cpp
parent59d00fca17455ee3548d8f7ea1919142e1ec8e2e (diff)
downloadscummvm-rg350-2b87eebdb0da3b2f0c47220854cb81d28e271a38.tar.gz
scummvm-rg350-2b87eebdb0da3b2f0c47220854cb81d28e271a38.tar.bz2
scummvm-rg350-2b87eebdb0da3b2f0c47220854cb81d28e271a38.zip
SCI: Moved the handling of the op_line debug opcode inside readPMachineInstruction()
The handling has been moved inside readPMachineInstruction(), instead of run_vm(), as a lot of parts of the code depend on this function handling all opcodes correctly (e.g. the script dissassembler, the features class, find_callk etc) svn-id: r55154
Diffstat (limited to 'engines/sci/console.cpp')
-rw-r--r--engines/sci/console.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index c515d45a1a..7896a55dac 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -2771,16 +2771,6 @@ void Console::printKernelCallsFound(int kernelFuncNum, bool showFoundScripts) {
uint16 curJmpOffset = offset + (uint16)opparams[0];
if (curJmpOffset > maxJmpOffset)
maxJmpOffset = curJmpOffset;
- // FIXME: There seems to be a bug in the way we handle the SCI2 debug opcode
- // (i.e. 0x7e/0x3f), which is probably why the bugs below occur
- if (maxJmpOffset >= script->getBufSize()) {
- warning("Called from script %d, object %s, method %s(%d) with %d parameters",
- itr->getNumber(), objName,
- _engine->getKernel()->getSelectorName(obj->getFuncSelector(i)).c_str(), i, 0);
- warning("Script %d has a jump to an invalid offset (%d, script size is %d) - adjusting",
- script->getScriptNumber(), maxJmpOffset, script->getBufSize());
- maxJmpOffset = script->getBufSize() - 1;
- }
}
// Check for end of function/script