From 90e3fa96a33b9ba78130c5a319611e12827f088b Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 27 Nov 2004 13:13:41 +0000 Subject: Make Array stuff part of the V6 engine class (note: it's a bit confusing to have two different ArrayHeader structs, maybe we should rename them?) svn-id: r15909 --- scumm/script_v6.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scumm/script_v6.cpp') diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index ce178fb8a4..dc99117e24 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -397,7 +397,7 @@ int ScummEngine_v6::popRoomAndObj(int *room) { return obj; } -ArrayHeader *ScummEngine_v6::defineArray(int array, int type, int dim2, int dim1) { +ScummEngine_v6::ArrayHeader *ScummEngine_v6::defineArray(int array, int type, int dim2, int dim1) { if (_heversion >= 72) error("Call to old defineArray"); @@ -487,7 +487,7 @@ int ScummEngine_v6::findFreeArrayId() { #define SWAP16(x) x = SWAP_BYTES_16(x) -ArrayHeader *ScummEngine_v6::getArray(int array) { +ScummEngine_v6::ArrayHeader *ScummEngine_v6::getArray(int array) { ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, readVar(array)); if (!ah) return 0; -- cgit v1.2.3