From a103d1f2ec9ce471928eabccebdaf90d8e740589 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Mon, 23 May 2005 03:33:08 +0000 Subject: Move wizImage functions to Wiz class. svn-id: r18226 --- scumm/script_v72he.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'scumm/script_v72he.cpp') diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp index 1a33969bb3..d4929821c2 100644 --- a/scumm/script_v72he.cpp +++ b/scumm/script_v72he.cpp @@ -657,7 +657,7 @@ void ScummEngine_v72he::decodeScriptString(byte *dst, bool scriptString) { *dst = 0; } -byte *ScummEngine_v72he::heFindResourceData(uint32 tag, byte *ptr) { +byte *ScummEngine_v70he::heFindResourceData(uint32 tag, byte *ptr) { ptr = heFindResource(tag, ptr); if (ptr == NULL) @@ -665,7 +665,7 @@ byte *ScummEngine_v72he::heFindResourceData(uint32 tag, byte *ptr) { return ptr + _resourceHeaderSize; } -byte *ScummEngine_v72he::heFindResource(uint32 tag, byte *searchin) { +byte *ScummEngine_v70he::heFindResource(uint32 tag, byte *searchin) { uint32 curpos, totalsize, size; debugC(DEBUG_RESOURCE, "heFindResource(%s, %lx)", tag2str(tag), searchin); @@ -694,7 +694,7 @@ byte *ScummEngine_v72he::heFindResource(uint32 tag, byte *searchin) { return NULL; } -byte *ScummEngine_v72he::findWrappedBlock(uint32 tag, byte *ptr, int state, bool errorFlag) { +byte *ScummEngine_v70he::findWrappedBlock(uint32 tag, byte *ptr, int state, bool errorFlag) { if (READ_UINT32(ptr) == MKID('MULT')) { byte *offs, *wrap; uint32 size; @@ -859,7 +859,7 @@ void ScummEngine_v72he::o72_captureWizImage() { grab.right = pop() + 1; grab.top = pop(); grab.left = pop(); - captureWizImage(pop(), grab, false, true); + _wiz->captureWizImage(pop(), grab, false, true); } void ScummEngine_v72he::o72_getTimer() { @@ -963,7 +963,7 @@ void ScummEngine_v72he::o72_printWizImage() { wi.x1 = wi.y1 = 0; wi.state = 0; wi.flags = kWIFPrint; - displayWizImage(&wi); + _wiz->displayWizImage(&wi); } void ScummEngine_v72he::o72_getArrayDimSize() { @@ -1690,7 +1690,7 @@ void ScummEngine_v72he::o72_drawWizImage() { wi.x1 = pop(); wi.resNum = pop(); wi.state = 0; - displayWizImage(&wi); + _wiz->displayWizImage(&wi); } void ScummEngine_v72he::o72_debugInput() { -- cgit v1.2.3