diff options
| author | Filippos Karapetis | 2010-06-07 15:14:58 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-06-07 15:14:58 +0000 |
| commit | 2c950b321c3354144debd6a7f5e7d19cbc6c3a32 (patch) | |
| tree | 4ff4be4b02d46b465f82afa022699d0bb3afc191 /engines/sci/engine/scriptdebug.cpp | |
| parent | 356728dab7f2c4cedf73684d7fe3b968be7396fd (diff) | |
| download | scummvm-rg350-2c950b321c3354144debd6a7f5e7d19cbc6c3a32.tar.gz scummvm-rg350-2c950b321c3354144debd6a7f5e7d19cbc6c3a32.tar.bz2 scummvm-rg350-2c950b321c3354144debd6a7f5e7d19cbc6c3a32.zip | |
Fixed regression from commit #49465 - there are in fact two restAdjust variables, the current and global one
svn-id: r49486
Diffstat (limited to 'engines/sci/engine/scriptdebug.cpp')
| -rw-r--r-- | engines/sci/engine/scriptdebug.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp index 159c278e8c..b465ab3d4e 100644 --- a/engines/sci/engine/scriptdebug.cpp +++ b/engines/sci/engine/scriptdebug.cpp @@ -205,12 +205,12 @@ reg_t disassemble(EngineState *s, reg_t pos, int print_bw_tag, int print_bytecod if (pos == s->xs->addr.pc) { // Extra information if debugging the current opcode if (opcode == op_callk) { - int stackframe = (scr[pos.offset + 2] >> 1) + (s->restAdjust); + int stackframe = (scr[pos.offset + 2] >> 1) + (s->restAdjustCur); int argc = ((s->xs->sp)[- stackframe - 1]).offset; bool oldScriptHeader = (getSciVersion() == SCI_VERSION_0_EARLY); if (!oldScriptHeader) - argc += (s->restAdjust); + argc += (s->restAdjustCur); printf(" Kernel params: ("); @@ -221,7 +221,7 @@ reg_t disassemble(EngineState *s, reg_t pos, int print_bw_tag, int print_bytecod } printf(")\n"); } else if ((opcode == op_send) || (opcode == op_self)) { - int restmod = s->restAdjust; + int restmod = s->restAdjustCur; int stackframe = (scr[pos.offset + 1] >> 1) + restmod; reg_t *sb = s->xs->sp; uint16 selector; |