Moved engines to the new engines/ directory

svn-id: r20582

1 files changed, 0 insertions, 2636 deletions

diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp
deleted file mode 100644
index 0536506534..0000000000
--- a/scumm/script_v90he.cpp
+++ /dev/null
@@ -1,2636 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001  Ludvig Strigeus
- * Copyright (C) 2001-2006 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "common/stdafx.h"
-
-#include "scumm/actor.h"
-#include "scumm/charset.h"
-#include "scumm/intern_he.h"
-#include "scumm/logic_he.h"
-#include "scumm/object.h"
-#include "scumm/resource.h"
-#include "scumm/resource_v7he.h"
-#include "scumm/scumm.h"
-#include "scumm/sound.h"
-#include "scumm/sprite_he.h"
-#include "scumm/util.h"
-
-namespace Scumm {
-
-#define OPCODE(x)	_OPCODE(ScummEngine_v90he, x)
-
-void ScummEngine_v90he::setupOpcodes() {
-	static const OpcodeEntryV90he opcodes[256] = {
-		/* 00 */
-		OPCODE(o6_pushByte),
-		OPCODE(o6_pushWord),
-		OPCODE(o72_pushDWord),
-		OPCODE(o6_pushWordVar),
-		/* 04 */
-		OPCODE(o72_getScriptString),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		OPCODE(o6_wordArrayRead),
-		/* 08 */
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		OPCODE(o90_dup_n),
-		OPCODE(o6_wordArrayIndexedRead),
-		/* 0C */
-		OPCODE(o6_dup),
-		OPCODE(o6_not),
-		OPCODE(o6_eq),
-		OPCODE(o6_neq),
-		/* 10 */
-		OPCODE(o6_gt),
-		OPCODE(o6_lt),
-		OPCODE(o6_le),
-		OPCODE(o6_ge),
-		/* 14 */
-		OPCODE(o6_add),
-		OPCODE(o6_sub),
-		OPCODE(o6_mul),
-		OPCODE(o6_div),
-		/* 18 */
-		OPCODE(o6_land),
-		OPCODE(o6_lor),
-		OPCODE(o6_pop),
-		OPCODE(o72_isAnyOf),
-		/* 1C */
-		OPCODE(o90_wizImageOps),
-		OPCODE(o90_min),
-		OPCODE(o90_max),
-		OPCODE(o90_sin),
-		/* 20 */
-		OPCODE(o90_cos),
-		OPCODE(o90_sqrt),
-		OPCODE(o90_atan2),
-		OPCODE(o90_getSegmentAngle),
-		/* 24 */
-		OPCODE(o90_getDistanceBetweenPoints),
-		OPCODE(o90_getSpriteInfo),
-		OPCODE(o90_setSpriteInfo),
-		OPCODE(o90_getSpriteGroupInfo),
-		/* 28 */
-		OPCODE(o90_setSpriteGroupInfo),
-		OPCODE(o90_getWizData),
-		OPCODE(o90_getActorData),
-		OPCODE(o90_startScriptUnk),
-		/* 2C */
-		OPCODE(o90_jumpToScriptUnk),
-		OPCODE(o90_videoOps),
-		OPCODE(o90_getVideoData),
-		OPCODE(o90_floodFill),
-		/* 30 */
-		OPCODE(o90_mod),
-		OPCODE(o90_shl),
-		OPCODE(o90_shr),
-		OPCODE(o90_xor),
-		/* 34 */
-		OPCODE(o90_findAllObjectsWithClassOf),
-		OPCODE(o90_getPolygonOverlap),
-		OPCODE(o90_cond),
-		OPCODE(o90_dim2dim2Array),
-		/* 38 */
-		OPCODE(o90_redim2dimArray),
-		OPCODE(o90_getLinesIntersectionPoint),
-		OPCODE(o90_sortArray),
-		OPCODE(o6_invalid),
-		/* 3C */
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		/* 40 */
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		OPCODE(o6_writeWordVar),
-		/* 44 */
-		OPCODE(o90_getObjectData),
-		OPCODE(o80_createSound),
-		OPCODE(o80_getFileSize),
-		OPCODE(o6_wordArrayWrite),
-		/* 48 */
-		OPCODE(o80_stringToInt),
-		OPCODE(o80_getSoundVar),
-		OPCODE(o80_localizeArrayToRoom),
-		OPCODE(o6_wordArrayIndexedWrite),
-		/* 4C */
-		OPCODE(o80_sourceDebug),
-		OPCODE(o80_readConfigFile),
-		OPCODE(o80_writeConfigFile),
-		OPCODE(o6_wordVarInc),
-		/* 50 */
-		OPCODE(o72_resetCutscene),
-		OPCODE(o6_invalid),
-		OPCODE(o72_findObjectWithClassOf),
-		OPCODE(o6_wordArrayInc),
-		/* 54 */
-		OPCODE(o72_getObjectImageX),
-		OPCODE(o72_getObjectImageY),
-		OPCODE(o72_captureWizImage),
-		OPCODE(o6_wordVarDec),
-		/* 58 */
-		OPCODE(o72_getTimer),
-		OPCODE(o72_setTimer),
-		OPCODE(o72_getSoundPosition),
-		OPCODE(o6_wordArrayDec),
-		/* 5C */
-		OPCODE(o6_if),
-		OPCODE(o6_ifNot),
-		OPCODE(o72_startScript),
-		OPCODE(o6_startScriptQuick),
-		/* 60 */
-		OPCODE(o72_startObject),
-		OPCODE(o72_drawObject),
-		OPCODE(o72_printWizImage),
-		OPCODE(o72_getArrayDimSize),
-		/* 64 */
-		OPCODE(o72_getNumFreeArrays),
-		OPCODE(o6_stopObjectCode),
-		OPCODE(o6_stopObjectCode),
-		OPCODE(o6_endCutscene),
-		/* 68 */
-		OPCODE(o6_cutscene),
-		OPCODE(o6_invalid),
-		OPCODE(o6_freezeUnfreeze),
-		OPCODE(o80_cursorCommand),
-		/* 6C */
-		OPCODE(o6_breakHere),
-		OPCODE(o6_ifClassOfIs),
-		OPCODE(o6_setClass),
-		OPCODE(o6_getState),
-		/* 70 */
-		OPCODE(o80_setState),
-		OPCODE(o6_setOwner),
-		OPCODE(o6_getOwner),
-		OPCODE(o6_jump),
-		/* 74 */
-		OPCODE(o70_startSound),
-		OPCODE(o6_stopSound),
-		OPCODE(o6_invalid),
-		OPCODE(o6_stopObjectScript),
-		/* 78 */
-		OPCODE(o6_panCameraTo),
-		OPCODE(o6_actorFollowCamera),
-		OPCODE(o6_setCameraAt),
-		OPCODE(o6_loadRoom),
-		/* 7C */
-		OPCODE(o6_stopScript),
-		OPCODE(o6_walkActorToObj),
-		OPCODE(o6_walkActorTo),
-		OPCODE(o6_putActorAtXY),
-		/* 80 */
-		OPCODE(o6_putActorAtObject),
-		OPCODE(o6_faceActor),
-		OPCODE(o6_animateActor),
-		OPCODE(o6_doSentence),
-		/* 84 */
-		OPCODE(o70_pickupObject),
-		OPCODE(o6_loadRoomWithEgo),
-		OPCODE(o6_invalid),
-		OPCODE(o6_getRandomNumber),
-		/* 88 */
-		OPCODE(o6_getRandomNumberRange),
-		OPCODE(o6_invalid),
-		OPCODE(o6_getActorMoving),
-		OPCODE(o6_isScriptRunning),
-		/* 8C */
-		OPCODE(o70_getActorRoom),
-		OPCODE(o6_getObjectX),
-		OPCODE(o6_getObjectY),
-		OPCODE(o6_getObjectOldDir),
-		/* 90 */
-		OPCODE(o6_getActorWalkBox),
-		OPCODE(o6_getActorCostume),
-		OPCODE(o6_findInventory),
-		OPCODE(o6_getInventoryCount),
-		/* 94 */
-		OPCODE(o90_getPaletteData),
-		OPCODE(o6_beginOverride),
-		OPCODE(o6_endOverride),
-		OPCODE(o6_setObjectName),
-		/* 98 */
-		OPCODE(o6_isSoundRunning),
-		OPCODE(o6_setBoxFlags),
-		OPCODE(o6_invalid),
-		OPCODE(o70_resourceRoutines),
-		/* 9C */
-		OPCODE(o72_roomOps),
-		OPCODE(o72_actorOps),
-		OPCODE(o90_paletteOps),
-		OPCODE(o6_getActorFromXY),
-		/* A0 */
-		OPCODE(o72_findObject),
-		OPCODE(o6_pseudoRoom),
-		OPCODE(o6_getActorElevation),
-		OPCODE(o6_getVerbEntrypoint),
-		/* A4 */
-		OPCODE(o72_arrayOps),
-		OPCODE(o90_fontUnk),
-		OPCODE(o6_drawBox),
-		OPCODE(o6_pop),
-		/* A8 */
-		OPCODE(o6_getActorWidth),
-		OPCODE(o60_wait),
-		OPCODE(o6_getActorScaleX),
-		OPCODE(o90_getActorAnimProgress),
-		/* AC */
-		OPCODE(o80_drawWizPolygon),
-		OPCODE(o6_isAnyOf),
-		OPCODE(o72_systemOps),
-		OPCODE(o6_isActorInBox),
-		/* B0 */
-		OPCODE(o6_delay),
-		OPCODE(o6_delaySeconds),
-		OPCODE(o6_delayMinutes),
-		OPCODE(o6_stopSentence),
-		/* B4 */
-		OPCODE(o6_printLine),
-		OPCODE(o6_printText),
-		OPCODE(o6_printDebug),
-		OPCODE(o6_printSystem),
-		/* B8 */
-		OPCODE(o6_printActor),
-		OPCODE(o6_printEgo),
-		OPCODE(o72_talkActor),
-		OPCODE(o72_talkEgo),
-		/* BC */
-		OPCODE(o72_dimArray),
-		OPCODE(o6_stopObjectCode),
-		OPCODE(o6_startObjectQuick),
-		OPCODE(o6_startScriptQuick2),
-		/* C0 */
-		OPCODE(o72_dim2dimArray),
-		OPCODE(o72_traceStatus),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		/* C4 */
-		OPCODE(o6_abs),
-		OPCODE(o6_distObjectObject),
-		OPCODE(o6_distObjectPt),
-		OPCODE(o6_distPtPt),
-		/* C8 */
-		OPCODE(o90_kernelGetFunctions),
-		OPCODE(o90_kernelSetFunctions),
-		OPCODE(o6_delayFrames),
-		OPCODE(o6_pickOneOf),
-		/* CC */
-		OPCODE(o6_pickOneOfDefault),
-		OPCODE(o6_stampObject),
-		OPCODE(o72_drawWizImage),
-		OPCODE(o72_debugInput),
-		/* D0 */
-		OPCODE(o6_getDateTime),
-		OPCODE(o6_stopTalking),
-		OPCODE(o6_getAnimateVariable),
-		OPCODE(o6_invalid),
-		/* D4 */
-		OPCODE(o6_shuffle),
-		OPCODE(o72_jumpToScript),
-		OPCODE(o6_band),
-		OPCODE(o6_bor),
-		/* D8 */
-		OPCODE(o6_isRoomScriptRunning),
-		OPCODE(o60_closeFile),
-		OPCODE(o72_openFile),
-		OPCODE(o72_readFile),
-		/* DC */
-		OPCODE(o72_writeFile),
-		OPCODE(o72_findAllObjects),
-		OPCODE(o72_deleteFile),
-		OPCODE(o72_rename),
-		/* E0 */
-		OPCODE(o80_drawLine),
-		OPCODE(o72_getPixel),
-		OPCODE(o60_localizeArrayToScript),
-		OPCODE(o80_pickVarRandom),
-		/* E4 */
-		OPCODE(o6_setBoxSet),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		/* E8 */
-		OPCODE(o6_invalid),
-		OPCODE(o70_seekFilePos),
-		OPCODE(o72_redimArray),
-		OPCODE(o60_readFilePos),
-		/* EC */
-		OPCODE(o70_copyString),
-		OPCODE(o70_getStringWidth),
-		OPCODE(o70_getStringLen),
-		OPCODE(o70_appendString),
-		/* F0 */
-		OPCODE(o70_concatString),
-		OPCODE(o70_compareString),
-		OPCODE(o70_isResourceLoaded),
-		OPCODE(o72_readINI),
-		/* F4 */
-		OPCODE(o72_writeINI),
-		OPCODE(o70_getStringLenForWidth),
-		OPCODE(o70_getCharIndexInString),
-		OPCODE(o6_invalid),
-		/* F8 */
-		OPCODE(o72_getResourceSize),
-		OPCODE(o72_setFilePath),
-		OPCODE(o72_setWindowCaption),
-		OPCODE(o70_polygonOps),
-		/* FC */
-		OPCODE(o70_polygonHit),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-	};
-
-	_opcodesV90he = opcodes;
-}
-
-void ScummEngine_v90he::executeOpcode(byte i) {
-	OpcodeProcV90he op = _opcodesV90he[i].proc;
-	(this->*op) ();
-}
-
-const char *ScummEngine_v90he::getOpcodeDesc(byte i) {
-	return _opcodesV90he[i].desc;
-}
-
-void ScummEngine_v90he::o90_dup_n() {
-	int num;
-	int args[16];
-
-	push(fetchScriptWord());
-	num = getStackList(args, ARRAYSIZE(args));
-
-	for (int i = 0; i < 2; i++) {
-		for (int j = 0; j < num; j++)
-			push(args[j]);
-	}
-}
-
-void ScummEngine_v90he::o90_min() {
-	int a = pop();
-	int b = pop();
-
-	if (b < a) {
-		push(b);
-	} else {
-		push(a);
-	}
-}
-
-void ScummEngine_v90he::o90_max() {
-	int a = pop();
-	int b = pop();
-
-	if (b > a) {
-		push(b);
-	} else {
-		push(a);
-	}
-}
-
-void ScummEngine_v90he::o90_sin() {
-	double a = pop() * PI / 180.;
-	push((int)(sin(a) * 100000));
-}
-
-void ScummEngine_v90he::o90_cos() {
-	double a = pop() * PI / 180.;
-	push((int)(cos(a) * 100000));
-}
-
-void ScummEngine_v90he::o90_sqrt() {
-	int i = pop();
-	if (i < 2) {
-		push(i);
-	} else {
-		push((int)sqrt((double)(i + 1)));
-	}
-}
-
-void ScummEngine_v90he::o90_atan2() {
-	int y = pop();
-	int x = pop();
-	int a = (int)(atan2((double)y, (double)x) * 180. / PI);
-	if (a < 0) {
-		a += 360;
-	}
-	push(a);
-}
-
-void ScummEngine_v90he::o90_getSegmentAngle() {
-	int y1 = pop();
-	int x1 = pop();
-	int dy = y1 - pop();
-	int dx = x1 - pop();
-	int a = (int)(atan2((double)dy, (double)dx) * 180. / PI);
-	if (a < 0) {
-		a += 360;
-	}
-	push(a);
-}
-
-void ScummEngine_v90he::o90_getActorData() {
-	Actor *a;
-
-	int subOp = pop();
-	int val = pop();
-	int act = pop();
-
-	a = derefActor(act, "o90_getActorData");
-
-	switch (subOp) {
-	case 1:
-		push(a->isUserConditionSet(val));
-		break;
-	case 2:
-		checkRange(15, 0, val, "Limb %d out of range");
-		push(a->_cost.frame[val]);
-		break;
-	case 3:
-		push(a->getAnimSpeed());
-		break;
-	case 4:
-		push(a->_shadowMode);
-		break;
-	case 5:
-		push(a->_layer);
-		break;
-	case 6:
-		push(a->_hePaletteNum);
-		break;
-	default:
-		error("o90_getActorData: Unknown actor property %d", subOp);
-	}
-}
-
-void ScummEngine_v90he::o90_startScriptUnk() {
-	int args[25];
-	int script, cycle;
-	byte flags;
-
-	getStackList(args, ARRAYSIZE(args));
-	cycle = pop();
-	script = pop();
-	flags = fetchScriptByte();
-	runScript(script, (flags == 199 || flags == 200), (flags == 195 || flags == 200), args, cycle);
-}
-
-void ScummEngine_v90he::o90_jumpToScriptUnk() {
-	int args[25];
-	int script, cycle;
-	byte flags;
-
-	getStackList(args, ARRAYSIZE(args));
-	cycle = pop();
-	script = pop();
-	flags = fetchScriptByte();
-	stopObjectCode();
-	runScript(script, (flags == 199 || flags == 200), (flags == 195 || flags == 200), args, cycle);
-}
-
-void ScummEngine_v90he::o90_videoOps() {
-	// Uses Smacker video
-	int status = fetchScriptByte();
-	int subOp = status - 49;
-
-	switch (subOp) {
-	case 0:
-		copyScriptString(_videoParams.filename, sizeof(_videoParams.filename));
-		_videoParams.status = status;
-		break;
-	case 5:
-		_videoParams.flags |= pop();
-		break;
-	case 8:
-		memset(_videoParams.filename, 0, sizeof(_videoParams.filename));
-		_videoParams.unk2 = pop();
-		break;
-	case 14:
-		_videoParams.wizResNum = pop();
-		if (_videoParams.wizResNum)
-			_videoParams.flags |= 2;
-		break;
-	case 116:
-		_videoParams.status = status;
-		break;
-	case 206:
-		if (_videoParams.status == 49) {
-			// Start video
-			if (_videoParams.flags == 0)
-				_videoParams.flags = 4;
-
-			if (_videoParams.flags == 2) {
-				// result = startVideo(_videoParams.filename, _videoParams.flags, _videoParams.wizResNum);
-				// VAR(119) = result;
-			} else {
-				// result = startVideo(_videoParams.filename, _videoParams.flags);
-				// VAR(119) = result;
-			}
-		} else if (_videoParams.status == 165) {
-			// Stop video
-		}
-		break;
-	default:
-		error("o90_videoOps: unhandled case %d", subOp);
-	}
-
-	debug(1, "o90_videoOps stub (%d)", subOp);
-}
-
-void ScummEngine_v90he::o90_getVideoData() {
-	// Uses Smacker video
-	byte subOp = fetchScriptByte();
-	subOp -= 32;
-
-	switch (subOp) {
-	case 0:		// Get width
-		pop();
-		break;
-	case 1:		// Get height
-		pop();
-		break;
-	case 4:		// Get frame count
-		pop();
-		break;
-	case 20:	// Get current frame
-		pop();
-		break;
-	case 31:	// Get image number
-		pop();
-		break;
-	case 107:	// Get statistics
-		pop();
-		pop();
-		break;
-	default:
-		error("o90_getVideoData: unhandled case %d", subOp);
-	}
-
-	push(-1);
-	debug(1, "o90_getVideoData stub (%d)", subOp);
-}
-
-void ScummEngine_v90he::o90_wizImageOps() {
-	int a, b;
-
-	int subOp = fetchScriptByte();
-	subOp -= 46;
-
-	switch (subOp) {
-	case -14: // HE99+
-		_wizParams.processFlags |= kWPFUseDefImgWidth;
-		_wizParams.resDefImgW = pop();
-		break;
-	case -13: // HE99+
-		_wizParams.processFlags |= kWPFUseDefImgHeight;
-		_wizParams.resDefImgH = pop();
-		break;
-	case 0:
-		// Dummy case
-		pop();
-		break;
-	case 1:
-		_wizParams.box.bottom = pop();
-		_wizParams.box.right = pop();
-		_wizParams.box.top = pop();
-		_wizParams.box.left = pop();
-		break;
-	case 2:
-		_wizParams.processMode = 1;
-		break;
-	case 3:
-		_wizParams.processFlags |= kWPFUseFile;
-		_wizParams.processMode = 3;
-		copyScriptString(_wizParams.filename, sizeof(_wizParams.filename));
-		break;
-	case 4:
-		_wizParams.processFlags |= kWPFUseFile;
-		_wizParams.processMode = 4;
-		copyScriptString(_wizParams.filename, sizeof(_wizParams.filename));
-		_wizParams.fileWriteMode = pop();
-		break;
-	case 5:
-		_wizParams.processFlags |= kWPFClipBox | 0x100;
-		_wizParams.processMode = 2;
-		_wizParams.box.bottom = pop();
-		_wizParams.box.right = pop();
-		_wizParams.box.top = pop();
-		_wizParams.box.left = pop();
-		_wizParams.compType = pop();
-		break;
-	case 6:
-		_wizParams.processFlags |= kWPFNewState;
-		_wizParams.img.state = pop();
-		break;
-	case 7:
-		_wizParams.processFlags |= kWPFRotate;
-		_wizParams.angle = pop();
-		break;
-	case 8:
-		_wizParams.processFlags |= kWPFNewFlags;
-		_wizParams.img.flags |= pop();
-		break;
-	case 10:
-		_wizParams.img.flags = pop();
-		_wizParams.img.state = pop();
-		_wizParams.img.y1 = pop();
-		_wizParams.img.x1 = pop();
-		_wizParams.img.resNum = pop();
-		_wiz->displayWizImage(&_wizParams.img);
-		break;
-	case 11:
-		_wizParams.img.resNum = pop();
-		_wizParams.processMode = 0;
-		_wizParams.processFlags = 0;
-		_wizParams.remapNum = 0;
-		_wizParams.img.flags = 0;
-		_wizParams.field_184 = 0;
-		_wizParams.field_180 = 0;
-		_wizParams.spriteId = 0;
-		_wizParams.spriteGroup = 0;
-		break;
-	case 16: // HE99+
-		_wizParams.processFlags |= kWPFMaskImg;
-		_wizParams.sourceImage = pop();
-		break;
-	case 19:
-	case 108:
-		_wizParams.processFlags |= kWPFSetPos;
-		_wizParams.img.y1 = pop();
-		_wizParams.img.x1 = pop();
-		break;
-	case 20:
-	case 203: // HE98+
-		b = pop();
-		a = pop();
-		_wizParams.processFlags |= kWPFRemapPalette;
-		_wizParams.processMode = 6;
-		if (_wizParams.remapNum == 0) {
-			memset(_wizParams.remapIndex, 0, sizeof(_wizParams.remapIndex));
-		} else {
-			assert(_wizParams.remapNum < ARRAYSIZE(_wizParams.remapIndex));
-			_wizParams.remapIndex[_wizParams.remapNum] = a;
-			_wizParams.remapColor[a] = b;
-			++_wizParams.remapNum;
-		}
-		break;
-	case 21:
-		_wizParams.processFlags |= kWPFClipBox;
-		_wizParams.box.bottom = pop();
-		_wizParams.box.right = pop();
-		_wizParams.box.top = pop();
-		_wizParams.box.left = pop();
-		break;
-	case 40: // HE99+
-		_wizParams.processFlags |= kWPFPaletteNum;
-		_wizParams.img.palette = pop();
-		break;
-	case 46:
-		_wizParams.processFlags |= kWPFScaled;
-		_wizParams.scale = pop();
-		break;
-	case 52:
-		_wizParams.processFlags |= kWPFShadow;
-		_wizParams.img.shadow = pop();
-		break;
-	case 85: // HE99+
-		_wizParams.processFlags |= 0x1000 | 0x100 | 0x2;
-		_wizParams.processMode = 7;
-		_wizParams.field_168 = pop();
-		_wizParams.field_164 = pop();
-		_wizParams.compType = pop();
-		break;
-	case 87: // HE99+
-		_wizParams.processFlags |= kWPFFillColor | kWPFClipBox2;
-		_wizParams.processMode = 9;
-		_wizParams.fillColor = pop();
-		_wizParams.box2.bottom = pop();
-		_wizParams.box2.right = pop();
-		_wizParams.box2.top = pop();
-		_wizParams.box2.left = pop();
-		break;
-	case 88: // HE99+
-		_wizParams.processFlags |= kWPFFillColor | kWPFClipBox2;
-		_wizParams.processMode = 10;
-		_wizParams.fillColor = pop();
-		_wizParams.box2.bottom = pop();
-		_wizParams.box2.right = pop();
-		_wizParams.box2.top = pop();
-		_wizParams.box2.left = pop();
-		break;
-	case 89: // HE99+
-		_wizParams.processFlags |= kWPFFillColor | kWPFClipBox2;
-		_wizParams.processMode = 11;
-		_wizParams.fillColor = pop();
-		_wizParams.box2.top = _wizParams.box2.bottom = pop();
-		_wizParams.box2.left = _wizParams.box2.right = pop();
-		break;
-	case 90: // HE99+
-		_wizParams.processFlags |= kWPFFillColor | kWPFClipBox2;
-		_wizParams.processMode = 12;
-		_wizParams.fillColor = pop();
-		_wizParams.box2.top = _wizParams.box2.bottom = pop();
-		_wizParams.box2.left = _wizParams.box2.right = pop();
-		break;
-	case 91: // HE99+
-		_wizParams.processFlags |= kWPFDstResNum;
-		_wizParams.dstResNum = pop();
-		break;
-	case 93: // HE99+
-		_wizParams.processFlags |= 0x100000;
-		_wizParams.field_180 = pop();
-		_wizParams.field_184 = pop();
-		break;
-	case 95: // HE99+
-		_wizParams.processMode = 13;
-		break;
-	case 96: // HE99+
-		_wizParams.field_239D = pop();
-		_wizParams.field_2399 = pop();
-		_wizParams.field_23A5 = pop();
-		_wizParams.field_23A1 = pop();
-		copyScriptString(_wizParams.string2, sizeof(_wizParams.string2));
-		_wizParams.processMode = 15;
-		break;
-	case 97: // HE99+
-		_wizParams.processMode = 16;
-		_wizParams.field_23AD = pop();
-		_wizParams.field_23A9 = pop();
-		copyScriptString(_wizParams.string1, sizeof(_wizParams.string1));
-		break;
-	case 143: // HE99+
-		_wizParams.processMode = 17;
-		_wizParams.field_23CD = pop();
-		_wizParams.field_23C9 = pop();
-		_wizParams.field_23C5 = pop();
-		_wizParams.field_23C1 = pop();
-		_wizParams.field_23BD = pop();
-		_wizParams.field_23B9 = pop();
-		_wizParams.field_23B5 = pop();
-		_wizParams.field_23B1 = pop();
-		break;
-	case 150: // HE99+
-		_wizParams.processMode = 14;
-		break;
-	case 171: // HE99+
-		_wizParams.processMode = 8;
-		break;
-	case 200:
-		_wizParams.processFlags |= kWPFNewFlags | kWPFSetPos | 2;
-		_wizParams.img.flags |= kWIFIsPolygon;
-		_wizParams.field_164 = _wizParams.img.y1 = _wizParams.img.x1 = pop();
-		break;
-	case 209:
-		if (_wizParams.img.resNum)
-			_wiz->processWizImage(&_wizParams);
-		break;
-	default:
-		error("o90_wizImageOps: unhandled case %d", subOp);
-	}
-}
-
-void ScummEngine_v90he::o90_getDistanceBetweenPoints() {
-	int x1, y1, z1, x2, y2, z2, dx, dy, dz, d;
-
-	byte subOp = fetchScriptByte();
-
-	switch (subOp) {
-	case 23: // HE100
-	case 28:
-		y2 = pop();
-		x2 = pop();
-		y1 = pop();
-		x1 = pop();
-		dx = x2 - x1;
-		dy = y2 - y1;
-		d = dx * dx + dy * dy;
-		if (d < 2) {
-			push(d);
-		} else {
-			push((int)sqrt((double)(d + 1)));
-		}
-		break;
-	case 24: // HE100
-	case 29:
-		z2 = pop();
-		y2 = pop();
-		x2 = pop();
-		z1 = pop();
-		y1 = pop();
-		x1 = pop();
-		dx = x2 - x1;
-		dy = y2 - y1;
-		dz = z2 - z1;
-		d = dx * dx + dy * dy + dz * dz;
-		if (d < 2) {
-			push(d);
-		} else {
-			push((int)sqrt((double)(d + 1)));
-		}
-		break;
-	default:
-		error("o90_getDistanceBetweenPoints: Unknown case %d", subOp);
-	}
-}
-
-void ScummEngine_v90he::o90_getSpriteInfo() {
-	int args[16];
-	int spriteId, flags, groupId, type;
-	int32 x, y;
-
-	byte subOp = fetchScriptByte();
-	subOp -= 30;
-
-	switch (subOp) {
-	case 0:
-		spriteId = pop();
-		if (spriteId) {
-			_sprite->getSpritePosition(spriteId, x, y);
-			push(x);
-		} else {
-			push(0);
-		}
-		break;
-	case 1:
-		spriteId = pop();
-		if (spriteId) {
-			_sprite->getSpritePosition(spriteId, x, y);
-			push(y);
-		} else {
-			push(0);
-		}
-		break;
-	case 2:
-		spriteId = pop();
-		if (spriteId) {
-			_sprite->getSpriteImageDim(spriteId, x, y);
-			push(x);
-		} else {
-			push(0);
-		}
-		break;
-	case 3:
-		spriteId = pop();
-		if (spriteId) {
-			_sprite->getSpriteImageDim(spriteId, x, y);
-			push(y);
-		} else {
-			push(0);
-		}
-		break;
-	case 4:
-		spriteId = pop();
-		if (spriteId) {
-			_sprite->getSpriteDist(spriteId, x, y);
-			push(x);
-		} else {
-			push(0);
-		}
-		break;
-	case 5:
-		spriteId = pop();
-		if (spriteId) {
-			_sprite->getSpriteDist(spriteId, x, y);
-			push(y);
-		} else {
-			push(0);
-		}
-		break;
-	case 6:
-		spriteId = pop();
-		if (spriteId)
-			push(_sprite->getSpriteImageStateCount(spriteId));
-		else
-			push(0);
-		break;
-	case 7:
-		spriteId = pop();
-		if (spriteId)
-			push(_sprite->getSpriteGroup(spriteId));
-		else
-			push(0);
-		break;
-	case 8:
-		spriteId = pop();
-		if (spriteId)
-			push(_sprite->getSpriteDisplayX(spriteId));
-		else
-			push(0);
-		break;
-	case 9:
-		spriteId = pop();
-		if (spriteId)
-			push(_sprite->getSpriteDisplayY(spriteId));
-		else
-			push(0);
-		break;
-	case 12:
-		flags = pop();
-		spriteId = pop();
-		if (spriteId) {
-			switch(flags) {
-			case 0:
-				push(_sprite->getSpriteFlagXFlipped(spriteId));
-				break;
-			case 1:
-				push(_sprite->getSpriteFlagYFlipped(spriteId));
-				break;
-			case 2:
-				push(_sprite->getSpriteFlagActive(spriteId));
-				break;
-			case 3:
-				push(_sprite->getSpriteFlagDoubleBuffered(spriteId));
-				break;
-			case 4:
-				push(_sprite->getSpriteFlagRemapPalette(spriteId));
-				break;
-			default:
-				push(0);
-			}
-		} else {
-			push(0);
-		}
-		break;
-	case 13:
-		spriteId = pop();
-		if (spriteId)
-			push(_sprite->getSpritePriority(spriteId));
-		else
-			push(0);
-		break;
-	case 15:
-		if (_heversion == 99) {
-			flags = getStackList(args, ARRAYSIZE(args));
-			type = pop();
-			groupId = pop();
-			y = pop();
-			x = pop();
-			push(_sprite->findSpriteWithClassOf(x, y, groupId, type, flags, args));
-		} else if (_heversion == 98) {
-			type = pop();
-			groupId = pop();
-			y = pop();
-			x = pop();
-			push(_sprite->findSpriteWithClassOf(x, y, groupId, type, 0, 0));
-		} else {
-			groupId = pop();
-			y = pop();
-			x = pop();
-			push(_sprite->findSpriteWithClassOf(x, y, groupId, 0, 0, 0));
-		}
-		break;
-	case 22:
-		spriteId = pop();
-		if (spriteId)
-			push(_sprite->getSpriteImageState(spriteId));
-		else
-			push(0);
-		break;
-	case 32:
-		spriteId = pop();
-		if (spriteId)
-			push(_sprite->getSpriteSourceImage(spriteId));
-		else
-			push(0);
-		break;
-	case 33:
-		spriteId = pop();
-		if (spriteId)
-			push(_sprite->getSpriteImage(spriteId));
-		else
-			push(0);
-		break;
-	case 38:
-		spriteId = pop();
-		if (spriteId)
-			push(_sprite->getSpriteFlagEraseType(spriteId));
-		else
-			push(1);
-		break;
-	case 52:
-		spriteId = pop();
-		if (spriteId)
-			push(_sprite->getSpriteFlagAutoAnim(spriteId));
-		else
-			push(0);
-		break;
-	case 56:
-		spriteId = pop();
-		if (spriteId)
-			push(_sprite->getSpritePalette(spriteId));
-		else
-			push(0);
-		break;
-	case 62:
-		spriteId = pop();
-		if (spriteId)
-			push(_sprite->getSpriteScale(spriteId));
-		else
-			push(0);
-		break;
-	case 67:
-		spriteId = pop();
-		if (spriteId)
-			push(_sprite->getSpriteAnimSpeed(spriteId));
-		else
-			push(1);
-		break;
-	case 68:
-		spriteId = pop();
-		if (spriteId)
-			push(_sprite->getSpriteShadow(spriteId));
-		else
-			push(0);
-		break;
-	case 94:
-		spriteId = pop();
-		if (spriteId)
-			push(_sprite->getSpriteFlagUpdateType(spriteId));
-		else
-			push(0);
-		break;
-	case 95:
-		flags = getStackList(args, ARRAYSIZE(args));
-		spriteId = pop();
-		if (spriteId) {
-			push(_sprite->getSpriteClass(spriteId, flags, args));
-		} else {
-			push(0);
-		}
-		break;
-	case 109:
-		flags = pop();
-		spriteId = pop();
-		if (spriteId)
-			push(_sprite->getSpriteGeneralProperty(spriteId, flags));
-		else
-			push(0);
-		break;
-	case 110:
-		spriteId = pop();
-		if (spriteId)
-			push(_sprite->getSpriteMaskImage(spriteId));
-		else
-			push(0);
-		break;
-	case 168:
-		pop();
-		spriteId = pop();
-		if (spriteId)
-			push(_sprite->getSpriteUserValue(spriteId));
-		else
-			push(0);
-		break;
-	default:
-		error("o90_getSpriteInfo: Unknown case %d", subOp);
-	}
-}
-
-void ScummEngine_v90he::o90_setSpriteInfo() {
-	int args[16];
-	int spriteId;
-	int32 tmp[2];
-	int n;
-
-	byte subOp = fetchScriptByte();
-	subOp -= 34;
-
-	switch (subOp) {
-	case 0:
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++) {
-			_sprite->getSpriteDist(spriteId, tmp[0], tmp[1]);
-			_sprite->setSpriteDist(spriteId, args[0], tmp[1]);
-		}
-		break;
-	case 1:
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++) {
-			_sprite->getSpriteDist(spriteId, tmp[0], tmp[1]);
-			_sprite->setSpriteDist(spriteId, tmp[0], args[0]);
-		}
-		break;
-	case 3:
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->setSpriteGroup(spriteId, args[0]);
-		break;
-	case 8:
-		args[1] = pop();
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			switch(args[1]) {
-			case 0:
-				_sprite->setSpriteFlagXFlipped(spriteId, args[0]);
-				break;
-			case 1:
-				_sprite->setSpriteFlagYFlipped(spriteId, args[0]);
-				break;
-			case 2:
-				_sprite->setSpriteFlagActive(spriteId, args[0]);
-				break;
-			case 3:
-				_sprite->setSpriteFlagDoubleBuffered(spriteId, args[0]);
-				break;
-			case 4:
-				_sprite->setSpriteFlagRemapPalette(spriteId, args[0]);
-				break;
-			default:
-				break;
-			}
-		break;
-	case 9:
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->setSpritePriority(spriteId, args[0]);
-		break;
-	case 10:
-		args[1] = pop();
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->moveSprite(spriteId, args[0], args[1]);
-		break;
-	case 18:
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->setSpriteImageState(spriteId, args[0]);
-		break;
-	case 19:
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->setSpriteAngle(spriteId, args[0]);
-		break;
-	case 23:
-		if (_features & GF_HE_985 || _heversion >= 99) {
-			_curMaxSpriteId = pop();
-			_curSpriteId = pop();
-
-			if (_curSpriteId > _curMaxSpriteId)
-				SWAP(_curSpriteId, _curMaxSpriteId);
-		} else {
-			_curSpriteId = pop();
-			_curMaxSpriteId = _curSpriteId; // to make all functions happy
-		}
-		break;
-	case 28: // HE99+
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->setSpriteSourceImage(spriteId, args[0]);
-		break;
-	case 29:
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->setSpriteImage(spriteId, args[0]);
-		break;
-	case 31:
-		args[1] = pop();
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->setSpritePosition(spriteId, args[0], args[1]);
-		break;
-	case 34:
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->setSpriteFlagEraseType(spriteId, args[0]);
-		break;
-	case 43:
-		args[1] = pop();
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->setSpriteDist(spriteId, args[0], args[1]);
-		break;
-	case 48:
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->setSpriteFlagAutoAnim(spriteId, args[0]);
-		break;
-	case 52: // HE 98+
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->setSpritePalette(spriteId, args[0]);
-		break;
-	case 58: // HE 99+
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->setSpriteScale(spriteId, args[0]);
-		break;
-	case 63: // HE 98+
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->setSpriteAnimSpeed(spriteId, args[0]);
-		break;
-	case 64:
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->setSpriteShadow(spriteId, args[0]);
-		break;
-	case 90:
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->setSpriteFlagUpdateType(spriteId, args[0]);
-		break;
-	case 91:
-		n = getStackList(args, ARRAYSIZE(args));
-		if (_curSpriteId != 0 && _curMaxSpriteId != 0 && n != 0) {
-			int *p = &args[n - 1];
-			do {
-				int code = *p;
-				if (code == 0) {
-					for (int i = _curSpriteId; i <= _curMaxSpriteId; ++i) {
-						_sprite->setSpriteResetClass(i);
-					}
-				} else if (code & 0x80) {
-					for (int i = _curSpriteId; i <= _curMaxSpriteId; ++i) {
-						_sprite->setSpriteSetClass(i, code & 0x7F, 1);
-					}
-				} else {
-					for (int i = _curSpriteId; i <= _curMaxSpriteId; ++i) {
-						_sprite->setSpriteSetClass(i, code & 0x7F, 0);
-					}
-				}
-				--p;
-			} while (--n);
-		}
-		break;
-	case 105: // HE 99+
-		args[1] = pop();
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->setSpriteGeneralProperty(spriteId, args[0], args[1]);
-		break;
-	case 106: // HE 99+
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->setSpriteMaskImage(spriteId, args[0]);
-		break;
-	case 124:
-		_sprite->resetTables(true);
-		break;
-	case 164:
-		args[1] = pop();
-		args[0] = pop();
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->setSpriteUserValue(spriteId, args[0], args[1]);
-		break;
-	case 183:
-		if (_curSpriteId > _curMaxSpriteId)
-			break;
-		spriteId = _curSpriteId;
-		if (!spriteId)
-			spriteId++;
-
-		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->resetSprite(spriteId);
-		break;
-	default:
-		error("o90_setSpriteInfo: Unknown case %d", subOp);
-	}
-}
-
-void ScummEngine_v90he::o90_getSpriteGroupInfo() {
-	int32 tx, ty;
-	int spriteGroupId, type;
-
-	byte subOp = fetchScriptByte();
-
-	switch (subOp) {
-	case 8: // HE 99+
-		spriteGroupId = pop();
-		if (spriteGroupId)
-			push(getGroupSpriteArray(spriteGroupId));
-		else
-			push(0);
-		break;
-	case 30:
-		spriteGroupId = pop();
-		if (spriteGroupId) {
-			_sprite->getGroupPosition(spriteGroupId, tx, ty);
-			push(tx);
-		} else {
-			push(0);
-		}
-		break;
-	case 31:
-		spriteGroupId = pop();
-		if (spriteGroupId) {
-			_sprite->getGroupPosition(spriteGroupId, tx, ty);
-			push(ty);
-		} else {
-			push(0);
-		}
-		break;
-	case 42: // HE 99+
-		type = pop();
-		spriteGroupId = pop();
-		if (spriteGroupId) {
-			switch(type) {
-			case 0:
-				push(_sprite->getGroupXMul(spriteGroupId));
-				break;
-			case 1:
-				push(_sprite->getGroupXDiv(spriteGroupId));
-				break;
-			case 2:
-				push(_sprite->getGroupYMul(spriteGroupId));
-				break;
-			case 3:
-				push(_sprite->getGroupYDiv(spriteGroupId));
-				break;
-			default:
-				push(0);
-			}
-		} else {
-			push(0);
-		}
-		break;
-	case 43:
-		spriteGroupId = pop();
-		if (spriteGroupId)
-			push(_sprite->getGroupPriority(spriteGroupId));
-		else
-			push(0);
-		break;
-	case 63: // HE 99+
-		spriteGroupId = pop();
-		if (spriteGroupId)
-			push(_sprite->getGroupDstResNum(spriteGroupId));
-		else
-			push(0);
-		break;
-	case 139: // HE 99+
-		// dummy case
-		pop();
-		pop();
-		push(0);
-		break;
-	default:
-		error("o90_getSpriteGroupInfo: Unknown case %d", subOp);
-	}
-}
-
-void ScummEngine_v90he::o90_setSpriteGroupInfo() {
-	int type, value1, value2, value3, value4;
-
-	byte subOp = fetchScriptByte();
-	subOp -= 37;
-
-	switch (subOp) {
-	case 0:
-		type = pop() - 1;
-		switch (type) {
-		case 0:
-			value2 = pop();
-			value1 = pop();
-			if (!_curSpriteGroupId)
-				break;
-
-			_sprite->moveGroupMembers(_curSpriteGroupId, value1, value2);
-			break;
-		case 1:
-			value1 = pop();
-			if (!_curSpriteGroupId)
-				break;
-
-			_sprite->setGroupMembersPriority(_curSpriteGroupId, value1);
-			break;
-		case 2:
-			value1 = pop();
-			if (!_curSpriteGroupId)
-				break;
-
-			_sprite->setGroupMembersGroup(_curSpriteGroupId, value1);
-			break;
-		case 3:
-			value1 = pop();
-			if (!_curSpriteGroupId)
-				break;
-
-			_sprite->setGroupMembersUpdateType(_curSpriteGroupId, value1);
-			break;
-		case 4:
-			if (!_curSpriteGroupId)
-				break;
-
-			_sprite->setGroupMembersResetSprite(_curSpriteGroupId);
-			break;
-		case 5:
-			value1 = pop();
-			if (!_curSpriteGroupId)
-				break;
-
-			_sprite->setGroupMembersAnimationSpeed(_curSpriteGroupId, value1);
-			break;
-		case 6:
-			value1 = pop();
-			if (!_curSpriteGroupId)
-				break;
-
-			_sprite->setGroupMembersAutoAnimFlag(_curSpriteGroupId, value1);
-			break;
-		case 7:
-			value1 = pop();
-			if (!_curSpriteGroupId)
-				break;
-
-			_sprite->setGroupMembersShadow(_curSpriteGroupId, value1);
-			break;
-		default:
-			error("o90_setSpriteGroupInfo subOp 0: Unknown case %d", subOp);
-		}
-		break;
-	case 5:
-		type = pop();
-		value1 = pop();
-		if (!_curSpriteGroupId)
-			break;
-
-		switch (type) {
-		case 0:
-			_sprite->setGroupXMul(_curSpriteGroupId, value1);
-			break;
-		case 1:
-			_sprite->setGroupXDiv(_curSpriteGroupId, value1);
-			break;
-		case 2:
-			_sprite->setGroupYMul(_curSpriteGroupId, value1);
-			break;
-		case 3:
-			_sprite->setGroupYDiv(_curSpriteGroupId, value1);
-			break;
-		default:
-			error("o90_setSpriteGroupInfo subOp 5: Unknown case %d", subOp);
-		}
-		break;
-	case 6:
-		value1 = pop();
-		if (!_curSpriteGroupId)
-			break;
-
-		_sprite->setGroupPriority(_curSpriteGroupId, value1);
-		break;
-	case 7:
-		value2 = pop();
-		value1 = pop();
-		if (!_curSpriteGroupId)
-			break;
-
-		_sprite->moveGroup(_curSpriteGroupId, value1, value2);
-		break;
-	case 20:
-		_curSpriteGroupId = pop();
-		break;
-	case 26:
-		value1 = pop();
-		if (!_curSpriteGroupId)
-			break;
-
-		_sprite->setGroupImage(_curSpriteGroupId, value1);
-		break;
-	case 28:
-		value2 = pop();
-		value1 = pop();
-		if (!_curSpriteGroupId)
-			break;
-
-		_sprite->setGroupPosition(_curSpriteGroupId, value1, value2);
-		break;
-	case 30:
-		value4 = pop();
-		value3 = pop();
-		value2 = pop();
-		value1 = pop();
-		if (!_curSpriteGroupId)
-			break;
-
-		_sprite->setGroupBounds(_curSpriteGroupId, value1, value2, value3, value4);
-		break;
-	case 56:
-		if (!_curSpriteGroupId)
-			break;
-
-		_sprite->resetGroupBounds(_curSpriteGroupId);
-		break;
-	case 180:
-		if (!_curSpriteGroupId)
-			break;
-
-		_sprite->resetGroup(_curSpriteGroupId);
-		break;
-	default:
-		error("o90_setSpriteGroupInfo: Unknown case %d", subOp);
-	}
-}
-
-void ScummEngine_v90he::o90_getWizData() {
-	byte filename[4096];
-	int state, resId;
-	int32 w, h;
-	int32 x, y;
-
-	byte subOp = fetchScriptByte();
-	subOp -= 30;
-
-	switch (subOp) {
-	case 0:
-		state = pop();
-		resId = pop();
-		_wiz->getWizImageSpot(resId, state, x, y);
-		push(x);
-		break;
-	case 1:
-		state = pop();
-		resId = pop();
-		_wiz->getWizImageSpot(resId, state, x, y);
-		push(y);
-		break;
-	case 2:
-		state = pop();
-		resId = pop();
-		_wiz->getWizImageDim(resId, state, w, h);
-		push(w);
-		break;
-	case 3:
-		state = pop();
-		resId = pop();
-		_wiz->getWizImageDim(resId, state, w, h);
-		push(h);
-		break;
-	case 6:
-		resId = pop();
-		push(_wiz->getWizImageStates(resId));
-		break;
-	case 15:
-		y = pop();
-		x = pop();
-		state = pop();
-		resId = pop();
-		push(_wiz->isWizPixelNonTransparent(resId, state, x, y, 0));
-		break;
-	case 36:
-		y = pop();
-		x = pop();
-		state = pop();
-		resId = pop();
-		push(_wiz->getWizPixelColor(resId, state, x, y, 0));
-		break;
-	case 100:
-		h = pop();
-		w = pop();
-		y = pop();
-		x = pop();
-		state = pop();
-		resId = pop();
-		if (x == -1 && y == -1 && w == -1 && h == -1) {
-			_wiz->getWizImageDim(resId, state, w, h);
-			x = 0;
-			y = 0;
-		}
-		push(computeWizHistogram(resId, state, x, y, w, h));
-		break;
-	case 109:
-		pop();
-		pop();
-		push(0);
-		break;
-	case 111:
-		pop();
-		copyScriptString(filename, sizeof(filename));
-		pop();
-		push(0);
-		debug(0, "o90_getWizData() case 111 unhandled");
-		break;
-	default:
-		error("o90_getWizData: Unknown case %d", subOp);
-	}
-}
-
-void ScummEngine_v90he::o90_floodFill() {
-	byte subOp = fetchScriptByte();
-	subOp -= 54;
-
-	switch (subOp) {
-	case 0:
-		pop();
-		break;
-	case 3:
-		memset(&_floodFillParams, 0, sizeof(_floodFillParams));
-		_floodFillParams.box.left = 0;
-		_floodFillParams.box.top = 0;
-		_floodFillParams.box.right = 639;
-		_floodFillParams.box.bottom = 479;
-		break;
-	case 11:
-		_floodFillParams.y = pop();
-		_floodFillParams.x = pop();
-		break;
-	case 12:
-		_floodFillParams.flags = pop();
-		break;
-	case 13:
-		_floodFillParams.box.bottom = pop();
-		_floodFillParams.box.right = pop();
-		_floodFillParams.box.top = pop();
-		_floodFillParams.box.left = pop();
-		break;
-	case 201:
-		floodFill(&_floodFillParams, this);
-		break;
-	default:
-		error("o90_floodFill: Unknown case %d", subOp);
-	}
-}
-
-void ScummEngine_v90he::o90_shl() {
-	int a = pop();
-	push(pop() << a);
-}
-
-void ScummEngine_v90he::o90_shr() {
-	int a = pop();
-	push(pop() >> a);
-}
-
-void ScummEngine_v90he::o90_xor() {
-	int a = pop();
-	push(pop() ^ a);
-}
-
-void ScummEngine_v90he::o90_mod() {
-	int a = pop();
-	if (a == 0)
-		error("modulus by zero");
-	push(pop() % a);
-}
-
-void ScummEngine_v90he::o90_findAllObjectsWithClassOf() {
-	int args[16];
-	int cond, num, cls, tmp;
-	bool b;
-
-	num = getStackList(args, ARRAYSIZE(args));
-	int room = pop();
-	int numObjs = 0;
-
-	if (room != _currentRoom)
-		error("o90_findAllObjectsWithClassOf: current room is not %d", room);
-
-	writeVar(0, 0);
-	defineArray(0, kDwordArray, 0, 0, 0, _numLocalObjects);
-	for (int i = 1; i < _numLocalObjects; i++) {
-		cond = 1;
-		tmp = num;
-		while (--tmp >= 0) {
-			cls = args[tmp];
-			b = getClass(_objs[i].obj_nr, cls);
-			if ((cls & 0x80 && !b) || (!(cls & 0x80) && b))
-				cond = 0;
-		}
-
-		if (cond) {
-			numObjs++;
-			writeArray(0, 0, numObjs, _objs[i].obj_nr);
-		}
-	}
-
-	writeArray(0, 0, 0, numObjs);
-
-	push(readVar(0));
-}
-
-void ScummEngine_v90he::o90_getPolygonOverlap() {
-	int args1[32];
-	int args2[32];
-
-	int n1 = getStackList(args1, ARRAYSIZE(args1));
-	int n2 = getStackList(args2, ARRAYSIZE(args2));
-
-	int subOp = pop();
-
-	switch (subOp) {
-	case 1:
-		{
-			Common::Rect r(args1[0], args1[1], args1[2] + 1, args1[3] + 1);
-			Common::Point p(args2[0], args2[1]);
-			push(r.contains(p) ? 1 : 0);
-		}
-		break;
-	case 2:
-		{
-			int dx = args2[0] - args1[0];
-			int dy = args2[1] - args1[1];
-			int dist = dx * dx + dy * dy;
-			if (dist >= 2) {
-				dist = (int)sqrt((double)(dist + 1));
-			}
-			if (_heversion >= 98) {
-				push((dist <= args1[2]) ? 1 : 0);
-			} else {
-				push((dist > args1[2]) ? 1 : 0);
-			}
-		}
-		break;
-	case 3:
-		{
-			Common::Rect r1(args1[0], args1[1], args1[2] + 1, args1[3] + 1);
-			Common::Rect r2(args2[0], args2[1], args2[2] + 1, args2[3] + 1);
-			push(r2.intersects(r1) ? 1 : 0);
-		}
-		break;
-	case 4:
-		{
-			int dx = args2[0] - args1[0];
-			int dy = args2[1] - args1[1];
-			int dist = dx * dx + dy * dy;
-			if (dist >= 2) {
-				dist = (int)sqrt((double)(dist + 1));
-			}
-			push((dist < args1[2] && dist < args2[2]) ? 1 : 0);
-		}
-		break;
-	case 5:
-		{
-			assert((n1 & 1) == 0);
-			n1 /= 2;
-			if (n1 == 0) {
-				push(0);
-			} else {
-				WizPolygon wp;
-				memset(&wp, 0, sizeof(wp));
-				wp.numVerts = n1;
-				assert(n1 < ARRAYSIZE(wp.vert));
-				for (int i = 0; i < n1; ++i) {
-					wp.vert[i].x = args1[i * 2 + 0];
-					wp.vert[i].y = args1[i * 2 + 1];
-				}
-				push(_wiz->polygonContains(wp, args2[0], args2[1]) ? 1 : 0);
-			}
-		}
-		break;
-	// HE 98+
-	case 6:
-		{
-			Common::Rect r1, r2;
-			_sprite->getSpriteBounds(args2[0], false, r2);
-			_sprite->getSpriteBounds(args1[0], false, r1);
-			if (r2.isValidRect() == false) {
-				push(0);
-				break;
-			}
-
-			if (n2 == 3) {
-				r2.left += args2[1];
-				r2.right += args2[1];
-				r2.top += args2[2];
-				r2.bottom += args2[2];
-			}
-			if (n1 == 3) {
-				r1.left += args1[1];
-				r1.right += args1[1];
-				r1.top += args1[2];
-				r1.bottom += args1[2];
-			}
-			push(r2.intersects(r1) ? 1 : 0);
-		}
-		break;
-	case 7:
-		{
-			Common::Rect r2;
-			_sprite->getSpriteBounds(args2[0], false, r2);
-			Common::Rect r1(args1[0], args1[1], args1[2], args1[3]);
-			if (r2.isValidRect() == false) {
-				push(0);
-				break;
-			}
-
-			if (n2 == 3) {
-				r2.left += args2[1];
-				r2.right += args2[1];
-				r2.top += args2[2];
-				r2.bottom += args2[2];
-			}
-			push(r2.intersects(r1) ? 1 : 0);
-		}
-		break;
-	case 8:
-	case 10:	// TODO: Draw sprites to buffer and compare.
-		{
-			Common::Rect r1, r2;
-			_sprite->getSpriteBounds(args2[0], true, r2);
-			_sprite->getSpriteBounds(args1[0], true, r1);
-			if (r2.isValidRect() == false) {
-				push(0);
-				break;
-			}
-
-			if (n2 == 3) {
-				r2.left += args2[1];
-				r2.right += args2[1];
-				r2.top += args2[2];
-				r2.bottom += args2[2];
-			}
-			if (n1 == 3) {
-				r1.left += args1[1];
-				r1.right += args1[1];
-				r1.top += args1[2];
-				r1.bottom += args1[2];
-			}
-			push(r2.intersects(r1) ? 1 : 0);
-		}
-		break;
-	case 9:
-		{
-			Common::Rect r2;
-			_sprite->getSpriteBounds(args2[0], true, r2);
-			Common::Rect r1(args1[0], args1[1], args1[2], args1[3]);
-			if (r2.isValidRect() == false) {
-				push(0);
-				break;
-			}
-
-			if (n2 == 3) {
-				r2.left += args2[1];
-				r2.right += args2[1];
-				r2.top += args2[2];
-				r2.bottom += args2[2];
-			}
-			push(r2.intersects(r1) ? 1 : 0);
-		}
-		break;
-	default:
-		error("o90_getPolygonOverlap: default case %d", subOp);
-	}
-}
-
-void ScummEngine_v90he::o90_cond() {
-	int a = pop();
-	int b = pop();
-	int c = pop();
-
-	if (!c)
-		b = a;
-	push(b);
-}
-
-void ScummEngine_v90he::o90_dim2dim2Array() {
-	int data, dim1start, dim1end, dim2start, dim2end;
-
-	byte subOp = fetchScriptByte();
-
-	switch (subOp) {
-	case 2:		// SO_BIT_ARRAY
-		data = kBitArray;
-		break;
-	case 3:		// SO_NIBBLE_ARRAY
-		data = kNibbleArray;
-		break;
-	case 4:		// SO_BYTE_ARRAY
-		data = kByteArray;
-		break;
-	case 5:		// SO_INT_ARRAY
-		data = kIntArray;
-		break;
-	case 6:
-		data = kDwordArray;
-		break;
-	case 7:		// SO_STRING_ARRAY
-		data = kStringArray;
-		break;
-	default:
-		error("o90_dim2dim2Array: default case %d", subOp);
-	}
-
-	if (pop() == 2) {
-		dim1end = pop();
-		dim1start = pop();
-		dim2end = pop();
-		dim2start = pop();
-	} else {
-		dim2end = pop();
-		dim2start = pop();
-		dim1end = pop();
-		dim1start = pop();
-	}
-
-	defineArray(fetchScriptWord(), data, dim2start, dim2end, dim1start, dim1end);
-}
-
-void ScummEngine_v90he::o90_redim2dimArray() {
-	int a, b, c, d;
-	d = pop();
-	c = pop();
-	b = pop();
-	a = pop();
-
-	byte subOp = fetchScriptByte();
-
-	switch (subOp) {
-	case 4:
-		redimArray(fetchScriptWord(), a, b, c, d, kByteArray);
-		break;
-	case 5:
-		redimArray(fetchScriptWord(), a, b, c, d, kIntArray);
-		break;
-	case 6:
-		redimArray(fetchScriptWord(), a, b, c, d, kDwordArray);
-		break;
-	default:
-		error("o90_redim2dimArray: default type %d", subOp);
-	}
-}
-
-void ScummEngine_v90he::o90_getLinesIntersectionPoint() {
-	int var_ix = fetchScriptWord();
-	int var_iy = fetchScriptWord();
-	int line2_y2 = pop();
-	int line2_x2 = pop();
-	int line2_y1 = pop();
-	int line2_x1 = pop();
-	int line1_y2 = pop();
-	int line1_x2 = pop();
-	int line1_y1 = pop();
-	int line1_x1 = pop();
-
-	int result = 0;
-	int ix = 0;
-	int iy = 0;
-
-	bool isLine1Point = (line1_x1 == line1_x2 && line1_y1 == line1_y2);
-	bool isLine2Point = (line2_x1 == line2_x2 && line2_y1 == line2_y2);
-
-	if (isLine1Point) {
-		if (isLine2Point) {
-			if (line1_x1 == line2_x1 && line1_y1 == line2_y2) {
-				ix = line1_x1;
-				iy = line2_x1;
-				result = 1;
-			}
-		} else {
-			// 1 point and 1 line
-			int dx2 = line2_x2 - line2_x1;
-			if (dx2 != 0) {
-				int dy2 = line2_y2 - line2_y1;
-				float y = (float)dy2 / dx2 * (line1_x1 - line2_x1) + line2_y1 + .5f;
-				if (line1_y1 == (int)y) {
-					ix = line1_x1;
-					iy = line1_y1;
-					result = 1;
-				}
-			} else {
-				// vertical line
-				if (line1_x1 == line2_x1) {
-					if (line2_y1 > line2_y2) {
-						if (line1_y1 >= line2_y2 && line1_y1 <= line2_y1) {
-							ix = line1_x1;
-							iy = line1_y1;
-							result = 1;
-						}
-					} else {
-						if (line1_y1 >= line2_y1 && line1_y1 <= line2_y2) {
-							ix = line1_x1;
-							iy = line1_y1;
-							result = 1;
-						}
-					}
-				}
-			}
-		}
-	} else {
-		if (isLine2Point) {
-			// 1 point and 1 line
-			int dx1 = line1_x2 - line1_x1;
-			if (dx1 != 0) {
-				int dy1 = line1_y2 - line1_y1;
-				float y = (float)dy1 / dx1 * (line2_x1 - line1_x1) + line1_y1 + .5f;
-				if (line2_y1 == (int)y) {
-					ix = line2_x1;
-					iy = line2_y1;
-					result = 1;
-				}
-			} else {
-				// vertical line
-				if (line2_x1 == line1_x1) {
-					if (line1_y1 > line1_y2) {
-						if (line2_y1 >= line1_y2 && line2_y1 <= line1_y1) {
-							ix = line2_x1;
-							iy = line2_y1;
-							result = 1;
-						}
-					} else {
-						if (line2_y1 >= line1_y1 && line2_y1 <= line1_y2) {
-							ix = line2_x2;
-							iy = line2_y1;
-							result = 1;
-						}
-					}
-				}
-			}
-		} else {
-			// 2 lines
-			int dy1 = line1_y2 - line1_y1;
-			int dx1 = line1_x2 - line1_x1;
-			int dy2 = line2_y2 - line2_y1;
-			int dx2 = line2_x2 - line2_x1;
-			int det = dx1 * dy2 - dx2 * dy1;
-			int cross_p1 = dx1 * (line1_y1 - line2_y1) - dy1 * (line1_x1 - line2_x1);
-			int cross_p2 = dx2 * (line1_y1 - line2_y1) - dy2 * (line1_x1 - line2_x1);
-			if (det == 0) {
-				// parallel lines
-				if (cross_p2 == 0) {
-					ix = ABS(line2_x2 + line2_x1) / 2;
-					iy = ABS(line2_y2 + line2_y1) / 2;
-					result = 2;
-				}
-			} else {
-				float rcp1 = (float)cross_p1 / det;
-				float rcp2 = (float)cross_p2 / det;
-				if (rcp1 >= 0 && rcp1 <= 1 && rcp2 >= 0 && rcp2 <= 1) {
-					ix = (int)(dx1 * rcp2 + line1_x1 + .5f);
-					iy = (int)(dy1 * rcp2 + line1_y1 + .5f);
-					result = 1;
-				}
-			}
-		}
-	}
-
-	writeVar(var_ix, ix);
-	writeVar(var_iy, iy);
-	push(result);
-}
-
-void ScummEngine_v90he::getArrayDim(int array, int *dim2start, int *dim2end, int *dim1start, int *dim1end) {
-	ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, readVar(array));
-	assert(ah);
-	if (dim2start && *dim2start == -1) {
-		*dim2start = ah->dim2start;
-	}
-	if (dim2end && *dim2end == -1) {
-		*dim2end = ah->dim2end;
-	}
-	if (dim1start && *dim1start == -1) {
-		*dim1start = ah->dim1start;
-	}
-	if (dim1end && *dim1end == -1) {
-		*dim1end = ah->dim1end;
-	}
-}
-
-static int sortArrayOffset;
-
-static int compareByteArray(const void *a, const void *b) {
-	int va = *((const uint8 *)a + sortArrayOffset);
-	int vb = *((const uint8 *)a + sortArrayOffset);
-	return va - vb;
-}
-
-static int compareByteArrayReverse(const void *a, const void *b) {
-	int va = *((const uint8 *)a + sortArrayOffset);
-	int vb = *((const uint8 *)a + sortArrayOffset);
-	return vb - va;
-}
-
-static int compareIntArray(const void *a, const void *b) {
-	int va = (int16)READ_LE_UINT16((const uint8 *)a + sortArrayOffset * 2);
-	int vb = (int16)READ_LE_UINT16((const uint8 *)b + sortArrayOffset * 2);
-	return va - vb;
-}
-
-static int compareIntArrayReverse(const void *a, const void *b) {
-	int va = (int16)READ_LE_UINT16((const uint8 *)a + sortArrayOffset * 2);
-	int vb = (int16)READ_LE_UINT16((const uint8 *)b + sortArrayOffset * 2);
-	return vb - va;
-}
-
-static int compareDwordArray(const void *a, const void *b) {
-	int va = (int32)READ_LE_UINT32((const uint8 *)a + sortArrayOffset * 4);
-	int vb = (int32)READ_LE_UINT32((const uint8 *)b + sortArrayOffset * 4);
-	return va - vb;
-}
-
-static int compareDwordArrayReverse(const void *a, const void *b) {
-	int va = (int32)READ_LE_UINT32((const uint8 *)a + sortArrayOffset * 4);
-	int vb = (int32)READ_LE_UINT32((const uint8 *)b + sortArrayOffset * 4);
-	return vb - va;
-}
-
-void ScummEngine_v90he::sortArray(int array, int dim2start, int dim2end, int dim1start, int dim1end, int sortOrder) {
-	debug(9, "sortArray(%d, [%d,%d,%d,%d], %d)", array, dim2start, dim2end, dim1start, dim1end, sortOrder);
-
-	assert(dim1start == dim1end);
-	checkArrayLimits(array, dim2start, dim2end, dim1start, dim1end);
-	ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, readVar(array));
-	assert(ah);
-
-	const int num = dim2end - dim2start + 1;
-	const int pitch = FROM_LE_32(ah->dim1end) - FROM_LE_32(ah->dim1start) + 1;
-	const int offset = pitch * (dim2start - FROM_LE_32(ah->dim2start));
-	sortArrayOffset = dim1start - FROM_LE_32(ah->dim1start);
-
-	switch (FROM_LE_32(ah->type)) {
-	case kByteArray:
-	case kStringArray:
-		if (sortOrder <= 0) {
-			qsort(ah->data + offset, num, pitch, compareByteArray);
-		} else {
-			qsort(ah->data + offset, num, pitch, compareByteArrayReverse);
-		}
-		break;
-	case kIntArray:
-		if (sortOrder <= 0) {
-			qsort(ah->data + offset * 2, num, pitch * 2, compareIntArray);
-		} else {
-			qsort(ah->data + offset * 2, num, pitch * 2, compareIntArrayReverse);
-		}
-		break;
-	case kDwordArray:
-		if (sortOrder <= 0) {
-			qsort(ah->data + offset * 4, num, pitch * 4, compareDwordArray);
-		} else {
-			qsort(ah->data + offset * 4, num, pitch * 4, compareDwordArrayReverse);
-		}
-		break;
-	default:
-		error("Invalid array type", FROM_LE_32(ah->type));
-	}
-}
-
-void ScummEngine_v90he::o90_sortArray() {
-	byte subOp = fetchScriptByte();
-
-	switch (subOp) {
-	case 129:
-	case 134: // HE100
-		{
-			int array = fetchScriptWord();
-			int sortOrder = pop();
-			int dim1end = pop();
-			int dim1start = pop();
-			int dim2end = pop();
-			int dim2start = pop();
-			getArrayDim(array, &dim2start, &dim2end, &dim1start, &dim1end);
-			sortArray(array, dim2start, dim2end, dim1start, dim1end, sortOrder);
-		}
-		break;
-	default:
-		error("o90_sortArray: Unknown case %d", subOp);
-	}
-}
-
-void ScummEngine_v90he::o90_getObjectData() {
-	byte subOp = fetchScriptByte();
-	subOp -= 32;
-
-	switch (subOp) {
-	case 0:
-		if (_heObjectNum == -1)
-			push(0);
-		else
-			push(_objs[_heObjectNum].width);
-		break;
-	case 1:
-		if (_heObjectNum == -1)
-			push(0);
-		else
-			push(_objs[_heObjectNum].height);
-		break;
-	case 4:
-		push(getObjectImageCount(_heObject));
-		break;
-	case 6:
-		if (_heObjectNum == -1)
-			push(0);
-		else
-			push(_objs[_heObjectNum].x_pos);
-		break;
-	case 7:
-		if (_heObjectNum == -1)
-			push(0);
-		else
-			push(_objs[_heObjectNum].y_pos);
-		break;
-	case 20:
-		push(getState(_heObject));
-		break;
-	case 25:
-		_heObject = pop();
-		_heObjectNum = getObjectIndex(_heObject);
-		break;
-	case 107:
-		// Dummy case
-		pop();
-		push(0);
-		break;
-	default:
-		error("o90_getObjectData: Unknown case %d", subOp);
-	}
-}
-
-void ScummEngine_v90he::o90_getPaletteData() {
-	int b, c, d, e;
-	int palSlot, color;
-
-	byte subOp = fetchScriptByte();
-	subOp -= 45;
-
-	switch (subOp) {
-	case 0:
-		e = pop();
-		d = pop();
-		palSlot = pop();
-		pop();
-		c = pop();
-		b = pop();
-		push(getHEPaletteSimilarColor(palSlot, b, c, d, e));
-		break;
-	case 7:
-		c = pop();
-		b = pop();
-		palSlot = pop();
-		push(getHEPaletteColorComponent(palSlot, b, c));
-		break;
-	case 21:
-		color = pop();
-		palSlot = pop();
-		push(getHEPaletteColor(palSlot, color));
-		break;
-	case 87:
-		c = pop();
-		b = pop();
-		push(getHEPaletteColorComponent(1, b, c));
-		break;
-	case 172:
-		pop();
-		c = pop();
-		c = MAX(0, c);
-		c = MIN(c, 255);
-		b = pop();
-		b = MAX(0, b);
-		b = MIN(b, 255);
-		push(getHEPaletteSimilarColor(1, b, c, 10, 245));
-		break;
-	default:
-		error("o90_getPaletteData: Unknown case %d", subOp);
-	}
-}
-
-void ScummEngine_v90he::o90_paletteOps() {
-	int a, b, c, d, e;
-
-	byte subOp = fetchScriptByte();
-	subOp -= 57;
-
-	switch (subOp) {
-	case 0:
-		_hePaletteNum = pop();
-		break;
-	case 6:
-		b = pop();
-		a = pop();
-		if (_hePaletteNum != 0) {
-			setHEPaletteFromImage(_hePaletteNum, a, b);
-		}
-		break;
-	case 9:
-		e = pop();
-		d = pop();
-		c = pop();
-		b = pop();
-		a = pop();
-		if (_hePaletteNum != 0) {
-			for (; a <= b; ++a) {
-				setHEPaletteColor(_hePaletteNum, a, c, d, e);
-			}
-		}
-		break;
-	case 13:
-		c = pop();
-		b = pop();
-		a = pop();
-		if (_hePaletteNum != 0) {
-			for (; a <= b; ++a) {
-				copyHEPaletteColor(_hePaletteNum, a, c);
-			}
-		}
-		break;
-	case 19: //HE99+
-		a = pop();
-		if (_hePaletteNum != 0) {
-			setHEPaletteFromCostume(_hePaletteNum, a);
-		}
-		break;
-	case 29:
-		a = pop();
-		if (_hePaletteNum != 0) {
-			copyHEPalette(_hePaletteNum, a);
-		}
-		break;
-	case 118:
-		b = pop();
-		a = pop();
-		if (_hePaletteNum != 0) {
-			setHEPaletteFromRoom(_hePaletteNum, a, b);
-		}
-		break;
-	case 160:
-		if (_hePaletteNum != 0) {
-			restoreHEPalette(_hePaletteNum);
-		}
-		break;
-	case 198:
-		_hePaletteNum = 0;
-		break;
-	default:
-		error("o90_paletteOps: Unknown case %d", subOp);
-	}
-}
-
-void ScummEngine_v90he::o90_fontUnk() {
-	// Font related
-	byte string[80];
-	int a;
-
-	byte subOp = fetchScriptByte();
-
-	switch (subOp) {
-	case 60:	// HE100
-	case 42:
-		a = pop();
-		if (a == 2) {
-			copyScriptString(string, sizeof(string));
-			push(-1);
-		} else if (a == 1) {
-			pop();
-			writeVar(0, 0);
-			defineArray(0, kStringArray, 0, 0, 0, 0);
-			writeArray(0, 0, 0, 0);
-			push(readVar(0));
-		}
-		break;
-	case 0:		// HE100
-	case 57:
-		push(1);
-		break;
-	default:
-		error("o90_fontUnk: Unknown case %d", subOp);
-	}
-
-	debug(1, "o90_fontUnk stub (%d)", subOp);
-}
-
-void ScummEngine_v90he::o90_getActorAnimProgress() {
-	Actor *a = derefActor(pop(), "o90_getActorAnimProgress");
-	push(a->getAnimProgress());
-}
-
-void ScummEngine_v90he::o90_kernelGetFunctions() {
-	int args[29];
-	int num, tmp;
-	Actor *a;
-
-	num = getStackList(args, ARRAYSIZE(args));
-
-	switch (args[0]) {
-	case 1001:
-		{
-		double b = args[1] * PI / 180.;
-		push((int)(sin(b) * 100000));
-		}
-		break;
-	case 1002:
-		{
-		double b = args[1] * PI / 180.;
-		push((int)(cos(b) * 100000));
-		}
-		break;
-	case 1969:
-		a = derefActor(args[1], "o90_kernelGetFunctions: 1969");
-		tmp = a->_heCondMask;
-		tmp &= 0x7FFF0000;
-		push(tmp);
-		break;
-	case 2001:
-		push(_logicHE->dispatch(args[1], num - 2, (int32 *)&args[2]));
-		break;
-	default:
-		error("o90_kernelGetFunctions: default case %d", args[0]);
-	}
-}
-
-void ScummEngine_v90he::o90_kernelSetFunctions() {
-	int args[29];
-	int num, tmp;
-	Actor *a;
-
-	num = getStackList(args, ARRAYSIZE(args));
-
-	switch (args[0]) {
-	case 20:
-		a = derefActor(args[1], "o90_kernelSetFunctions: 20");
-		queueAuxBlock(a);
-		break;
-	case 21:
-		_skipDrawObject = 1;
-		break;
-	case 22:
-		_skipDrawObject = 0;
-		break;
-	case 23:
-		_charset->clearCharsetMask();
-		_fullRedraw = true;
-		break;
-	case 24:
-		_skipProcessActors = 1;
-		redrawAllActors();
-		break;
-	case 25:
-		_skipProcessActors = 0;
-		redrawAllActors();
-		break;
-	case 27:
-		// Used in readdemo
-		break;
-	case 42:
-		_wiz->_rectOverrideEnabled = true;
-		_wiz->_rectOverride.left = args[1];
-		_wiz->_rectOverride.top = args[2];
-		_wiz->_rectOverride.right = args[3];
-		_wiz->_rectOverride.bottom = args[4];
-		break;
-	case 43:
-		_wiz->_rectOverrideEnabled = false;
-		break;
-	case 714:
-		debug(5, "o90_kernelSetFunctions: case 714: type %d resId %d unk1 %d", args[1], args[2], args[3]);
-		break;
-	case 1492:
-		// Remote start script function
-		break;
-	case 1969:
-		a = derefActor(args[1], "o90_kernelSetFunctions: 1969");
-		tmp = a->_heCondMask;
-		tmp ^= args[2];
-		tmp &= 0x7FFF0000;
-		a->_heCondMask ^= tmp;
-		break;
-	case 2001:
-		_logicHE->dispatch(args[1], num - 2, (int32 *)&args[2]);
-		break;
-	default:
-		error("o90_kernelSetFunctions: default case %d (param count %d)", args[0], num);
-	}
-}
-
-} // End of namespace Scumm