ILLUSIONS: Refactor code in preparation for the Duckman engine

1 files changed, 0 insertions, 738 deletions

diff --git a/engines/illusions/scriptopcodes.cpp b/engines/illusions/scriptopcodes.cpp
index a551bdfcae..c8817f6aca 100644
--- a/engines/illusions/scriptopcodes.cpp
+++ b/engines/illusions/scriptopcodes.cpp
@@ -22,16 +22,7 @@
 
 #include "illusions/illusions.h"
 #include "illusions/scriptopcodes.h"
-#include "illusions/actor.h"
-#include "illusions/camera.h"
-#include "illusions/dictionary.h"
-#include "illusions/input.h"
-#include "illusions/screen.h"
-#include "illusions/scriptman.h"
-#include "illusions/scriptresource.h"
 #include "illusions/scriptthread.h"
-#include "illusions/specialcode.h"
-#include "illusions/talkresource.h"
 
 namespace Illusions {
 
@@ -75,733 +66,4 @@ void ScriptOpcodes::execOpcode(ScriptThread *scriptThread, OpCall &opCall) {
 	(*_opcodes[opCall._op])(scriptThread, opCall);
 }
 
-typedef Common::Functor2Mem<ScriptThread*, OpCall&, void, ScriptOpcodes> ScriptOpcodeI;
-#define OPCODE(op, func) \
-	_opcodes[op] = new ScriptOpcodeI(this, &ScriptOpcodes::func); \
-	_opcodeNames[op] = #func;
-
-void ScriptOpcodes::initOpcodes() {
-	// First clear everything
-	for (uint i = 0; i < 256; ++i)
-		_opcodes[i] = 0;
-	// Register opcodes
-	OPCODE(2, opSuspend);
-	OPCODE(3, opYield);
-	OPCODE(4, opTerminate);
-	OPCODE(5, opJump);
-	OPCODE(6, opStartScriptThread);
-	OPCODE(8, opStartTempScriptThread);
-	OPCODE(9, opStartTimerThread);
-	OPCODE(14, opSetThreadSceneId);
-	OPCODE(15, opEndTalkThreads);
-	OPCODE(16, opLoadResource);
-	OPCODE(17, opUnloadResource);
-	OPCODE(20, opEnterScene);
-	OPCODE(25, opChangeScene);
-	OPCODE(26, opStartModalScene);
-	OPCODE(27, opExitModalScene);
-	OPCODE(30, opEnterCloseUpScene);
-	OPCODE(31, opExitCloseUpScene);
-	OPCODE(32, opPanCenterObject);
-	OPCODE(34, opPanToObject);
-	OPCODE(35, opPanToNamedPoint);
-	OPCODE(36, opPanToPoint);
-	OPCODE(37, opPanStop);
-	OPCODE(39, opSetDisplay);
-	OPCODE(42, opIncBlockCounter);
-	OPCODE(43, opClearBlockCounter);
-	OPCODE(45, opSetProperty);
-	OPCODE(46, opPlaceActor);
-	OPCODE(47, opFaceActor);
-	OPCODE(48, opFaceActorToObject);	
-	OPCODE(49, opStartSequenceActor);
-	OPCODE(51, opStartMoveActor);
-	OPCODE(53, opSetActorToNamedPoint);
-	OPCODE(56, opStartTalkThread);
-	OPCODE(57, opAppearActor);
-	OPCODE(58, opDisappearActor);
-	OPCODE(60, opActivateObject);
-	OPCODE(61, opDeactivateObject);
-	OPCODE(62, opSetDefaultSequence);
-	OPCODE(63, opSetSelectSfx);
-	OPCODE(64, opSetMoveSfx);
-	OPCODE(65, opSetDenySfx);
-	OPCODE(66, opSetAdjustUpSfx);
-	OPCODE(67, opSetAdjustDnSfx);
-	OPCODE(71, opStartSound);
-	OPCODE(74, opStopSound);
-	OPCODE(75, opStartMusic);
-	OPCODE(76, opStopMusic);
-	OPCODE(78, opStackPushRandom);
-	OPCODE(79, opIfLte);
-	OPCODE(80, opAddMenuChoice);
-	OPCODE(81, opDisplayMenu);
-	OPCODE(82, opSwitchMenuChoice);
-	OPCODE(84, opResetGame);
-	OPCODE(87, opDeactivateButton);
-	OPCODE(88, opActivateButton);
-	OPCODE(103, opJumpIf);
-	OPCODE(104, opIsPrevSceneId);
-	OPCODE(105, opIsCurrentSceneId);
-	OPCODE(106, opIsActiveSceneId);
-	OPCODE(107, opNot);
-	OPCODE(108, opAnd);
-	OPCODE(109, opOr);
-	OPCODE(110, opGetProperty);
-	OPCODE(111, opCompareBlockCounter);
-	OPCODE(126, opDebug126);
-	OPCODE(144, opPlayVideo);
-	OPCODE(146, opStackPop);
-	OPCODE(147, opStackDup);
-	OPCODE(148, opLoadSpecialCodeModule);
-	OPCODE(150, opRunSpecialCode);
-	OPCODE(160, opStopActor);
-	OPCODE(161, opSetActorUsePan);
-	OPCODE(168, opStartAbortableThread);
-	OPCODE(169, opKillThread);
-	OPCODE(175, opSetSceneIdThreadId);
-	OPCODE(176, opStackPush0);
-	OPCODE(177, opSetFontId);
-	OPCODE(178, opAddMenuKey);
-	OPCODE(179, opChangeSceneAll);
-}
-
-#undef OPCODE
-
-void ScriptOpcodes::freeOpcodes() {
-	for (uint i = 0; i < 256; ++i)
-		delete _opcodes[i];
-}
-
-// Opcodes
-
-// Convenience macros
-#define	ARG_SKIP(x) opCall.skip(x); 
-#define ARG_INT16(name) int16 name = opCall.readSint16(); debug(0, "ARG_INT16(" #name " = %d)", name);
-#define ARG_UINT32(name) uint32 name = opCall.readUint32(); debug(0, "ARG_UINT32(" #name " = %08X)", name);
-
-void ScriptOpcodes::opSuspend(ScriptThread *scriptThread, OpCall &opCall) {
-	opCall._result = kTSSuspend;
-}
-
-void ScriptOpcodes::opYield(ScriptThread *scriptThread, OpCall &opCall) {
-	opCall._result = kTSYield;
-}
-
-void ScriptOpcodes::opTerminate(ScriptThread *scriptThread, OpCall &opCall) {
-	opCall._result = kTSTerminate;
-}
-
-void ScriptOpcodes::opJump(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_INT16(jumpOffs);
-	opCall._deltaOfs += jumpOffs;
-}
-
-void ScriptOpcodes::opStartScriptThread(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(threadId);
-	_vm->_scriptMan->startScriptThread(threadId, opCall._threadId,
-		scriptThread->_value8, scriptThread->_valueC, scriptThread->_value10);
-}
-
-void ScriptOpcodes::opStartTempScriptThread(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_INT16(codeOffs);
-	_vm->_scriptMan->startTempScriptThread(opCall._code + codeOffs,
-		opCall._threadId, scriptThread->_value8, scriptThread->_valueC, scriptThread->_value10);
-}
-
-void ScriptOpcodes::opStartTimerThread(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_INT16(isAbortable);
-	ARG_INT16(duration);
-	ARG_INT16(maxDuration);
-	if (maxDuration)
-		duration += _vm->getRandom(maxDuration);
-		
-duration = 1;//DEBUG Speeds up things		
-		
-	if (isAbortable)
-		_vm->_scriptMan->startAbortableTimerThread(duration, opCall._threadId);
-	else
-		_vm->_scriptMan->startTimerThread(duration, opCall._threadId);
-}
-
-void ScriptOpcodes::opSetThreadSceneId(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(sceneId);
-	_vm->_scriptMan->_threads->setThreadSceneId(opCall._callerThreadId, sceneId);
-}
-
-void ScriptOpcodes::opEndTalkThreads(ScriptThread *scriptThread, OpCall &opCall) {
-	_vm->_scriptMan->_threads->endTalkThreads();
-}
-
-void ScriptOpcodes::opLoadResource(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(resourceId);
-	// NOTE Skipped checking for stalled resources
-	uint32 sceneId = _vm->getCurrentScene();
-	_vm->_resSys->loadResource(resourceId, sceneId, opCall._threadId);
-}
-
-void ScriptOpcodes::opUnloadResource(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(resourceId);
-	// NOTE Skipped checking for stalled resources
-	_vm->_resSys->unloadResourceById(resourceId);
-}
-
-void ScriptOpcodes::opEnterScene(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(sceneId);
-	uint scenesCount = _vm->_scriptMan->_activeScenes.getActiveScenesCount();
-	if (scenesCount > 0) {
-		uint32 currSceneId;
-		_vm->_scriptMan->_activeScenes.getActiveSceneInfo(scenesCount, &currSceneId, 0);
-		// TODO krnfileDump(currSceneId);
-	}
-	if (!_vm->_scriptMan->enterScene(sceneId, opCall._callerThreadId))
-		opCall._result = kTSTerminate;
-}
-
-//DEBUG Scenes
-//uint32 dsceneId = 0x00010031, dthreadId = 0x00020036;//MAP
-//uint32 dsceneId = 0x00010028, dthreadId = 0x000202A1;
-//uint32 dsceneId = 0x00010007, dthreadId = 0x0002000C;//Auditorium
-//uint32 dsceneId = 0x0001000B, dthreadId = 0x00020010;
-//uint32 dsceneId = 0x00010013, dthreadId = 0x00020018;//Therapist
-//uint32 dsceneId = 0x00010016, dthreadId = 0x0002001B;//Dorms ext
-//uint32 dsceneId = 0x00010017, dthreadId = 0x0002001C;//Dorms int
-//uint32 dsceneId = 0x0001000D, dthreadId = 0x00020012;//Food minigame
-//uint32 dsceneId = 0x00010067, dthreadId = 0x0002022A;
-//uint32 dsceneId = 0x0001000C, dthreadId = 0x00020011;//Cafeteria
-uint32 dsceneId = 0x0001000B, dthreadId = 0x00020010;
-
-void ScriptOpcodes::opChangeScene(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(sceneId);
-	ARG_UINT32(threadId);
-
-	if (dsceneId) {
-		sceneId = dsceneId;
-		threadId = dthreadId;
-		dsceneId = 0;
-	}
-	
-	// NOTE Skipped checking for stalled resources
-	_vm->_input->discardButtons(0xFFFF);
-	_vm->_scriptMan->_prevSceneId = _vm->getCurrentScene();
-	_vm->_scriptMan->exitScene(opCall._callerThreadId);
-	_vm->_scriptMan->enterScene(sceneId, opCall._callerThreadId);
-	// TODO _vm->_gameStates->writeStates(_vm->_scriptMan->_prevSceneId, sceneId, threadId);
-	_vm->_scriptMan->startAnonScriptThread(threadId, 0,
-		scriptThread->_value8, scriptThread->_valueC, scriptThread->_value10);
-}
-
-void ScriptOpcodes::opStartModalScene(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(sceneId);
-	ARG_UINT32(threadId);
-	// NOTE Skipped checking for stalled resources
-	_vm->_input->discardButtons(0xFFFF);
-	_vm->_scriptMan->enterPause(opCall._callerThreadId);
-	_vm->_talkItems->pauseByTag(_vm->getCurrentScene());
-	_vm->_scriptMan->enterScene(sceneId, opCall._callerThreadId);
-	_vm->_scriptMan->startScriptThread(threadId, 0,
-		scriptThread->_value8, scriptThread->_valueC, scriptThread->_value10);
-	opCall._result = kTSSuspend;
-}
-
-void ScriptOpcodes::opExitModalScene(ScriptThread *scriptThread, OpCall &opCall) {
-	// NOTE Skipped checking for stalled resources
-	_vm->_input->discardButtons(0xFFFF);
-	_vm->_scriptMan->exitScene(opCall._callerThreadId);
-	_vm->_scriptMan->leavePause(opCall._callerThreadId);
-	_vm->_talkItems->unpauseByTag(_vm->getCurrentScene());
-}
-
-void ScriptOpcodes::opEnterCloseUpScene(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(sceneId);
-	// NOTE Skipped checking for stalled resources
-	_vm->_input->discardButtons(0xFFFF);
-	_vm->_scriptMan->enterPause(opCall._callerThreadId);
-	_vm->_scriptMan->enterScene(sceneId, opCall._callerThreadId);
-}
-
-void ScriptOpcodes::opExitCloseUpScene(ScriptThread *scriptThread, OpCall &opCall) {
-	_vm->_scriptMan->exitScene(opCall._callerThreadId);
-	_vm->_scriptMan->leavePause(opCall._callerThreadId);
-	opCall._result = kTSYield;
-}
-
-void ScriptOpcodes::opPanCenterObject(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_INT16(speed);	
-	ARG_UINT32(objectId);
-	_vm->_camera->panCenterObject(objectId, speed);
-}
-
-void ScriptOpcodes::opPanToObject(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_INT16(speed);	
-	ARG_UINT32(objectId);
-	Control *control = _vm->_dict->getObjectControl(objectId);
-	Common::Point pos = control->getActorPosition();
-	_vm->_camera->panToPoint(pos, speed, opCall._threadId);
-}
-
-void ScriptOpcodes::opPanToNamedPoint(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_INT16(speed);	
-	ARG_UINT32(namedPointId);
-	Common::Point pos = _vm->getNamedPointPosition(namedPointId);
-	_vm->_camera->panToPoint(pos, speed, opCall._threadId);
-}
-
-void ScriptOpcodes::opPanToPoint(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_INT16(speed);	
-	ARG_INT16(x);	
-	ARG_INT16(y);	
-	_vm->_camera->panToPoint(Common::Point(x, y), speed, opCall._threadId);
-}
-
-void ScriptOpcodes::opPanStop(ScriptThread *scriptThread, OpCall &opCall) {
-	_vm->_camera->stopPan();
-}
-
-void ScriptOpcodes::opSetDisplay(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_INT16(flag);
-	_vm->_screen->setDisplayOn(flag != 0);
-}
-
-void ScriptOpcodes::opIncBlockCounter(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_INT16(index);	
-	byte value = _vm->_scriptMan->_scriptResource->_blockCounters.get(index) + 1;
-	if (value <= 63)
-		_vm->_scriptMan->_scriptResource->_blockCounters.set(index, value);
-}
-
-void ScriptOpcodes::opClearBlockCounter(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_INT16(index);
-	_vm->_scriptMan->_scriptResource->_blockCounters.set(index, 0);
-}
-
-void ScriptOpcodes::opSetProperty(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_INT16(value);	
-	ARG_UINT32(propertyId);	
-	_vm->_scriptMan->_scriptResource->_properties.set(propertyId, value != 0);
-}
-
-void ScriptOpcodes::opPlaceActor(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(objectId);
-	ARG_UINT32(actorTypeId);
-	ARG_UINT32(sequenceId);
-	ARG_UINT32(namedPointId);
-	Common::Point pos = _vm->getNamedPointPosition(namedPointId);
-	_vm->_controls->placeActor(actorTypeId, pos, sequenceId, objectId, opCall._threadId);
-}
-
-void ScriptOpcodes::opFaceActor(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_INT16(facing);
-	ARG_UINT32(objectId);
-	Control *control = _vm->_dict->getObjectControl(objectId);
-	control->faceActor(facing);
-}
-
-void ScriptOpcodes::opFaceActorToObject(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(objectId1);
-	ARG_UINT32(objectId2);
-	Control *control1 = _vm->_dict->getObjectControl(objectId1);
-	Control *control2 = _vm->_dict->getObjectControl(objectId2);
-	Common::Point pos1 = control1->getActorPosition();
-	Common::Point pos2 = control2->getActorPosition();
-	uint facing;
-	if (_vm->calcPointDirection(pos1, pos2, facing))
-		control1->faceActor(facing);
-}
-
-void ScriptOpcodes::opStartSequenceActor(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(objectId);
-	ARG_UINT32(sequenceId);
-	// NOTE Skipped checking for stalled sequence, not sure if needed
-	Control *control = _vm->_dict->getObjectControl(objectId);
-	control->startSequenceActor(sequenceId, 2, opCall._threadId);
-}
-
-void ScriptOpcodes::opStartMoveActor(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(objectId);
-	ARG_UINT32(sequenceId);
-	ARG_UINT32(namedPointId);
-	// NOTE Skipped checking for stalled sequence, not sure if needed
-	Control *control = _vm->_dict->getObjectControl(objectId);
-	Common::Point pos = _vm->getNamedPointPosition(namedPointId);
-	control->startMoveActor(sequenceId, pos, opCall._callerThreadId, opCall._threadId);
-}
-
-void ScriptOpcodes::opSetActorToNamedPoint(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(objectId);
-	ARG_UINT32(namedPointId);
-	Control *control = _vm->_dict->getObjectControl(objectId);
-	Common::Point pos = _vm->getNamedPointPosition(namedPointId);
-	control->stopActor();
-	control->setActorPosition(pos);
-}
-
-void ScriptOpcodes::opStartTalkThread(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_INT16(duration);	
-	ARG_UINT32(objectId);
-	ARG_UINT32(talkId);
-	ARG_UINT32(sequenceId1);
-	ARG_UINT32(sequenceId2);
-	ARG_UINT32(namedPointId);
-	_vm->_scriptMan->startTalkThread(duration, objectId, talkId, sequenceId1, sequenceId2, namedPointId, opCall._threadId);
-}
-
-void ScriptOpcodes::opAppearActor(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(objectId);
-	Control *control = _vm->_dict->getObjectControl(objectId);
-	if (!control) {
-		Common::Point pos = _vm->getNamedPointPosition(0x70023);
-		_vm->_controls->placeActor(0x50001, pos, 0x60001, objectId, 0);
-		control = _vm->_dict->getObjectControl(objectId);
-		control->startSequenceActor(0x60001, 2, 0);
-	}
-	control->appearActor();
-}
-
-void ScriptOpcodes::opDisappearActor(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(objectId);
-	Control *control = _vm->_dict->getObjectControl(objectId);
-	control->disappearActor();
-}
-
-void ScriptOpcodes::opActivateObject(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(objectId);
-	Control *control = _vm->_dict->getObjectControl(objectId);
-	if (control)
-		control->activateObject();
-}
-
-void ScriptOpcodes::opDeactivateObject(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(objectId);
-	Control *control = _vm->_dict->getObjectControl(objectId);
-	control->deactivateObject();
-}
-
-void ScriptOpcodes::opSetDefaultSequence(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(objectId);
-	ARG_UINT32(defaultSequenceId);
-	ARG_UINT32(sequenceId);
-	Control *control = _vm->_dict->getObjectControl(objectId);
-	control->_actor->_defaultSequences.set(sequenceId, defaultSequenceId);
-}
-
-void ScriptOpcodes::opSetSelectSfx(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(soundEffectId);
-	// TODO _vm->setSelectSfx(soundEffectId);
-}
-
-void ScriptOpcodes::opSetMoveSfx(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(soundEffectId);
-	// TODO _vm->setMoveSfx(soundEffectId);
-}
-
-void ScriptOpcodes::opSetDenySfx(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(soundEffectId);
-	// TODO _vm->setDenySfx(soundEffectId);
-}
-
-void ScriptOpcodes::opSetAdjustUpSfx(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(soundEffectId);
-	// TODO _vm->setAdjustUpSfx(soundEffectId);
-}
-
-void ScriptOpcodes::opSetAdjustDnSfx(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(soundEffectId);
-	// TODO _vm->setAdjustDnSfx(soundEffectId);
-}
-
-void ScriptOpcodes::opStartSound(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_INT16(volume);
-	ARG_INT16(pan);
-	ARG_UINT32(soundEffectId);
-	// TODO _vm->startSound(soundEffectId, volume, pan);
-}
-void ScriptOpcodes::opStopSound(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(soundEffectId);
-	// TODO _vm->stopSound(soundEffectId);
-}
-
-void ScriptOpcodes::opStartMusic(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_INT16(volume);
-	ARG_INT16(pan);
-	ARG_UINT32(musicId);
-	ARG_UINT32(type);
-	// TODO _vm->playMusic(musicId, type, volume, pan);
-}
-
-void ScriptOpcodes::opStopMusic(ScriptThread *scriptThread, OpCall &opCall) {
-	// TODO _vm->stopMusic();
-}
-
-void ScriptOpcodes::opStackPushRandom(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_INT16(maxValue);
-	_vm->_scriptMan->_stack.push(_vm->getRandom(maxValue) + 1);
-}
-
-void ScriptOpcodes::opIfLte(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_INT16(rvalue);
-	ARG_INT16(elseJumpOffs);
-	int16 lvalue = _vm->_scriptMan->_stack.pop();
-	if (!(lvalue <= rvalue))
-		opCall._deltaOfs += elseJumpOffs;
-}
-
-void ScriptOpcodes::opAddMenuChoice(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_INT16(jumpOffs);
-	ARG_INT16(endMarker);
-	_vm->_scriptMan->_stack.push(endMarker);
-	_vm->_scriptMan->_stack.push(jumpOffs);
-}
-
-void ScriptOpcodes::opDisplayMenu(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_INT16(unk1);
-	ARG_UINT32(menuId);
-	ARG_UINT32(unk2);
-	// TODO _vm->_shellMgr->displayMenu(_vm->_scriptMan->_stack.topPtr(), &_vm->_scriptMan->_menuChoiceOfs, menuId, unk1, unk2, opCall._callerThreadId);
-	// Remove menu choices from the stack
-	do {
-		_vm->_scriptMan->_stack.pop();
-	} while (_vm->_scriptMan->_stack.pop() == 0);
-
-	//DEBUG Resume calling thread, later done by the video player
-	_vm->notifyThreadId(opCall._callerThreadId);
-
-}
-
-void ScriptOpcodes::opSwitchMenuChoice(ScriptThread *scriptThread, OpCall &opCall) {
-_vm->_scriptMan->_menuChoiceOfs = 88; // DEBUG Chose "Start game"
-
-	opCall._deltaOfs += _vm->_scriptMan->_menuChoiceOfs;
-}
-
-void ScriptOpcodes::opResetGame(ScriptThread *scriptThread, OpCall &opCall) {
-	_vm->_scriptMan->_threads->terminateThreads(opCall._callerThreadId);
-	_vm->_scriptMan->reset();
-	_vm->_input->activateButton(0xFFFF);
-	// TODO _vm->stopMusic();
-	// TODO _vm->_gameStates->clear();
-}
-
-void ScriptOpcodes::opDeactivateButton(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_INT16(button)
-	_vm->_input->deactivateButton(button);
-}
-
-void ScriptOpcodes::opActivateButton(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_INT16(button)
-	_vm->_input->activateButton(button);
-}
-
-void ScriptOpcodes::opJumpIf(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_INT16(jumpOffs);
-	int16 value = _vm->_scriptMan->_stack.pop();
-	if (value == 0)
-		opCall._deltaOfs += jumpOffs;
-}
-
-void ScriptOpcodes::opIsPrevSceneId(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(sceneId);
-	_vm->_scriptMan->_stack.push(_vm->_scriptMan->_prevSceneId == sceneId ? 1 : 0);
-}
-
-void ScriptOpcodes::opIsCurrentSceneId(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(sceneId);
-	_vm->_scriptMan->_stack.push(_vm->getCurrentScene() == sceneId ? 1 : 0);
-}
-
-void ScriptOpcodes::opIsActiveSceneId(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(sceneId);
-	_vm->_scriptMan->_stack.push(_vm->_scriptMan->_activeScenes.isSceneActive(sceneId) ? 1 : 0);
-}
-
-void ScriptOpcodes::opNot(ScriptThread *scriptThread, OpCall &opCall) {
-	int16 value = _vm->_scriptMan->_stack.pop();
-	_vm->_scriptMan->_stack.push(value != 0 ? 0 : 1);
-}
-
-void ScriptOpcodes::opAnd(ScriptThread *scriptThread, OpCall &opCall) {
-	int16 value1 = _vm->_scriptMan->_stack.pop();
-	int16 value2 = _vm->_scriptMan->_stack.pop();
-	_vm->_scriptMan->_stack.push(value1 & value2);
-}
-
-void ScriptOpcodes::opOr(ScriptThread *scriptThread, OpCall &opCall) {
-	int16 value1 = _vm->_scriptMan->_stack.pop();
-	int16 value2 = _vm->_scriptMan->_stack.pop();
-	_vm->_scriptMan->_stack.push(value1 | value2);
-}
-
-void ScriptOpcodes::opGetProperty(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(propertyId)
-	bool value = _vm->_scriptMan->_scriptResource->_properties.get(propertyId);
-	_vm->_scriptMan->_stack.push(value ? 1 : 0);
-}
-
-void ScriptOpcodes::opCompareBlockCounter(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_INT16(index);	
-	ARG_INT16(compareOp);	
-	ARG_INT16(rvalue);
-	int16 lvalue = _vm->_scriptMan->_scriptResource->_blockCounters.get(index);
-	bool compareResult = false;
-	switch (compareOp) {
-	case 1:
-		compareResult = lvalue == rvalue;
-		break;
-	case 2:
-		compareResult = lvalue != rvalue;
-		break;
-	case 3:
-		compareResult = lvalue < rvalue;
-		break;
-	case 4:
-		compareResult = lvalue > rvalue;
-		break;
-	case 5:
-		compareResult = lvalue >= rvalue;
-		break;
-	case 6:
-		compareResult = lvalue <= rvalue;
-		break;
-	}
-	_vm->_scriptMan->_stack.push(compareResult ? 1 : 0);
-}
-
-void ScriptOpcodes::opDebug126(ScriptThread *scriptThread, OpCall &opCall) {
-	// NOTE Prints some debug text
-	debug(1, "[DBG] %s", (char*)opCall._code);
-}
-
-void ScriptOpcodes::opPlayVideo(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(objectId);
-	ARG_UINT32(videoId);
-	ARG_UINT32(priority);
-	// TODO _vm->playVideo(videoId, objectId, value, opCall._threadId);
-	
-	//DEBUG Resume calling thread, later done by the video player
-	_vm->notifyThreadId(opCall._callerThreadId);
-	
-}
-
-void ScriptOpcodes::opStackPop(ScriptThread *scriptThread, OpCall &opCall) {
-	_vm->_scriptMan->_stack.pop(); 
-}
-
-void ScriptOpcodes::opStackDup(ScriptThread *scriptThread, OpCall &opCall) {
-	int16 value = _vm->_scriptMan->_stack.peek();
-	_vm->_scriptMan->_stack.push(value); 
-}
-
-void ScriptOpcodes::opLoadSpecialCodeModule(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(specialCodeModuleId);
-	_vm->_resSys->loadResource(specialCodeModuleId, 0, 0);
-}
-
-void ScriptOpcodes::opRunSpecialCode(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(specialCodeId);
-	_vm->_scriptMan->_callerThreadId = opCall._callerThreadId;
-	_vm->_specialCode->run(specialCodeId, opCall);
-	_vm->_scriptMan->_callerThreadId = 0;
-}
-
-void ScriptOpcodes::opStopActor(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(objectId);
-	Control *control = _vm->_dict->getObjectControl(objectId);
-	control->stopActor();
-}
-
-void ScriptOpcodes::opSetActorUsePan(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_INT16(usePan)
-	ARG_UINT32(objectId);
-	Control *control = _vm->_dict->getObjectControl(objectId);
-	control->setActorUsePan(usePan);
-}
-
-void ScriptOpcodes::opStartAbortableThread(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_INT16(codeOffs);
-	ARG_INT16(skipOffs);
-	_vm->_scriptMan->startAbortableThread(opCall._code + codeOffs,
-		opCall._code + skipOffs, opCall._threadId);
-}
-
-void ScriptOpcodes::opKillThread(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(threadId);
-	_vm->_scriptMan->_threads->killThread(threadId);
-}
-
-void ScriptOpcodes::opSetSceneIdThreadId(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(sceneId);
-	ARG_UINT32(threadId);
-	_vm->_scriptMan->setSceneIdThreadId(sceneId, threadId);
-}
-
-void ScriptOpcodes::opStackPush0(ScriptThread *scriptThread, OpCall &opCall) {
-	_vm->_scriptMan->_stack.push(0);
-}
-
-void ScriptOpcodes::opSetFontId(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(fontId);
-	_vm->_scriptMan->setCurrFontId(fontId);
-}
-
-void ScriptOpcodes::opAddMenuKey(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(key);
-	ARG_UINT32(threadId);
-	// TODO _vm->addMenuKey(key, threadId);
-}
-
-void ScriptOpcodes::opChangeSceneAll(ScriptThread *scriptThread, OpCall &opCall) {
-	ARG_SKIP(2);
-	ARG_UINT32(sceneId);
-	ARG_UINT32(threadId);
-	// NOTE Skipped checking for stalled resources
-	_vm->_input->discardButtons(0xFFFF);
-	_vm->_scriptMan->_prevSceneId = _vm->getCurrentScene();
-	_vm->_scriptMan->dumpActiveScenes(_vm->_scriptMan->_globalSceneId, opCall._callerThreadId);
-	_vm->_scriptMan->enterScene(sceneId, opCall._callerThreadId);
-	// TODO _vm->_gameStates->writeStates(_vm->_scriptMan->_prevSceneId, sceneId, threadId);
-	_vm->_scriptMan->startAnonScriptThread(threadId, 0,
-		scriptThread->_value8, scriptThread->_valueC, scriptThread->_value10);
-}
-
 } // End of namespace Illusions