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

SCI: Rename Script class members, change Script from struct to class

Browse source 
svn-id: r44126
This commit is contained in:
Max Horn 2009-09-16 23:32:27 +00:00
parent 1b75a1825e
commit a277123f54
13 changed files with 291 additions and 289 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -117,8 +117,8 @@ reg_t disassemble(EngineState *s, reg_t pos, int print_bw_tag, int print_bytecod
} else
script_entity = (Script *)mobj;
scr = script_entity->buf;
scr_size = script_entity->buf_size;
scr = script_entity->_buf;
scr_size = script_entity->_bufSize;
if (pos.offset >= scr_size) {
warning("Trying to disassemble beyond end of script");
@ -350,7 +350,7 @@ void script_debug(EngineState *s, bool bp) {
disassemble(s, scriptState.xs->addr.pc, 0, 1);
if (scriptState.seeking == kDebugSeekGlobal)
printf("Global %d (0x%x) = %04x:%04x\n", scriptState.seekSpecial,
scriptState.seekSpecial, PRINT_REG(s->script_000->locals_block->_locals[scriptState.seekSpecial]));
scriptState.seekSpecial, PRINT_REG(s->script_000->_localsBlock->_locals[scriptState.seekSpecial]));
}
#endif
@ -364,8 +364,8 @@ void script_debug(EngineState *s, bool bp) {
if (mobj) {
Script *scr = (Script *)mobj;
byte *code_buf = scr->buf;
int code_buf_size = scr->buf_size;
byte *code_buf = scr->_buf;
int code_buf_size = scr->_bufSize;
int opcode = scriptState.xs->addr.pc.offset >= code_buf_size ? 0 : code_buf[scriptState.xs->addr.pc.offset];
int op = opcode >> 1;
int paramb1 = scriptState.xs->addr.pc.offset + 1 >= code_buf_size ? 0 : code_buf[scriptState.xs->addr.pc.offset + 1];