aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2016-04-01 23:55:09 +0200
committerWillem Jan Palenstijn2016-07-02 21:25:53 +0200
commit7f12638763e9732bc75aab4823c43ebdf8a8c2be (patch)
tree0c2b04b8c7191bca3f5ecfc44fde28255250a7b2
parent08f1727b0813c9e20a2462402f58c4578c5902c8 (diff)
downloadscummvm-rg350-7f12638763e9732bc75aab4823c43ebdf8a8c2be.tar.gz
scummvm-rg350-7f12638763e9732bc75aab4823c43ebdf8a8c2be.tar.bz2
scummvm-rg350-7f12638763e9732bc75aab4823c43ebdf8a8c2be.zip
SCI: Remove unclear &rest handling
Modifying a value above the stack pointer doesn't seem to make much sense. This was added in FreeSCI back in 2002 in a pair of commits that did not make clear what the purpose of this was. My guess is that it attempted to adjust argc, but failed. This wouldn't have been noticed since argc was always set correctly by make_exec_stack_entry (which is now the ExecStack constructor).
-rw-r--r--engines/sci/engine/vm.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index 7e708efc8b..273492ccc6 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -834,7 +834,6 @@ void run_vm(EngineState *s) {
int argc = (opparams[1] >> 1) // Given as offset, but we need count
+ 1 + s->r_rest;
StackPtr call_base = s->xs->sp - argc;
- s->xs->sp[1].incOffset(s->r_rest);
uint32 localCallOffset = s->xs->addr.pc.getOffset() + opparams[0];