thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed regression from commit #49465 - there are in fact two restAdjust variables, the current and global one

Browse source 
svn-id: r49486
This commit is contained in:
Filippos Karapetis 2010-06-07 15:14:58 +00:00
parent 356728dab7
commit 2c950b321c
4 changed files with 34 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/sci/engine/scriptdebug.cpp
View file

@ -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;