1 files changed, 17 insertions, 200 deletions

diff --git a/engines/adl/adl_v3.cpp b/engines/adl/adl_v3.cpp
index 623db661bc..6b93acde61 100644
--- a/engines/adl/adl_v3.cpp
+++ b/engines/adl/adl_v3.cpp
@@ -20,162 +20,26 @@
  *
  */
 
-#include "common/random.h"
-#include "common/error.h"
-
 #include "adl/adl_v3.h"
-#include "adl/display.h"
-#include "adl/graphics.h"
 
 namespace Adl {
 
 AdlEngine_v3::AdlEngine_v3(OSystem *syst, const AdlGameDescription *gd) :
-		AdlEngine_v2(syst, gd),
-		_curDisk(0) {
-}
-
-Common::String AdlEngine_v3::loadMessage(uint idx) const {
-	Common::String str = AdlEngine_v2::loadMessage(idx);
-
-	for (uint i = 0; i < str.size(); ++i) {
-		const char *xorStr = "AVISDURGAN";
-		str.setChar(str[i] ^ xorStr[i % strlen(xorStr)], i);
-	}
-
-	return str;
+		AdlEngine_v2(syst, gd) {
 }
 
 Common::String AdlEngine_v3::getItemDescription(const Item &item) const {
-	return _itemDesc[item.id - 1];
-}
-
-void AdlEngine_v3::applyDiskOffset(byte &track, byte &sector) const {
-	sector += _diskOffsets[_curDisk].sector;
-	if (sector >= 16) {
-		sector -= 16;
-		++track;
-	}
-
-	track += _diskOffsets[_curDisk].track;
-}
-
-DataBlockPtr AdlEngine_v3::readDataBlockPtr(Common::ReadStream &f) const {
-	byte track = f.readByte();
-	byte sector = f.readByte();
-	byte offset = f.readByte();
-	byte size = f.readByte();
-
-	if (f.eos() || f.err())
-		error("Error reading DataBlockPtr");
-
-	if (track == 0 && sector == 0 && offset == 0 && size == 0)
-		return DataBlockPtr();
-
-	applyDiskOffset(track, sector);
-
-	return _disk->getDataBlock(track, sector, offset, size);
+	return _itemDesc[item.description - 1];
 }
 
 typedef Common::Functor1Mem<ScriptEnv &, int, AdlEngine_v3> OpcodeV3;
-#define SetOpcodeTable(x) table = &x;
-#define Opcode(x) table->push_back(new OpcodeV3(this, &AdlEngine_v3::x))
-#define OpcodeUnImpl() table->push_back(new OpcodeV3(this, 0))
 
 void AdlEngine_v3::setupOpcodeTables() {
-	Common::Array<const Opcode *> *table = 0;
-
-	SetOpcodeTable(_condOpcodes);
-	// 0x00
-	OpcodeUnImpl();
-	Opcode(o2_isFirstTime);
-	Opcode(o2_isRandomGT);
-	Opcode(o3_isItemInRoom);
-	// 0x04
-	Opcode(o3_isNounNotInRoom);
-	Opcode(o1_isMovesGT);
-	Opcode(o1_isVarEQ);
-	Opcode(o2_isCarryingSomething);
-	// 0x08
-	Opcode(o3_isVarGT);
-	Opcode(o1_isCurPicEQ);
-	Opcode(o3_skipOneCommand);
-
-	SetOpcodeTable(_actOpcodes);
-	// 0x00
-	OpcodeUnImpl();
-	Opcode(o1_varAdd);
-	Opcode(o1_varSub);
-	Opcode(o1_varSet);
-	// 0x04
-	Opcode(o1_listInv);
-	Opcode(o3_moveItem);
-	Opcode(o1_setRoom);
-	Opcode(o1_setCurPic);
-	// 0x08
-	Opcode(o1_setPic);
-	Opcode(o1_printMsg);
-	Opcode(o3_dummy);
-	Opcode(o3_setTextMode);
-	// 0x0c
-	Opcode(o2_moveAllItems);
-	Opcode(o1_quit);
-	Opcode(o3_dummy);
-	Opcode(o2_save);
-	// 0x10
-	Opcode(o2_restore);
-	Opcode(o1_restart);
-	Opcode(o3_setDisk);
-	Opcode(o3_dummy);
-	// 0x14
-	Opcode(o1_resetPic);
-	Opcode(o1_goDirection<IDI_DIR_NORTH>);
-	Opcode(o1_goDirection<IDI_DIR_SOUTH>);
-	Opcode(o1_goDirection<IDI_DIR_EAST>);
-	// 0x18
-	Opcode(o1_goDirection<IDI_DIR_WEST>);
-	Opcode(o1_goDirection<IDI_DIR_UP>);
-	Opcode(o1_goDirection<IDI_DIR_DOWN>);
-	Opcode(o1_takeItem);
-	// 0x1c
-	Opcode(o1_dropItem);
-	Opcode(o1_setRoomPic);
-	Opcode(o3_sound);
-	OpcodeUnImpl();
-	// 0x20
-	Opcode(o2_initDisk);
-}
-
-int AdlEngine_v3::o3_isVarGT(ScriptEnv &e) {
-	OP_DEBUG_2("\t&& VARS[%d] > %d", e.arg(1), e.arg(2));
-
-	if (getVar(e.arg(1)) > e.arg(2))
-		return 2;
-
-	return -1;
-}
-
-int AdlEngine_v3::o3_skipOneCommand(ScriptEnv &e) {
-	OP_DEBUG_0("\t&& SKIP_ONE_COMMAND()");
-
-	_skipOneCommand = true;
-	setVar(2, 0);
-
-	return -1;
-}
-
-// FIXME: Rename "isLineArt" and look at code duplication
-int AdlEngine_v3::o3_isItemInRoom(ScriptEnv &e) {
-	OP_DEBUG_2("\t&& GET_ITEM_ROOM(%s) == %s", itemStr(e.arg(1)).c_str(), itemRoomStr(e.arg(2)).c_str());
-
-	const Item &item = getItem(e.arg(1));
-
-	if (e.arg(2) != IDI_ANY && item.isLineArt != _curDisk)
-		return -1;
-
-	if (item.room == roomArg(e.arg(2)))
-		return 2;
-
-	return -1;
+	AdlEngine_v2::setupOpcodeTables();
+	delete _condOpcodes[0x04];
+	_condOpcodes[0x04] = new OpcodeV3(this, &AdlEngine_v3::o3_isNounNotInRoom);
+	delete _actOpcodes[0x04];
+	_actOpcodes[0x04] = new OpcodeV3(this, &AdlEngine_v3::o3_listInv);
 }
 
 int AdlEngine_v3::o3_isNounNotInRoom(ScriptEnv &e) {
@@ -183,75 +47,28 @@ int AdlEngine_v3::o3_isNounNotInRoom(ScriptEnv &e) {
 
 	Common::List<Item>::const_iterator item;
 
-	setVar(24, 0);
+	bool isAnItem = false;
 
-	for (item = _state.items.begin(); item != _state.items.end(); ++item)
+	for (item = _state.items.begin(); item != _state.items.end(); ++item) {
 		if (item->noun == e.getNoun()) {
-			setVar(24, 1);
+			isAnItem = true;
 
 			if (item->room == roomArg(e.arg(1)))
 				return -1;
 		}
-
-	return 1;
-}
-
-int AdlEngine_v3::o3_moveItem(ScriptEnv &e) {
-	OP_DEBUG_2("\tSET_ITEM_ROOM(%s, %s)", itemStr(e.arg(1)).c_str(), itemRoomStr(e.arg(2)).c_str());
-
-	byte room = roomArg(e.arg(2));
-
-	Item &item = getItem(e.arg(1));
-
-	if (item.room == _roomOnScreen)
-		_picOnScreen = 0;
-
-	// Set items that move from inventory to a room to state "dropped"
-	if (item.room == IDI_ANY && room != IDI_VOID_ROOM)
-		item.state = IDI_ITEM_DROPPED;
-
-	item.room = room;
-	item.isLineArt = _curDisk;
-	return 2;
-}
-
-int AdlEngine_v3::o3_dummy(ScriptEnv &e) {
-	OP_DEBUG_0("\tDUMMY()");
-
-	return 0;
-}
-
-int AdlEngine_v3::o3_setTextMode(ScriptEnv &e) {
-	OP_DEBUG_1("\tSET_TEXT_MODE(%d)", e.arg(1));
-
-	// TODO
-	// 1: 4-line mode
-	// 2: 24-line mode
-
-	switch (e.arg(1)) {
-	case 3:
-		// We re-use the restarting flag here, to simulate a long jump
-		_isRestarting = true;
-		return -1;
 	}
 
-	return 1;
+	return (isAnItem ? 1 : -1);
 }
 
-int AdlEngine_v3::o3_setDisk(ScriptEnv &e) {
-	OP_DEBUG_2("\tSET_DISK(%d, %d)", e.arg(1), e.arg(2));
-
-	// TODO
-	// Arg 1: disk
-	// Arg 2: room
-
-	return 2;
-}
+int AdlEngine_v3::o3_listInv(ScriptEnv &e) {
+	OP_DEBUG_0("\tLIST_INVENTORY()");
 
-int AdlEngine_v3::o3_sound(ScriptEnv &e) {
-	OP_DEBUG_0("\tSOUND()");
+	Common::List<Item>::const_iterator item;
 
-	// TODO
+	for (item = _state.items.begin(); item != _state.items.end(); ++item)
+		if (item->room == IDI_ANY)
+			printString(_itemDesc[item->description - 1]);
 
 	return 0;
 }