aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2012-05-31 18:53:47 +1000
committerTravis Howell2012-05-31 19:01:07 +1000
commitdfa5405db8c33f91936d022954175799ea54658d (patch)
tree679622cbf1e359e0c3b654e4f8a4141ccc2a14c4
parent6691424397bd9db6e022e64ca0b5c91e24d8d35d (diff)
downloadscummvm-rg350-dfa5405db8c33f91936d022954175799ea54658d.tar.gz
scummvm-rg350-dfa5405db8c33f91936d022954175799ea54658d.tar.bz2
scummvm-rg350-dfa5405db8c33f91936d022954175799ea54658d.zip
SCUMM: Change the nest.number default to zero in stopScript and stopObjectScript too.
-rw-r--r--engines/scumm/script.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index a26c64e690..d8c4948ea8 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -250,7 +250,7 @@ void ScummEngine::stopScript(int script) {
if (vm.nest[i].number == script &&
(vm.nest[i].where == WIO_GLOBAL || vm.nest[i].where == WIO_LOCAL)) {
nukeArrays(vm.nest[i].slot);
- vm.nest[i].number = 0xFF;
+ vm.nest[i].number = 0;
vm.nest[i].slot = 0xFF;
vm.nest[i].where = 0xFF;
}
@@ -284,7 +284,7 @@ void ScummEngine::stopObjectScript(int script) {
if (vm.nest[i].number == script &&
(vm.nest[i].where == WIO_ROOM || vm.nest[i].where == WIO_INVENTORY || vm.nest[i].where == WIO_FLOBJECT)) {
nukeArrays(vm.nest[i].slot);
- vm.nest[i].number = 0xFF;
+ vm.nest[i].number = 0;
vm.nest[i].slot = 0xFF;
vm.nest[i].where = 0xFF;
}