aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2004-08-05 11:03:22 +0000
committerTravis Howell2004-08-05 11:03:22 +0000
commitb154e524a9b8e862dbf34e868264ab8d11f21066 (patch)
treecf65ad4e394100ac931ca8d362a10c64446c818b
parentb569d58b6ee79d41e9135dd7d3763d4514e7954e (diff)
downloadscummvm-rg350-b154e524a9b8e862dbf34e868264ab8d11f21066.tar.gz
scummvm-rg350-b154e524a9b8e862dbf34e868264ab8d11f21066.tar.bz2
scummvm-rg350-b154e524a9b8e862dbf34e868264ab8d11f21066.zip
Correction from disasm.
svn-id: r14468
-rw-r--r--scumm/script.cpp4
-rw-r--r--scumm/script_v6he.cpp2
2 files changed, 2 insertions, 4 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp
index e81797165d..7aea832dfe 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -355,9 +355,7 @@ void ScummEngine::nukeArrays(int script) {
return;
for (i = 1; i < _numArray; i++) {
- // HACK: for some reason original has script number greater by one
- // maybe it got increased somewhere else
- if (_arraySlot[i] == script + 1) {
+ if (_arraySlot[i] == script) {
nukeResource(rtString, i);
_arraySlot[i] = 0;
}
diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp
index ca81970d47..1bbd189ec8 100644
--- a/scumm/script_v6he.cpp
+++ b/scumm/script_v6he.cpp
@@ -1127,7 +1127,7 @@ void ScummEngine_v6he::o6_localizeArray() {
int slot = pop();
if (slot < _numArray) {
- _arraySlot[slot] = vm.slot[_currentScript].number;
+ _arraySlot[slot] = _currentScript;
} else {
warning("o6_localizeArray(%d): array slot out of range", slot);
}