diff options
| author | Max Horn | 2010-02-03 01:33:23 +0000 |
|---|---|---|
| committer | Max Horn | 2010-02-03 01:33:23 +0000 |
| commit | 4ecaf4d4aca61000db542c19a717f6b9530b8ee7 (patch) | |
| tree | feed434a0414fe0edd7c6a687798920825f8bc69 | |
| parent | bb5e34a014c0ae868de86fcea484bc9671ce18b9 (diff) | |
| download | scummvm-rg350-4ecaf4d4aca61000db542c19a717f6b9530b8ee7.tar.gz scummvm-rg350-4ecaf4d4aca61000db542c19a717f6b9530b8ee7.tar.bz2 scummvm-rg350-4ecaf4d4aca61000db542c19a717f6b9530b8ee7.zip | |
SCI: restoring param of run_vm is a bool, not an int
svn-id: r47834
| -rw-r--r-- | engines/sci/engine/selector.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/vm.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/engine/vm.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/engine/selector.cpp b/engines/sci/engine/selector.cpp index 720c7546d8..8e3f57e547 100644 --- a/engines/sci/engine/selector.cpp +++ b/engines/sci/engine/selector.cpp @@ -230,7 +230,7 @@ int invoke_selector_argv(EngineState *s, reg_t object, int selector_id, Selector xstack->sp += argc + 2; xstack->fp += argc + 2; - run_vm(s, 0); // Start a new vm + run_vm(s, false); // Start a new vm return 0; } diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index d26405069b..111e17d0eb 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -529,7 +529,7 @@ static void gc_countdown(EngineState *s) { static const byte _fake_return_buffer[2] = {op_ret << 1, op_ret << 1}; -void run_vm(EngineState *s, int restoring) { +void run_vm(EngineState *s, bool restoring) { assert(s); #ifndef DISABLE_VALIDATIONS @@ -1613,7 +1613,7 @@ static EngineState *_game_run(EngineState *&s) { do { s->_executionStackPosChanged = false; - run_vm(s, successor ? 1 : 0); + run_vm(s, successor ? true : false); if (s->restarting_flags & SCI_GAME_IS_RESTARTING_NOW) { // Restart was requested? successor = NULL; s->_executionStack.clear(); diff --git a/engines/sci/engine/vm.h b/engines/sci/engine/vm.h index cb9e5782c0..1808a9880c 100644 --- a/engines/sci/engine/vm.h +++ b/engines/sci/engine/vm.h @@ -395,9 +395,9 @@ ExecStack *add_exec_stack_varselector(EngineState *s, reg_t objp, int argc, * It executes the code on s->heap[pc] until it hits a 'ret' operation * while (stack_base == stack_pos). Requires s to be set up correctly. * @param[in] s The state to use - * @param[in] restoring 1 if s has just been restored, 0 otherwise + * @param[in] restoring true if s has just been restored, false otherwise */ -void run_vm(EngineState *s, int restoring); +void run_vm(EngineState *s, bool restoring); /** * Debugger functionality |