Inital support for later HE games with altered opcode table.

svn-id: r15485

7 files changed, 1554 insertions, 5 deletions

diff --git a/scumm/intern.h b/scumm/intern.h
index 8a3f0d38c2..0c5f8beeae 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -901,6 +901,46 @@ protected:
 	void o90_getActorAnimProgress();
 };
 
+class ScummEngine_v100he : public ScummEngine_v90he {
+protected:
+	typedef void (ScummEngine_v100he::*OpcodeProcV100he)();
+	struct OpcodeEntryV100he {
+		OpcodeProcV100he proc;
+		const char *desc;
+	};
+
+	const OpcodeEntryV100he *_opcodesV100he;
+
+public:
+	ScummEngine_v100he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16]) : ScummEngine_v90he(detector, syst, gs, md5sum) {}
+
+protected:
+	virtual void setupOpcodes();
+	virtual void executeOpcode(byte i);
+	virtual const char *getOpcodeDesc(byte i);
+	
+	virtual void decodeParseString(int a, int b);
+
+	/* HE version 100 script opcodes */
+	void o100_actorOps();
+	void o100_arrayOps();
+	void o100_dim2dimArray();
+	void o100_dimArray();
+	void o100_drawObject();
+	void o100_unknown28();
+	void o100_resourceRoutines();
+	void o100_wizImageOps();
+	void o100_dim2dim2Array();
+	void o100_paletteOps();
+	void o100_roomOps();
+	void o100_startSound();
+	void o100_unknown26();
+	void o100_quitPauseRestart();
+	void o100_cursorCommand();
+	void o100_wait();
+	void o100_unknown25();
+};
+
 class ScummEngine_v7 : public ScummEngine_v6 {
 public:
 	ScummEngine_v7(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16]) : ScummEngine_v6(detector, syst, gs, md5sum) {}
diff --git a/scumm/module.mk b/scumm/module.mk
index 72c8780899..701ef2a223 100644
--- a/scumm/module.mk
+++ b/scumm/module.mk
@@ -43,6 +43,7 @@ MODULE_OBJS := \
 	scumm/script_v72he.o \
 	scumm/script_v80he.o \
 	scumm/script_v90he.o \
