aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v72he.cpp
diff options
context:
space:
mode:
authorTravis Howell2005-10-15 00:46:08 +0000
committerTravis Howell2005-10-15 00:46:08 +0000
commitb6425d1cf8990873e5fb05741833722492322d71 (patch)
treedaa9d1e16cf829a8b953dd12a0b53998d65e3f81 /scumm/script_v72he.cpp
parent842f520af1b6a268e7d7e2b8683debab0a8f7258 (diff)
downloadscummvm-rg350-b6425d1cf8990873e5fb05741833722492322d71.tar.gz
scummvm-rg350-b6425d1cf8990873e5fb05741833722492322d71.tar.bz2
scummvm-rg350-b6425d1cf8990873e5fb05741833722492322d71.zip
Fix regression, resID shouldn't beint16.
Slight correction to copyArrayHelper. svn-id: r19089
Diffstat (limited to 'scumm/script_v72he.cpp')
-rw-r--r--scumm/script_v72he.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index fbb022ae68..4859fc776b 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -1859,7 +1859,7 @@ void ScummEngine_v72he::writeFileFromArray(int slot, int resID) {
}
void ScummEngine_v72he::o72_writeFile() {
- int16 resID = pop();
+ int resID = pop();
int slot = pop();
byte subOp = fetchScriptByte();
@@ -2126,12 +2126,12 @@ void ScummEngine_v72he::copyArrayHelper(ArrayHeader *ah, int idx2, int idx1, int
*data = ah->data + offset;
break;
case kIntArray:
- *num = (len1 - idx1) * 2;
+ *num = (len1 - idx1) * 2 + 2;
*size = pitch * 2;
*data = ah->data + offset * 2;
break;
case kDwordArray:
- *num = (len1 - idx1) * 4;
+ *num = (len1 - idx1) * 4 + 4;
*size = pitch * 4;
*data = ah->data + offset * 4;
break;