aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/he/script_v60he.cpp
diff options
context:
space:
mode:
authorMax Horn2006-10-20 19:44:27 +0000
committerMax Horn2006-10-20 19:44:27 +0000
commit5e9041b1b558f8891435204b15e1db41f0686ad9 (patch)
tree1afbae9cf1e596e046e54fd1c29942d5860dc8dd /engines/scumm/he/script_v60he.cpp
parentff574a63ee368cdb4889dd0e17966b4a1ae1f117 (diff)
downloadscummvm-rg350-5e9041b1b558f8891435204b15e1db41f0686ad9.tar.gz
scummvm-rg350-5e9041b1b558f8891435204b15e1db41f0686ad9.tar.bz2
scummvm-rg350-5e9041b1b558f8891435204b15e1db41f0686ad9.zip
SCUMM: ArrayHeader related cleanup
svn-id: r24395
Diffstat (limited to 'engines/scumm/he/script_v60he.cpp')
-rw-r--r--engines/scumm/he/script_v60he.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp
index 7610f9df01..6165f42495 100644
--- a/engines/scumm/he/script_v60he.cpp
+++ b/engines/scumm/he/script_v60he.cpp
@@ -856,7 +856,7 @@ uint8 virtScreenLoadUnpack(vsUnpackCtx *ctx, byte *data) {
void ScummEngine_v60he::o60_kernelGetFunctions() {
int args[29];
- ArrayHeader *ah;
+ byte *data;
getStackList(args, ARRAYSIZE(args));
switch (args[0]) {
@@ -864,8 +864,8 @@ void ScummEngine_v60he::o60_kernelGetFunctions() {
// Used to store images when decorating cake in
// Fatty Bear's Birthday Surprise
writeVar(0, 0);
- ah = defineArray(0, kByteArray, 0, virtScreenSave(0, args[1], args[2], args[3], args[4]));
- virtScreenSave(ah->data, args[1], args[2], args[3], args[4]);
+ data = defineArray(0, kByteArray, 0, virtScreenSave(0, args[1], args[2], args[3], args[4]));
+ virtScreenSave(data, args[1], args[2], args[3], args[4]);
push(readVar(0));
break;
default:
@@ -1078,8 +1078,8 @@ int ScummEngine_v60he::readFileToArray(int slot, int32 size) {
size = _hInFileTable[slot]->size() - _hInFileTable[slot]->pos();
writeVar(0, 0);
- ArrayHeader *ah = defineArray(0, kByteArray, 0, size);
- _hInFileTable[slot]->read(ah->data, size);
+ byte *data = defineArray(0, kByteArray, 0, size);
+ _hInFileTable[slot]->read(data, size);
return readVar(0);
}