+	scumm/script_v100he.o \
 	scumm/script_v8.o \
 	scumm/scumm.o \
 	scumm/sound.o \
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp
new file mode 100644
index 0000000000..cebed5c64c
--- /dev/null
+++ b/scumm/script_v100he.cpp
@@ -0,0 +1,1483 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001  Ludvig Strigeus
+ * Copyright (C) 2001-2004 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * $Header$
+ *
+ */
+
+
+#include "stdafx.h"
+
+#include "common/config-manager.h"
+
+#include "scumm/actor.h"
+#include "scumm/charset.h"
+#include "scumm/intern.h"
+#include "scumm/object.h"
+#include "scumm/resource.h"
+#include "scumm/resource_v7he.h"
+#include "scumm/scumm.h"
+#include "scumm/sound.h"
+
+#include "sound/mididrv.h"
+#include "sound/mixer.h"
+
+namespace Scumm {
+
+#define OPCODE(x)	{ &ScummEngine_v100he::x, #x }
+
+void ScummEngine_v100he::setupOpcodes() {
+	static const OpcodeEntryV100he opcodes[256] = {
+		/* 00 */
+		OPCODE(o100_actorOps),
+		OPCODE(o6_add),
+		OPCODE(o6_faceActor),
+		OPCODE(o90_sortArray),
+		/* 04 */
+		OPCODE(o100_arrayOps),
+		OPCODE(o6_band),
+		OPCODE(o6_bor),
+		OPCODE(o6_breakHere),
+		/* 08 */
+		OPCODE(o6_delayFrames),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		/* 0C */
+		OPCODE(o6_setCameraAt),
+		OPCODE(o6_actorFollowCamera),
+		OPCODE(o6_loadRoom),
+		OPCODE(o6_panCameraTo),
+		/* 10 */
+		OPCODE(o6_invalid),
+		OPCODE(o72_jumpToScript),
+		OPCODE(o6_setClass),
+		OPCODE(o60_closeFile),
+		/* 14 */
+		OPCODE(o6_loadRoomWithEgo),
+		OPCODE(o6_invalid),
+		OPCODE(o72_setFilePath),
+		OPCODE(o6_invalid),
+		/* 18 */
+		OPCODE(o6_cutscene),
+		OPCODE(o6_pop),
+		OPCODE(o72_traceStatus),
+		OPCODE(o6_wordVarDec),
+		/* 1C */
+		OPCODE(o72_wordArrayDec),
+		OPCODE(o72_deleteFile),
+		OPCODE(o100_dim2dimArray),
+		OPCODE(o100_dimArray),
+		/* 20 */
+		OPCODE(o6_div),
+		OPCODE(o6_animateActor),
+		OPCODE(o6_doSentence),
+		OPCODE(o80_drawBox),
+		/* 24 */
+		OPCODE(o72_drawWizImage),
+		OPCODE(o80_drawWizPolygon),
+		OPCODE(o6_invalid),
+		OPCODE(o100_drawObject),
+		/* 28 */
+		OPCODE(o6_dup),
+		OPCODE(o90_dup),
+		OPCODE(o6_endCutscene),
+		OPCODE(o6_stopObjectCode),
+		/* 2C */
+		OPCODE(o6_stopObjectCode),
+		OPCODE(o6_eq),
+		OPCODE(o6_invalid),
+		OPCODE(o6_freezeUnfreeze),
+		/* 30 */
+		OPCODE(o6_ge),
+		OPCODE(o6_getDateTime),
+		OPCODE(o100_unknown28),
+		OPCODE(o6_gt),
+		/* 34 */
+		OPCODE(o100_resourceRoutines),
+		OPCODE(o6_if),
+		OPCODE(o6_ifNot),
+		OPCODE(o100_wizImageOps),
+		/* 38 */
+		OPCODE(o72_isAnyOf),
+		OPCODE(o6_wordVarInc),
+		OPCODE(o6_wordArrayInc),
+		OPCODE(o6_jump),
+		/* 3C */
+		OPCODE(o70_kernelSetFunctions),
+		OPCODE(o6_land),
+		OPCODE(o6_le),
+		OPCODE(o60_localizeArray),
+		/* 40 */
+		OPCODE(o6_wordArrayRead),
+		OPCODE(o6_wordArrayIndexedRead),
+		OPCODE(o6_lor),
+		OPCODE(o6_lt),
+		/* 44 */
+		OPCODE(o90_mod),
+		OPCODE(o6_mul),
+		OPCODE(o6_neq),
+		OPCODE(o100_dim2dim2Array),
+		/* 48 */
+		OPCODE(o6_setObjectName),
+		OPCODE(o6_invalid),
+		OPCODE(o6_not),
+		OPCODE(o6_invalid),
+		/* 4C */
+		OPCODE(o6_beginOverride),
+		OPCODE(o6_endOverride),
+		OPCODE(o6_invalid),
+		OPCODE(o6_setOwner),
+		/* 50 */
+		OPCODE(o100_paletteOps),
+		OPCODE(o70_pickupObject),
+		OPCODE(o70_polygonOps),
+		OPCODE(o6_pop),
+		/* 54 */
+		OPCODE(o6_printDebug),
+		OPCODE(o6_invalid),
+		OPCODE(o6_printLine),
+		OPCODE(o6_printSystem),
+		/* 58 */
+		OPCODE(o6_printCursor),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		/* 5C */
+		OPCODE(o6_pushByte),
+		OPCODE(o72_pushDWord),
+		OPCODE(o72_addMessageToStack),
+		OPCODE(o6_pushWord),
+		/* 60 */
+		OPCODE(o6_pushWordVar),
+		OPCODE(o6_putActorAtObject),
+		OPCODE(o6_putActorAtXY),
+		OPCODE(o6_invalid),
+		/* 64 */
+		OPCODE(o72_redimArray),
+		OPCODE(o60_rename),
+		OPCODE(o6_stopObjectCode),
+		OPCODE(o6_invalid),
+		/* 68 */
+		OPCODE(o100_roomOps),
+		OPCODE(o6_printActor),
+		OPCODE(o6_printEgo),
+		OPCODE(o6_talkActor),
+		/* 6C */
+		OPCODE(o6_talkEgo),
+		OPCODE(o6_invalid),
+		OPCODE(o60_seekFilePos),
+		OPCODE(o6_setBoxFlags),
+		/* 70 */
+		OPCODE(o6_invalid),
+		OPCODE(o6_setBoxSet),
+		OPCODE(o72_unknownFA),
+		OPCODE(o6_shuffle),
+		/* 74 */
+		OPCODE(o6_delay),
+		OPCODE(o6_delayMinutes),
+		OPCODE(o6_delaySeconds),
+		OPCODE(o100_startSound),
+		/* 78 */
+		OPCODE(o6_invalid),
+		OPCODE(o100_unknown26),
+		OPCODE(o6_stampObject),
+		OPCODE(o72_startObject),
+		/* 7C */
+		OPCODE(o72_startScript),
+		OPCODE(o6_startScriptQuick),
+		OPCODE(o80_setState),
+		OPCODE(o6_stopObjectScript),
+		/* 80 */
+		OPCODE(o6_stopScript),
+		OPCODE(o6_stopSentence),
+		OPCODE(o6_stopSound),
+		OPCODE(o6_stopTalking),
+		/* 84 */
+		OPCODE(o6_writeWordVar),
+		OPCODE(o6_wordArrayWrite),
+		OPCODE(o6_wordArrayIndexedWrite),
+		OPCODE(o6_sub),
+		/* 88 */
+		OPCODE(o100_quitPauseRestart),
+		OPCODE(o6_invalid),
+		OPCODE(o72_setTimer),
+		OPCODE(o100_cursorCommand),
+		/* 8C */
+		OPCODE(o6_invalid),
+		OPCODE(o100_wait),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		/* 90 */
+		OPCODE(o60_writeFile),
+		OPCODE(o72_writeINI),
+		OPCODE(o80_writeConfigFile),
+		OPCODE(o6_abs),
+		/* 94 */
+		OPCODE(o6_getActorWalkBox),
+		OPCODE(o6_getActorCostume),
+		OPCODE(o6_getActorElevation),
+		OPCODE(o6_getObjectOldDir),
+		/* 98 */
+		OPCODE(o6_getActorMoving),
+		OPCODE(o6_invalid),
+		OPCODE(o6_getActorRoom),
+		OPCODE(o6_getActorScaleX),
+		/* 9C */
+		OPCODE(o6_getAnimateVariable),
+		OPCODE(o6_getActorWidth),
+		OPCODE(o6_getObjectX),
+		OPCODE(o6_getObjectY),
+		/* A0 */
+		OPCODE(o90_atan2),
+		OPCODE(o90_getSegmentAngle),
+		OPCODE(o90_getActorAnimProgress),
+		OPCODE(o6_invalid),
+		/* A4 */
+		OPCODE(o6_ifClassOfIs),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		OPCODE(o90_cos),
+		/* A8 */
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		OPCODE(o6_getActorFromXY),
+		OPCODE(o72_findAllObjects),
+		/* AC */
+		OPCODE(o90_findAllObjectsWithClassOf),
+		OPCODE(o6_invalid),
+		OPCODE(o6_findInventory),
+		OPCODE(o72_findObject),
+		/* B0 */
+		OPCODE(o72_findObjectWithClassOf),
+		OPCODE(o70_polygonHit),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		/* B4 */
+		OPCODE(o72_getNumFreeArrays),
+		OPCODE(o72_getArrayDimSize),
+		OPCODE(o72_checkGlobQueue),
+		OPCODE(o72_getResourceSize),
+		/* B8 */
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		OPCODE(o6_isActorInBox),
+		/* BC */
+		OPCODE(o6_isAnyOf),
+		OPCODE(o6_getInventoryCount),
+		OPCODE(o72_kernelGetFunctions),
+		OPCODE(o90_max),
+		/* C0 */
+		OPCODE(o90_min),
+		OPCODE(o72_getObjectImageX),
+		OPCODE(o72_getObjectImageY),
+		OPCODE(o6_isRoomScriptRunning),
+		/* C4 */
+		OPCODE(o90_getObjectData),
+		OPCODE(o72_openFile),
+		OPCODE(o6_invalid),
+		OPCODE(o6_getOwner),
+		/* C8 */
+		OPCODE(o90_getPaletteData),
+		OPCODE(o6_pickOneOf),
+		OPCODE(o6_pickOneOfDefault),
+		OPCODE(o80_pickVarRandom),
+		/* CC */
+		OPCODE(o72_getPixel),
+		OPCODE(o6_distObjectObject),
+		OPCODE(o6_distObjectPt),
+		OPCODE(o6_distPtPt),
+		/* D0 */
+		OPCODE(o6_getRandomNumber),
+		OPCODE(o6_getRandomNumberRange),
+		OPCODE(o60_readFile),
+		OPCODE(o6_invalid),
+		/* D4 */
+		OPCODE(o72_readINI),
+		OPCODE(o80_readConfigFile),
+		OPCODE(o6_isScriptRunning),
+		OPCODE(o90_sin),
+		/* D8 */
+		OPCODE(o72_unknown5A),
+		OPCODE(o6_isSoundRunning),
+		OPCODE(o6_invalid),
+		OPCODE(o100_unknown25),
+		/* DC */
+		OPCODE(o90_sqrt),
+		OPCODE(o6_startObjectQuick),
+		OPCODE(o6_startScriptQuick2),
+		OPCODE(o6_getState),
+		/* E0 */
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		/* E4 */
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		/* E8 */
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		OPCODE(o72_getTimer),
+		OPCODE(o6_getVerbEntrypoint),
+		/* EC */
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		/* F0 */
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		/* F4 */
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		/* F8 */
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		/* FC */
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+		OPCODE(o6_invalid),
+	};
+
+	_opcodesV100he = opcodes;
+}
+
+void ScummEngine_v100he::executeOpcode(byte i) {
+	OpcodeProcV100he op = _opcodesV100he[i].proc;
+	(this->*op) ();
+}
+
+const char *ScummEngine_v100he::getOpcodeDesc(byte i) {
+	return _opcodesV100he[i].desc;
+}
+
+void ScummEngine_v100he::o100_actorOps() {
+	Actor *a;
+	int i, j, k;
+	int args[32];
+	byte b;
+	byte string[256];
+
+	b = fetchScriptByte();
+	if (b == 129) {
+		_curActor = pop();
+		return;
+	}
+
+	a = derefActorSafe(_curActor, "o72_actorOps");
+	if (!a)
+		return;
+
+	switch (b) {
+	case 3:
+		pop();
+		pop();
+		pop();
+		break;
+	case 4:		// SO_ANIMATION_SPEED
+		a->setAnimSpeed(pop());
+		break;
+	case 6:
+		i = pop();
+		j = pop();
+		a->putActor(i, j, a->room);
+		break;
+	case 8:
+		a->drawToBackBuf = false;
+		a->needRedraw = true;
+		a->needBgReset = true;
+		break;
+	case 9:		
+		{
+			int top_actor = a->top;
+			int bottom_actor = a->bottom;
+			a->drawToBackBuf = true;
+			a->needRedraw = true;
+			a->drawActorCostume();
+			a->drawToBackBuf = false;
+			a->needRedraw = true;
+			a->drawActorCostume();
+			a->needRedraw = false;
+
+			if (a->top > top_actor)
+				a->top = top_actor;
+			if (a->bottom < bottom_actor)
+				a->bottom = bottom_actor;
+
+		}
+		break;
+	case 14:
+		a->charset = pop();
+		break;
+	case 18:
+	case 128:
+		_actorClipOverride.bottom = pop();
+		_actorClipOverride.right = pop();
+		_actorClipOverride.top = pop();
+		_actorClipOverride.left = pop();
+		break;
+	case 22:
+		k = getStackList(args, ARRAYSIZE(args));
+		for (i = 0; i < k; ++i) {
+			a->setUserCondition(args[i] & 0x7F, args[i] & 0x80);
+		}
+		debug(1,"o72_actorOps: case 21 (%d)", k);
+		break;
+	case 25:		// SO_COSTUME
+		a->setActorCostume(pop());
+		break;
+	case 27:		// SO_DEFAULT
+		a->initActor(0);
+		break;
+	case 52:		// SO_ACTOR_NAME
+		copyScriptString(string);
+		loadPtrToResource(rtActorName, a->number, string);
+		break;
+	case 53:		// SO_ACTOR_NEW
+		a->initActor(2);
+		break;
+	case 57:		// SO_PALETTE
+		j = pop();
+		i = pop();
+		checkRange(255, 0, i, "Illegal palette slot %d");
+		a->remapActorPaletteColor(i, j);
+		break;
+	case 59:
+		// Uses reverse order of layering, so we adjust
+		a->_layer = -pop();
+		break;
+	case 63:
+		a->transparency = pop();
+		break;
+	case 65:		// SO_SCALE
+		i = pop();
+		a->setScale(i, i);
+		break;
+	case 70:		// SO_SHADOW
+		a->_shadowMode = pop();
+		debug(0, "Set actor XMAP idx to %d", a->_shadowMode);
+		break;
+	case 74:		// SO_STEP_DIST
+		j = pop();
+		i = pop();
+		a->setActorWalkSpeed(i, j);
+		break;
+	case 78:
+		{
+		copyScriptString(string);
+		int slot = pop();
+
+		int len = resStrLen(string) + 1;
+		addMessageToStack(string, a->talkQueue[slot].sentence, len);
+
+		a->talkQueue[slot].posX = a->talkPosX;
+		a->talkQueue[slot].posY = a->talkPosY;
+		a->talkQueue[slot].color = a->talkColor;
+		}
+		break;
+	case 83:		// SO_ACTOR_VARIABLE
+		i = pop();
+		a->setAnimVar(pop(), i);
+		break;
+	case 87:		// SO_ALWAYS_ZCLIP
+		a->forceClip = pop();
+		break;
+	case 89:		// SO_NEVER_ZCLIP
+		a->forceClip = 0;
+		break;
+	case 130:		// SO_SOUND
+		k = getStackList(args, ARRAYSIZE(args));
+		for (i = 0; i < k; i++)
+			a->sound[i] = args[i];
+		break;
+	case 131:		// SO_ACTOR_WIDTH
+		a->width = pop();
+		break;
+	case 132:		// SO_ANIMATION_DEFAULT
+		a->_initFrame = 1;
+		a->_walkFrame = 2;
+		a->_standFrame = 3;
+		a->_talkStartFrame = 4;
+		a->_talkStopFrame = 5;
+		break;
+	case 133:		// SO_ELEVATION
+		a->setElevation(pop());
+		break;
+	case 134:		// SO_FOLLOW_BOXES
+		a->ignoreBoxes = 0;
+		a->forceClip = 0;
+		if (a->isInCurrentRoom())
+			a->putActor(a->_pos.x, a->_pos.y, a->room);
+		break;
+	case 135:		// SO_IGNORE_BOXES
+		a->ignoreBoxes = 1;
+		a->forceClip = 0;
+		if (a->isInCurrentRoom())
+			a->putActor(a->_pos.x, a->_pos.y, a->room);
+		break;
+	case 136:		// SO_ACTOR_IGNORE_TURNS_OFF
+		a->ignoreTurns = false;
+		break;
+	case 137:		// SO_ACTOR_IGNORE_TURNS_ON
+		a->ignoreTurns = true;
+		break;
+	case 138:		// SO_INIT_ANIMATION
+		a->_initFrame = pop();
+		break;
+	case 139:		// SO_STAND_ANIMATION
+		a->_standFrame = pop();
+		break;
+	case 140:		// SO_TALK_ANIMATION
+		a->_talkStopFrame = pop();
+		a->_talkStartFrame = pop();
+		break;
+	case 141:		// SO_TALK_COLOR
+		a->talkColor = pop();
+		break;
+	case 142:
+		k = pop();
+		a->talkUnk = 1;
+		a->setTalkCondition(k);
+		debug(1,"o72_actorOps: case 24 (%d)", k);
+		break;
+	case 143:		// SO_TEXT_OFFSET
+		a->talkPosY = pop();
+		a->talkPosX = pop();
+		break;
+	case 144:		// SO_WALK_ANIMATION
+		a->_walkFrame = pop();
+		break;
+	default:
+		error("o100_actorOps: default case %d", b);
+	}
+}
+
+void ScummEngine_v100he::o100_arrayOps() {
+	byte subOp = fetchScriptByte();
+	int array = fetchScriptWord();
+	int offs, tmp, tmp2, tmp3;
+	int dim1end, dim1start, dim2end, dim2start;
+	int id, len, b, c;
+	ArrayHeader *ah;
+	int list[128];
+	byte string[2048];
+
+	debug(1,"o100_arrayOps: case %d", subOp);
+	switch (subOp) {
+	case 35:			// SO_ASSIGN_STRING
+		decodeScriptString(string);
+		len = resStrLen(string) + 1;
+		ah = defineArray(array, kStringArray, 0, 0, 0, len);
+		memcpy(ah->data, string, len);
+		break;
+
+
+	case 77:			// SO_ASSIGN_STRING
+		copyScriptString(string);
+		len = resStrLen(string) + 1;
+		ah = defineArray(array, kStringArray, 0, 0, 0, len);
+		memcpy(ah->data, string, len);
+		break;
+
+	case 128:		// SO_ASSIGN_2DIM_LIST
+		len = getStackList(list, ARRAYSIZE(list));
+		id = readVar(array);
+		if (id == 0)
+			error("Must DIM a two dimensional array before assigning");
+		c = pop();
+		while (--len >= 0) {
+			writeArray(array, c, len, list[len]);
+		}
+		break;
+	case 129:		// SO_ASSIGN_INT_LIST
+		b = pop();
+		c = pop();
+		id = readVar(array);
+		if (id == 0) {
+			defineArray(array, kDwordArray, 0, 0, 0, b + c);
+		}
+		while (c--) {
+			writeArray(array, 0, b + c, pop());
+		}
+		break;
+
+	case 130:
+		len = getStackList(list, ARRAYSIZE(list));
+		dim1end = pop();
+		dim1start = pop();
+		dim2end = pop();
+		dim2start = pop();
+		id = readVar(array);
+		if (id == 0) {
+			defineArray(array, kDwordArray, dim2start, dim2end, dim1start, dim1end);
+		}
+		tmp2 = len;
+		while (dim2start <= dim2end) {
+			tmp = dim1start;
+			while (tmp <= dim1end) {
+				writeArray(array, dim2start, tmp, list[--tmp2]);
+				if (tmp2 == 0)
+					tmp2 = len;
+				tmp++;
+			}
+			dim2start++;
+		}
+		break;
+	case 131:
+		{
+		// TODO
+		// Array copy and cat?
+		//Array1
+		dim1end = pop();
+		dim1start = pop();
+		dim2end = pop();
+		dim2start = pop();
+		//Array2
+		array = fetchScriptWord();
+		dim1end = pop();
+		dim1start = pop();
+		dim2end = pop();
+		dim2start = pop();
+		}
+		break;
+	case 133:
+		b = pop();
+		c = pop();
+		dim1end = pop();
+		dim1start = pop();
+		dim2end = pop();
+		dim2start = pop();
+		id = readVar(array);
+		if (id == 0) {
+			defineArray(array, kDwordArray, dim2start, dim2end, dim1start, dim1end);
+		}
+
+		len = c - b;
+		len |= dim2end;
+		len = len - dim2end + 1;
+		offs = (b >= c) ? 1 : -1;
+		tmp2 = c;
+		tmp3 = len;
+		while (dim2start <= dim2end) {
+			tmp = dim1start;
+			while (tmp <= dim1end) {
+				writeArray(array, dim2start, tmp, tmp2);
+				if (--tmp3 == 0) {
+					tmp2 = c;
+					tmp3 = len;
+				} else {
+					tmp2 += offs;
+				}
+				tmp++;
+			}
+			dim2start++;
+		}
+		break;
+	default:
+		error("o100_arrayOps: default case %d (array %d)", subOp, array);
+	}
+}
+
+void ScummEngine_v100he::o100_dim2dimArray() {
+	int a, b, data;
+	int type = fetchScriptByte();
+	switch (type) {
+	case 41:		// SO_BIT_ARRAY
+		data = kBitArray;
+		break;
+	case 42:		// SO_NIBBLE_ARRAY
+		data = kNibbleArray;
+		break;
+	case 43:		// SO_BYTE_ARRAY
+		data = kByteArray;
+		break;
+	case 44:		// SO_INT_ARRAY
+		data = kIntArray;
+		break;
+	case 45:		
+		data = kDwordArray;
+		break;
+	case 77:		// SO_STRING_ARRAY
+		data = kStringArray;
+		break;
+	default:
+		error("o100_dim2dimArray: default case %d", type);
+	}
+
+	b = pop();
+	a = pop();
+	defineArray(fetchScriptWord(), data, 0, a, 0, b);
+}
+
+void ScummEngine_v100he::o100_dimArray() {
+	int data;
+	int type = fetchScriptByte();
+
+	switch (type) {
+	case 41:		// SO_BIT_ARRAY
+		data = kBitArray;
+		break;
+	case 42:		// SO_NIBBLE_ARRAY
+		data = kNibbleArray;
+		break;
+	case 43:		// SO_BYTE_ARRAY
+		data = kByteArray;
+		break;
+	case 44:		// SO_INT_ARRAY
+		data = kIntArray;
+		break;
+	case 45:
+		data = kDwordArray;
+		break;
+	case 77:		// SO_STRING_ARRAY
+		data = kStringArray;
+		break;
+	case 135:		// SO_UNDIM_ARRAY
+		nukeArray(fetchScriptWord());
+		return;
+	default:
+		error("o100_dimArray: default case %d", type);
+	}
+
+	defineArray(fetchScriptWord(), data, 0, 0, 0, pop());
+}
+
+void ScummEngine_v100he::o100_drawObject() {
+	byte subOp = fetchScriptByte();
+	int state = 0, y = -1, x = -1;
+
+	switch (subOp) {
+	case 6:
+		state = 1;
+		y = pop();
+		x = pop();
+		break;
+	case 7:
+		state = pop();
+		y = pop();
+		x = pop();
+		break;
+	case 40:
+		state = pop();
+		if (state == 0)
+			state = 1;
+		break;
+	default:
+		error("o100_drawObject: default case %d", subOp);
+	}
+
+	int object = pop();
+	int objnum = getObjectIndex(object);
+	if (objnum == -1)
+		return;
+
+	if (y != -1 && x != -1) {
+		_objs[objnum].x_pos = x * 8;
+		_objs[objnum].y_pos = y * 8;
+	}
+
+	if (state != -1) {
+		addObjectToDrawQue(objnum);
+		putState(object, state);
+	}
+}
+
+void ScummEngine_v100he::o100_unknown28() {
+	// Incomplete
+	byte subOp = fetchScriptByte();
+
+	switch (subOp) {
+	case 0:
+		pop();
+		break;
+	case 6:
+		pop();
+		pop();
+		break;
+	case 18:
+		pop();
+		pop();
+		pop();
+		pop();
+		break;
+	case 53:
+		break;
+	default:
+		error("o100_unknown28: Unknown case %d", subOp);
+	}
+	debug(1,"o100_unknown28 stub (%d)", subOp);
+}
+
+void ScummEngine_v100he::o100_resourceRoutines() {
+	// Incomplete
+	int resid, op;
+	op = fetchScriptByte();
+
+	switch (op) {
+	case 14:
+		// charset
+		resid = pop();
+		break;
+	case 25:
+		// costume
+		resid = pop();
+		break;
+	case 34:
+		// flobject
+		resid = pop();
+		break;
+	case 40:
+		// image
+		resid = pop();
+		break;
+	case 62:
+		// room
+		resid = pop();
+		break;
+	case 66:
+		// script
+		resid = pop();
+		break;
+	case 72:
+		// sound
+		resid = pop();
+		break;
+	case 128:
+		// lock
+		break;
+	default:
+		debug(1,"o100_resourceRoutines: default case %d", op);
+	}
+}
+
+void ScummEngine_v100he::o100_wizImageOps() {
+	// Incomplete
+	byte subOp = fetchScriptByte();
+
+	switch (subOp) {
+	case 0:
+		_wizParams.img.resNum = pop();
+		_wizParams.processMode = 0;
+		_wizParams.processFlags = 0;
+		_wizParams.remapPos = 0;
+		_wizParams.img.flags = 0;
+		break;
+	case 6:
+		_wizParams.processFlags |= 1;
+		_wizParams.img.y1 = pop();
+		_wizParams.img.x1 = pop();
+		break;
+	case 29:
+		_wizParams.processMode = 1;
+		break;
+	case 39:
+		_wizParams.processFlags |= 0x40;
+		pop();
+		break;
+	case 53:
+		_wizParams.processMode = 8;
+		break;
+	case 55:
+		_wizParams.img.flags = pop();
+		_wizParams.img.state = pop();
+		_wizParams.img.y1 = pop();
+		_wizParams.img.x1 = pop();
+		_wizParams.img.resNum = pop();
+		displayWizImage(&_wizParams.img);
+		break;
+	case 67:
+		_wizParams.processFlags |= 0x20;
+		_wizParams.img.flags = pop();
+		break;
+	case 84:
+		_wizParams.processFlags |= 0x20;
+		_wizParams.img.flags = pop();
+		break;
+	case 92:
+		processWizImage(&_wizParams);
+		break;
+	case 135:
+		_wizParams.processFlags |= 0x10000;
+		pop();
+		break;
+	default:
+		error("o100_wizImageOps: Unknown case %d", subOp);
+	}
+	debug(1,"o100_wizImageOps stub (%d)", subOp);
+}
+
+void ScummEngine_v100he::o100_dim2dim2Array() {
+	int data, dim1start, dim1end, dim2start, dim2end;
+	int type = fetchScriptByte();
+
+	switch (type) {
+	case 41:		// SO_BIT_ARRAY
+		data = kBitArray;
+		break;
+	case 42:		// SO_NIBBLE_ARRAY
+		data = kNibbleArray;
+		break;
+	case 43:		// SO_BYTE_ARRAY
+		data = kByteArray;
+		break;
+	case 44:		// SO_INT_ARRAY
+		data = kIntArray;
+		break;
+	case 45:
+		data = kDwordArray;
+		break;
+	case 77:		// SO_STRING_ARRAY
+		data = kStringArray;
+		break;
+	default:
+		error("o90_dim2dim2Array: default case %d", type);
+	}
+
+	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_v100he::o100_paletteOps() {
+	byte subOp = fetchScriptByte();
+	switch (subOp) {
+	case 0:
+		_hePaletteNum = pop();
+		break;
+	case 20:
+		pop();
+		pop();
+		pop();
+		pop();
+		pop();
+		break;
+	case 25:
+		pop();
+		break;
+	case 40:
+		pop();
+		pop();
+		break;
+	case 53:
+		break;
+	case 57:
+		pop();
+		break;
+	case 63:
+		pop();
+		pop();
+		break;
+	case 81:
+		pop();
+		pop();
+		pop();
+		break;
+	case 92:
+		_hePaletteNum = 0;
+		break;
+	default:
+		error("o100_paletteOps: Unknown case %d", subOp);
+	}
+	debug(0,"o100_paletteOps stub (%d)", subOp);
+}
+
+void ScummEngine_v100he::o100_roomOps() {
+	int a, b, c, d, e;
+	byte op;
+	byte filename[100];
+
+	op = fetchScriptByte();
+
+	switch (op) {
+	case 63:		// SO_ROOM_PALETTE
+		d = pop();
+		c = pop();
+		b = pop();
+		a = pop();
+		setPalColor(d, a, b, c);
+		break;
+
+	case 129:
+		b = pop();
+		a = pop();
+		swapObjects(a, b);
+		break;
+
+	case 130:
+		a = pop();
+		b = pop();
+		copyPalColor(a, b);
+		break;
+
+	case 131:		// SO_ROOM_FADE
+		// Defaults to 1 but doesn't use fade effects
+		a = pop();
+		break;
+
+	case 132:		// SO_ROOM_INTENSITY
+		c = pop();
+		b = pop();
+		a = pop();
+		darkenPalette(a, a, a, b, c);
+		break;
+
+	case 133:		// SO_RGB_ROOM_INTENSITY
+		e = pop();
+		d = pop();
+		c = pop();
+		b = pop();
+		a = pop();
+		darkenPalette(a, b, c, d, e);
+		break;
+
+	case 134:		// SO_ROOM_NEW_PALETTE
+		a = pop();
+		setPalette(a, _roomResource);
+		break;
+
+	case 135:
+		b = pop();
+		a = pop();
+		setPalette(a, b);
+		break;
+
+	case 136:		// SO_ROOM_SAVEGAME
+		_saveTemporaryState = true;
+		_saveLoadSlot = pop();
+		_saveLoadFlag = pop();
+		break;
+
+	case 137:
+		copyScriptString(filename);
+		_saveLoadFlag = pop();
+		_saveLoadSlot = 1;
+		_saveTemporaryState = true;
+		break;
+
+	case 138:		// SO_ROOM_SCREEN
+		b = pop();
+		a = pop();
+		initScreens(a, _screenHeight);
+		break;
+
+	case 139:		// SO_ROOM_SCROLL
+		b = pop();
+		a = pop();
+		if (a < (_screenWidth / 2))
+			a = (_screenWidth / 2);
+		if (b < (_screenWidth / 2))
+			b = (_screenWidth / 2);
+		if (a > _roomWidth - (_screenWidth / 2))
+			a = _roomWidth - (_screenWidth / 2);
+		if (b > _roomWidth - (_screenWidth / 2))
+			b = _roomWidth - (_screenWidth / 2);
+		VAR(VAR_CAMERA_MIN_X) = a;
+		VAR(VAR_CAMERA_MAX_X) = b;
+		break;
+
+	default:
+		error("o100_roomOps: default case %d", op);
+	}
+}
+
+void ScummEngine_v100he::o100_startSound() {
+	byte op;
+	op = fetchScriptByte();
+
+	debug(0, "o100_startSound invalid case %d", op);
+	switch (op) {
+	case 6:
+		_heSndLoop |= 16;
+		pop();
+		break;
+	case 92:
+		_sound->addSoundToQueue(_heSndSoundId, _heSndOffset);
+		break;
+	case 128:
+		_heSndLoop |= 2;
+		break;
+	case 129:
+		_heSndChannel = pop();
+		break;
+	case 130:
+		_heSndLoop |= 40;
+		pop();
+		break;
+	case 131:
+		_heSndLoop |= 4;
+		break;
+	case 132:
+	case 134:
+		_heSndSoundId = pop();
+		_heSndOffset = 0;
+		_heSndSoundFreq = 11025;
+		_heSndChannel = VAR(VAR_MUSIC_CHANNEL);
+		break;
+	case 133:
+		_heSndLoop |= 80;
+		pop();
+		break;
+	case 135:
+		_heSndLoop |= 4;
+		break;
+	case 136:
+		_heSndLoop |= 20;
+		pop();
+		break;
+	default:
+		error("o100_startSound invalid case %d", op);
+	}
+}
+
+void ScummEngine_v100he::o100_unknown26() {
+	// Incomplete
+	int args[16];
+	byte subOp = fetchScriptByte();
+
+	switch (subOp) {
+	case 0:
+		pop();
+		pop();
+		break;
+	case 3:
+		pop();
+		break;
+	case 6:
+		pop();
+		pop();
+		break;
+	case 16:
+		getStackList(args, ARRAYSIZE(args));
+		break;
+	case 38:
+		pop();
+		break;
+	case 40:
+		pop();
+		break;
+	case 53:
+		break;
+	case 57:
+		pop();
+		break;
+	case 59:
+		pop();
+		break;
+	case 60:
+		pop();
+		pop();
+		break;
+	case 61:
+		break;
+	case 73:
+		pop();
+		break;
+	case 82:
+		pop();
+		break;
+	default:
+		error("o90_unknown26: Unknown case %d", subOp);
+	}
+	debug(1,"o100_unknown26 stub (%d)", subOp);
+}
+
+void ScummEngine_v100he::o100_quitPauseRestart() {
+	byte subOp = fetchScriptByte();
+	subOp -= 61;
+
+	switch (subOp) {
+	case 67:
+		clearDrawObjectQueue();
+		break;
+	case 75:
+		// Clear screen
+		// Update palette
+		break;
+	default:
+		error("o100_quitPauseRestart invalid case %d", subOp);
+	}
+}
+
+void ScummEngine_v100he::o100_cursorCommand() {
+	int a, i;
+	int args[16];
+	byte subOp = fetchScriptByte();
+
+	switch (subOp) {
+	case 0xE:		// SO_CHARSET_SET
+		initCharset(pop());
+		break;
+	case 0xF:		// SO_CHARSET_COLOR
+		getStackList(args, ARRAYSIZE(args));
+		for (i = 0; i < 16; i++)
+			_charsetColorMap[i] = _charsetData[_string[1]._default.charset][i] = (unsigned char)args[i];
+		break;
+
+	case 0x80:
+		a = pop();
+		loadWizCursor(a, rtInventory, 0);
+		break;
+	case 0x81:
+		a = pop();
+		loadWizCursor(a, rtInventory, 0);
+		break;
+	case 0x82:
+		pop();
+		a = pop();
+		loadWizCursor(a, rtInventory, 1);
+		break;
+	case 0x86:		// SO_CURSOR_ON Turn cursor on
+		_cursor.state = 1;
+		break;
+	case 0x87:		// SO_CURSOR_OFF Turn cursor off
+		_cursor.state = 0;
+		break;
+	case 0x88:		// SO_USERPUT_ON
+		_userPut = 1;
+		break;
+	case 0x89:		// SO_USERPUT_OFF
+		_userPut = 0;
+		break;
+	case 0x8A:		// SO_CURSOR_SOFT_ON Turn soft cursor on
+		_cursor.state++;
+		if (_cursor.state > 1)
+			error("Cursor state greater than 1 in script");
+		break;
+	case 0x8B:		// SO_CURSOR_SOFT_OFF Turn soft cursor off
+		_cursor.state--;
+		break;
+	case 0x8C:		// SO_USERPUT_SOFT_ON
+		_userPut++;
+		break;
+	case 0x8D:		// SO_USERPUT_SOFT_OFF
+		_userPut--;
+		break;
+	default:
+		warning("o100_cursorCommand: default case %x", subOp);
+	}
+
+	VAR(VAR_CURSORSTATE) = _cursor.state;
+	VAR(VAR_USERPUT) = _userPut;
+}
+
+void ScummEngine_v100he::o100_wait() {
+	int actnum;
+	int offs = -2;
+	Actor *a;
+	byte subOp = fetchScriptByte();
+
+	switch (subOp) {
+	case 128:		// SO_WAIT_FOR_ACTOR Wait for actor
+		offs = fetchScriptWordSigned();
+		actnum = pop();
+		a = derefActor(actnum, "o6_wait:168");
+		if (a->moving)
+			break;
+		return;
+	case 129:		// SO_WAIT_FOR_CAMERA Wait for camera
+		if (camera._cur.x / 8 != camera._dest.x / 8)
+			break;
+		return;
+	case 130:		// SO_WAIT_FOR_MESSAGE Wait for message
+		if (VAR(VAR_HAVE_MSG))
+			break;
+		return;
+	case 131:		// SO_WAIT_FOR_SENTENCE
+		if (_sentenceNum) {
+			if (_sentence[_sentenceNum - 1].freezeCount && !isScriptInUse(VAR(VAR_SENTENCE_SCRIPT)))
+				return;
+			break;
+		}
+		if (!isScriptInUse(VAR(VAR_SENTENCE_SCRIPT)))
+			return;
+		break;
+	default:
+		error("o100_wait: default case 0x%x", subOp);
+	}
+
+	_scriptPointer += offs;
+	o6_breakHere();
+}
+
+void ScummEngine_v100he::o100_unknown25() {
+	// Incomplete
+	int args[16];
+
+	byte subOp = fetchScriptByte();
+	subOp -= 3;
+
+	switch (subOp) {
+	case 30:
+		getStackList(args, ARRAYSIZE(args));
+		pop();
+		pop();
+		pop();
+		pop();
+		break;
+	case 36:
+		pop();
+		break;
+	case 37:
+		pop();
+		break;
+	case 81:
+		pop();
+		break;	default:
+		error("o100_unknown25: Unknown case %d", subOp);
+	}
+	push(0);
+	debug(1,"o100_unknown25 stub (%d)", subOp);
+}
+
+void ScummEngine_v100he::decodeParseString(int m, int n) {
+	byte b, *ptr;
+	int i, color, size;
+	int args[31];
+	byte name[1024];
+
+	b = fetchScriptByte();
+
+	switch (b) {
+	case 6:		// SO_AT
+		_string[m].ypos = pop();
+		_string[m].xpos = pop();
+		_string[m].overhead = false;
+		break;
+	case 12:		// SO_CENTER
+		_string[m].center = true;
+		_string[m].overhead = false;
+		break;
+	case 18:		// SO_CLIPPED
+		_string[m].right = pop();
+		break;
+	case 20:		// SO_COLOR
+		_string[m].color = pop();
+		break;
+	case 21:
+		color = pop();
+		if (color == 1) {
+			_string[m].color = pop();
+		} else {	
+			push(color);
+			getStackList(args, ARRAYSIZE(args));
+			for (i = 0; i < 16; i++)
+				_charsetColorMap[i] = _charsetData[_string[1]._default.charset][i] = (unsigned char)args[i];
+			_string[m].color = color;
+		}
+		break;
+	case 35:
+		decodeScriptString(name, true);
+		switch (m) {
+		case 0:
+			actorTalk(name);
+			break;
+		case 1:
+			drawString(1, name);
+			break;
+		case 2:
+			unkMessage1(name);
+			break;
+		case 3:
+			unkMessage2(name);
+			break;
+		}
+		break;
+	case 46:		// SO_LEFT
+		_string[m].center = false;
+		_string[m].overhead = false;
+		break;
+	case 51:		// SO_MUMBLE
+		_string[m].no_talk_anim = true;
+		break;
+	case 56:		// SO_OVERHEAD
+		_string[m].overhead = true;
+		_string[m].no_talk_anim = false;
+		break;
+	case 78:
+		ptr = getResourceAddress(rtTalkie, pop());
+		size = READ_BE_UINT32(ptr + 12);
+		memcpy(name, ptr + 16, size);
+
+		switch (m) {
+		case 0:
+			actorTalk(name);
+			break;
+		case 1:
+			drawString(1, name);
+			break;
+		case 2:
+			unkMessage1(name);
+			break;
+		case 3:
+			unkMessage2(name);
+			break;
+		}
+		break;
+	case 79:		// SO_TEXTSTRING
+		switch (m) {
+		case 0:
+			actorTalk(_scriptPointer);
+			break;
+		case 1:
+			drawString(1, _scriptPointer);
+			break;
+		case 2:
+			unkMessage1(_scriptPointer);
+			break;
+		case 3:
+			unkMessage2(_scriptPointer);
+			break;
+		}
+		_scriptPointer += resStrLen(_scriptPointer) + 1;
+
+		break;
+	case 91:
+		_string[m].loadDefault();
+		if (n)
+			_actorToPrintStrFor = pop();
+		break;
+	case 92:
+		_string[m].saveDefault();
+		break;
+	default:
+		error("decodeParseString: default case %d", b);
+	}
+}
+
+} // End of namespace Scumm
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index 0a1cd91854..8d5906754b 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -793,7 +793,7 @@ void ScummEngine_v72he::o72_getTimer() {
 	int timer = pop();
 	int cmd = fetchScriptByte();
 
-	if (cmd == 10) {
+	if (cmd == 10 || cmd == 50) {
 		checkRange(3, 1, timer, "o72_getTimer: Timer %d out of range(%d)");
 		int diff = _system->getMillis() - _timers[timer];
 		push(diff);
@@ -806,7 +806,7 @@ void ScummEngine_v72he::o72_setTimer() {
 	int timer = pop();
 	int cmd = fetchScriptByte();
 
-	if (cmd == 158) {
+	if (cmd == 158 || cmd == 61) {
 		checkRange(3, 1, timer, "o72_setTimer: Timer %d out of range(%d)");
 		_timers[timer] = _system->getMillis();
 	} else {
@@ -850,16 +850,19 @@ void ScummEngine_v72he::o72_drawObject() {
 	int state = 0, y = -1, x = -1;
 
 	switch (subOp) {
+	case 6:
 	case 62:
 		state = pop();
 		y = pop();
 		x = pop();
 		break;
+	case 7:
 	case 63:
 		state = pop();
 		if (state == 0)
 			state = 1;
 		break;
+	case 40:
 	case 65:
 		state = 1;
 		y = pop();
@@ -2337,12 +2340,14 @@ void ScummEngine_v72he::o72_readINI() {
 	type = fetchScriptByte();
 
 	switch (type) {
+	case 43: // HE 100
 	case 6: // number
 		if (!strcmp((char *)option, "NoPrinting"))
 			push(1);
 		else
 			push(0);
 		break;
+	case 77: // HE 100
 	case 7: // string
 		writeVar(0, 0);
 		defineArray(0, kStringArray, 0, 0, 0, 0);
@@ -2363,11 +2368,13 @@ void ScummEngine_v72he::o72_writeINI() {
 	type = fetchScriptByte();
 
 	switch (type) {
+	case 43: // HE 100
 	case 6: // number
 		value = pop();
 		copyScriptString(option);
 		debug(1,"o72_writeINI: %s set to %d", option, value);
 		break;
+	case 77: // HE 100
 	case 7: // string
 		copyScriptString(string);
 		copyScriptString(option);
@@ -2472,6 +2479,7 @@ void ScummEngine_v72he::o72_getResourceSize() {
 		break;
 	default:
 		warning("o72_getResourceSize: default type %d", subOp);
+		push(0);
 		return;
 	}
 
diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp
index 566f55ba60..d039a03d53 100644
--- a/scumm/script_v7he.cpp
+++ b/scumm/script_v7he.cpp
@@ -916,6 +916,8 @@ void ScummEngine_v70he::o70_polygonOps() {
 	int fromId, toId;
 
 	switch (b) {
+	case 68: // HE 100
+	case 69: // HE 100
 	case 246:
 	case 248:
 		vert4y = pop();
@@ -928,9 +930,10 @@ void ScummEngine_v70he::o70_polygonOps() {
 		vert1x = pop();
 		id = pop();
 
-		polygonStore(id, (b == 248), vert1x, vert1y, vert2x, vert2y, vert3x, vert3y, 
+		polygonStore(id, (b == 69 || b == 248), vert1x, vert1y, vert2x, vert2y, vert3x, vert3y, 
 					 vert4x, vert4y);
 		break;
+	case 28: // HE 100
 	case 247:
 		toId = pop();
 		fromId = pop();
diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp
index 33a14c975d..8b8895baae 100644
--- a/scumm/script_v80he.cpp
+++ b/scumm/script_v80he.cpp
@@ -502,6 +502,9 @@ void ScummEngine_v80he::o80_cursorCommand() {
 	int args[16];
 	int subOp = fetchScriptByte();
 
+	if (_heversion == 100)
+		subOp += 5;
+
 	switch (subOp) {
 	case 0x13: // Loads cursors from another resource
 		a = pop();
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 9467c16e32..c5d5dbd394 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -337,7 +337,7 @@ static const ScummGameSettings scumm_settings[] = {
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
 
 	// Humongous Entertainment Scumm Version ?
-	{"ff5demo", "Freddi Fish 5: The Case of the Creature of Coral Cave (Demo)", GID_HEGAME, 6, 99, MDT_NONE,
+	{"ff5demo", "Freddi Fish 5: The Case of the Creature of Coral Cave (Demo)", GID_HEGAME, 6, 100, MDT_NONE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
 	{"freddicove", "Freddi Fish 5: The Case of the Creature of Coral Cave", GID_HEGAME, 6, 99, MDT_NONE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, 0, 0},
@@ -364,6 +364,14 @@ static const ScummGameSettings scumm_settings[] = {
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
 	{"Football2002", "Backyard Football 2002 (Demo)", GID_HEGAME, 6, 99, MDT_NONE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
+
+	// Humongous Entertainment Scumm Version ?
+	{"PuttTTT", "Putt-Putt Travels Through Time *updated)", GID_HEGAME, 6, 100, MDT_NONE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
+	{"SamsFunShop", "Pajama Sam's One-Stop Fun Shop", GID_HEGAME, 6, 100, MDT_NONE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
+
+
 #endif
 	{NULL, NULL, 0, 0, 0, MDT_NONE, 0, 0, 0}
 };
@@ -404,7 +412,7 @@ static const ScummGameSettings he_md5_settings[] = {
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
 	{"0ab19be9e2a3f6938226638b2a3744fe", "Putt-Putt Travels Through Time (updated Demo)", GID_HEGAME, 6, 98, MDT_NONE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
-	{"3de99ef0523f8ca7958faa3afccd035a", "Spyfox 1: Dry Cereal (Updated)", GID_HEGAME, 6, 98, MDT_NONE,
+	{"3de99ef0523f8ca7958faa3afccd035a", "Spyfox 1: Dry Cereal (Updated)", GID_HEGAME, 6, 100, MDT_NONE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
 	{"9d4ab3e0e1d1ebc6ba8a6a4c470ed184", "Spyfox 1: Dry Cereal (Updated Demo)", GID_HEGAME, 6, 98, MDT_NONE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
@@ -2833,6 +2841,9 @@ Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) {
 	case 6:
 		switch (game.heversion) {
 #ifndef __PALM_OS__
+		case 100:
+			engine = new ScummEngine_v100he(detector, syst, game, md5sum);
+			break;
 		case 90:
 		case 98:
 		case 99: