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

Fixed regression in the script parser from commit 42260

Browse source 
svn-id: r42371
This commit is contained in:
Filippos Karapetis 2009-07-11 06:19:29 +00:00
parent 2c96ca84f3
commit 763c6c8ca1
4 changed files with 49 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -235,11 +235,11 @@ reg_t disassemble(EngineState *s, reg_t pos, int print_bw_tag, int print_bytecod
if (pos == scriptState.xs->addr.pc) { // Extra information if debugging the current opcode
if (opcode == op_callk) {
int stackframe = (scr[pos.offset + 2] >> 1) + (scriptState.restadjust);
int stackframe = (scr[pos.offset + 2] >> 1) + (scriptState.restAdjust);
int argc = ((scriptState.xs->sp)[- stackframe - 1]).offset;
if (!s->_kernel->hasOldScriptHeader())
argc += (scriptState.restadjust);
argc += (scriptState.restAdjust);
printf(" Kernel params: (");
@ -250,7 +250,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 = scriptState.restadjust;
int restmod = scriptState.restAdjust;
int stackframe = (scr[pos.offset + 1] >> 1) + restmod;
reg_t *sb = scriptState.xs->sp;
uint16 selector;