diff options
| author | Max Horn | 2009-02-21 04:10:21 +0000 |
|---|---|---|
| committer | Max Horn | 2009-02-21 04:10:21 +0000 |
| commit | bcb1a71052948d61474076615d6641f7b2153599 (patch) | |
| tree | 8ec447dfc037b218029a9ee605e3b8047b01eb7d /engines/sci/engine | |
| parent | ecaab0fe944811b44ae1ecf1157264623bda2b1f (diff) | |
| download | scummvm-rg350-bcb1a71052948d61474076615d6641f7b2153599.tar.gz scummvm-rg350-bcb1a71052948d61474076615d6641f7b2153599.tar.bz2 scummvm-rg350-bcb1a71052948d61474076615d6641f7b2153599.zip | |
SCI: Fixed more warnings
svn-id: r38658
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/scriptdebug.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/engine/vm.cpp | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp index af072e2451..d3cd82a22f 100644 --- a/engines/sci/engine/scriptdebug.cpp +++ b/engines/sci/engine/scriptdebug.cpp @@ -2166,7 +2166,8 @@ static int c_send(state_t *s) { reg_t object = cmd_params[0].reg; char *selector_name = cmd_params[1].str; stack_ptr_t stackframe = s->execution_stack->sp; - unsigned int i, selector_id, selector_type; + int selector_id; + unsigned int i, selector_type; exec_stack_t *xstack; object_t *o; reg_t *vptr; @@ -2877,7 +2878,6 @@ static int c_gc_list_reachable(state_t *s) { void script_debug(state_t *s, reg_t *pc, stack_ptr_t *sp, stack_ptr_t *pp, reg_t *objp, int *restadjust, seg_id_t *segids, reg_t **variables, reg_t **variables_base, int *variables_nr, int bp) { - static int last_step; // Do we support a separate console? if (sci_debug_flags & _DEBUG_FLAG_LOGGING) { diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index 12fa5b19d8..d272f68e66 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -1084,7 +1084,7 @@ void run_vm(state_t *s, int restoring) { case 0x24: // ret do { - stack_ptr_t old_sp = xs->sp; + stack_ptr_t old_sp2 = xs->sp; stack_ptr_t old_fp = xs->fp; exec_stack_t *old_xs = s->execution_stack + s->execution_stack_pos; @@ -1114,7 +1114,7 @@ void run_vm(state_t *s, int restoring) { if (xs->sp == CALL_SP_CARRY // Used in sends to 'carry' the stack pointer || xs->type != EXEC_STACK_TYPE_CALL) { - xs->sp = old_sp; + xs->sp = old_sp2; xs->fp = old_fp; } @@ -1765,9 +1765,6 @@ int script_instantiate_sci0(state_t *s, int script_nr) { if (s->version < SCI_VERSION_FTU_NEW_SCRIPT_HEADER) { // - int locals_size = getUInt16(script->data)*2; - int locals = (locals_size)? script->size : 0; - int locals_nr = getUInt16(script->data); // Old script block |