Skip to content

Commit

Permalink
ADL: Rename ADL_v3 to ADL_v4
Browse files Browse the repository at this point in the history
  • Loading branch information
@waltervn
waltervn committed Aug 26, 2016
1 parent 7dcf38c commit 1ca15d7
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 48 deletions.
60 changes: 30 additions & 30 deletions engines/adl/adl_v3.cpp → engines/adl/adl_v4.cpp
View file
Expand Up @@ -23,18 +23,18 @@
#include "common/random.h"
#include "common/error.h"

#include "adl/adl_v3.h"
#include "adl/adl_v4.h"
#include "adl/display.h"
#include "adl/graphics.h"

namespace Adl {

AdlEngine_v3::AdlEngine_v3(OSystem *syst, const AdlGameDescription *gd) :
AdlEngine_v4::AdlEngine_v4(OSystem *syst, const AdlGameDescription *gd) :
AdlEngine_v2(syst, gd),
_curDisk(0) {
}

Common::String AdlEngine_v3::loadMessage(uint idx) const {
Common::String AdlEngine_v4::loadMessage(uint idx) const {
Common::String str = AdlEngine_v2::loadMessage(idx);

for (uint i = 0; i < str.size(); ++i) {
Expand All @@ -45,11 +45,11 @@ Common::String AdlEngine_v3::loadMessage(uint idx) const {
return str;
}

Common::String AdlEngine_v3::getItemDescription(const Item &item) const {
Common::String AdlEngine_v4::getItemDescription(const Item &item) const {
return _itemDesc[item.id - 1];
}

void AdlEngine_v3::applyDiskOffset(byte &track, byte &sector) const {
void AdlEngine_v4::applyDiskOffset(byte &track, byte &sector) const {
sector += _diskOffsets[_curDisk].sector;
if (sector >= 16) {
sector -= 16;
Expand All @@ -59,7 +59,7 @@ void AdlEngine_v3::applyDiskOffset(byte &track, byte &sector) const {
track += _diskOffsets[_curDisk].track;
}

DataBlockPtr AdlEngine_v3::readDataBlockPtr(Common::ReadStream &f) const {
DataBlockPtr AdlEngine_v4::readDataBlockPtr(Common::ReadStream &f) const {
byte track = f.readByte();
byte sector = f.readByte();
byte offset = f.readByte();
Expand All @@ -76,29 +76,29 @@ DataBlockPtr AdlEngine_v3::readDataBlockPtr(Common::ReadStream &f) const {
return _disk->getDataBlock(track, sector, offset, size);
}

typedef Common::Functor1Mem<ScriptEnv &, int, AdlEngine_v3> OpcodeV3;
typedef Common::Functor1Mem<ScriptEnv &, int, AdlEngine_v4> OpcodeV4;
#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))
#define Opcode(x) table->push_back(new OpcodeV4(this, &AdlEngine_v4::x))
#define OpcodeUnImpl() table->push_back(new OpcodeV4(this, 0))

void AdlEngine_v3::setupOpcodeTables() {
void AdlEngine_v4::setupOpcodeTables() {
Common::Array<const Opcode *> *table = 0;

SetOpcodeTable(_condOpcodes);
// 0x00
OpcodeUnImpl();
Opcode(o2_isFirstTime);
Opcode(o2_isRandomGT);
Opcode(o3_isItemInRoom);
Opcode(o4_isItemInRoom);
// 0x04
Opcode(o3_isNounNotInRoom);
Opcode(o4_isNounNotInRoom);
Opcode(o1_isMovesGT);
Opcode(o1_isVarEQ);
Opcode(o2_isCarryingSomething);
// 0x08
Opcode(o3_isVarGT);
Opcode(o4_isVarGT);
Opcode(o1_isCurPicEQ);
Opcode(o3_skipOneCommand);
Opcode(o4_skipOneCommand);

SetOpcodeTable(_actOpcodes);
// 0x00
Expand All @@ -108,24 +108,24 @@ void AdlEngine_v3::setupOpcodeTables() {
Opcode(o1_varSet);
// 0x04
Opcode(o1_listInv);
Opcode(o3_moveItem);
Opcode(o4_moveItem);
Opcode(o1_setRoom);
Opcode(o2_setCurPic);
// 0x08
Opcode(o2_setPic);
Opcode(o1_printMsg);
Opcode(o3_dummy);
Opcode(o3_setTextMode);
Opcode(o4_dummy);
Opcode(o4_setTextMode);
// 0x0c
Opcode(o2_moveAllItems);
Opcode(o1_quit);
Opcode(o3_dummy);
Opcode(o4_dummy);
Opcode(o2_save);
// 0x10
Opcode(o2_restore);
Opcode(o1_restart);
Opcode(o3_setDisk);
Opcode(o3_dummy);
Opcode(o4_setDisk);
Opcode(o4_dummy);
// 0x14
Opcode(o1_resetPic);
Opcode(o1_goDirection<IDI_DIR_NORTH>);
Expand All @@ -139,13 +139,13 @@ void AdlEngine_v3::setupOpcodeTables() {
// 0x1c
Opcode(o1_dropItem);
Opcode(o1_setRoomPic);
Opcode(o3_sound);
Opcode(o4_sound);
OpcodeUnImpl();
// 0x20
Opcode(o2_initDisk);
}

int AdlEngine_v3::o3_isVarGT(ScriptEnv &e) {
int AdlEngine_v4::o4_isVarGT(ScriptEnv &e) {
OP_DEBUG_2("\t&& VARS[%d] > %d", e.arg(1), e.arg(2));

if (getVar(e.arg(1)) > e.arg(2))
Expand All @@ -154,7 +154,7 @@ int AdlEngine_v3::o3_isVarGT(ScriptEnv &e) {
return -1;
}

int AdlEngine_v3::o3_skipOneCommand(ScriptEnv &e) {
int AdlEngine_v4::o4_skipOneCommand(ScriptEnv &e) {
OP_DEBUG_0("\t&& SKIP_ONE_COMMAND()");

_skipOneCommand = true;
Expand All @@ -164,7 +164,7 @@ int AdlEngine_v3::o3_skipOneCommand(ScriptEnv &e) {
}

// FIXME: Rename "isLineArt" and look at code duplication
int AdlEngine_v3::o3_isItemInRoom(ScriptEnv &e) {
int AdlEngine_v4::o4_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));
Expand All @@ -178,7 +178,7 @@ int AdlEngine_v3::o3_isItemInRoom(ScriptEnv &e) {
return -1;
}

int AdlEngine_v3::o3_isNounNotInRoom(ScriptEnv &e) {
int AdlEngine_v4::o4_isNounNotInRoom(ScriptEnv &e) {
OP_DEBUG_1("\t&& NO_SUCH_ITEMS_IN_ROOM(%s)", itemRoomStr(e.arg(1)).c_str());

Common::List<Item>::const_iterator item;
Expand All @@ -196,7 +196,7 @@ int AdlEngine_v3::o3_isNounNotInRoom(ScriptEnv &e) {
return 1;
}

int AdlEngine_v3::o3_moveItem(ScriptEnv &e) {
int AdlEngine_v4::o4_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));
Expand All @@ -215,13 +215,13 @@ int AdlEngine_v3::o3_moveItem(ScriptEnv &e) {
return 2;
}

int AdlEngine_v3::o3_dummy(ScriptEnv &e) {
int AdlEngine_v4::o4_dummy(ScriptEnv &e) {
OP_DEBUG_0("\tDUMMY()");

return 0;
}

int AdlEngine_v3::o3_setTextMode(ScriptEnv &e) {
int AdlEngine_v4::o4_setTextMode(ScriptEnv &e) {
OP_DEBUG_1("\tSET_TEXT_MODE(%d)", e.arg(1));

// TODO
Expand All @@ -238,7 +238,7 @@ int AdlEngine_v3::o3_setTextMode(ScriptEnv &e) {
return 1;
}

int AdlEngine_v3::o3_setDisk(ScriptEnv &e) {
int AdlEngine_v4::o4_setDisk(ScriptEnv &e) {
OP_DEBUG_2("\tSET_DISK(%d, %d)", e.arg(1), e.arg(2));

// TODO
Expand All @@ -248,7 +248,7 @@ int AdlEngine_v3::o3_setDisk(ScriptEnv &e) {
return 2;
}

int AdlEngine_v3::o3_sound(ScriptEnv &e) {
int AdlEngine_v4::o4_sound(ScriptEnv &e) {
OP_DEBUG_0("\tSOUND()");

// TODO
Expand Down
28 changes: 14 additions & 14 deletions engines/adl/adl_v3.h → engines/adl/adl_v4.h
View file
Expand Up @@ -20,8 +20,8 @@
*
*/

#ifndef ADL_ADL_V3_H
#define ADL_ADL_V3_H
#ifndef ADL_ADL_V4_H
#define ADL_ADL_V4_H

#include "adl/adl_v2.h"

Expand All @@ -36,12 +36,12 @@ struct DiskOffset {

namespace Adl {

class AdlEngine_v3 : public AdlEngine_v2 {
class AdlEngine_v4 : public AdlEngine_v2 {
public:
virtual ~AdlEngine_v3() { }
virtual ~AdlEngine_v4() { }

protected:
AdlEngine_v3(OSystem *syst, const AdlGameDescription *gd);
AdlEngine_v4(OSystem *syst, const AdlGameDescription *gd);

// AdlEngine
virtual void setupOpcodeTables();
Expand All @@ -53,15 +53,15 @@ class AdlEngine_v3 : public AdlEngine_v2 {

void applyDiskOffset(byte &track, byte &sector) const;

int o3_isVarGT(ScriptEnv &e);
int o3_isItemInRoom(ScriptEnv &e);
int o3_isNounNotInRoom(ScriptEnv &e);
int o3_skipOneCommand(ScriptEnv &e);
int o3_moveItem(ScriptEnv &e);
int o3_dummy(ScriptEnv &e);
int o3_setTextMode(ScriptEnv &e);
int o3_setDisk(ScriptEnv &e);
int o3_sound(ScriptEnv &e);
int o4_isVarGT(ScriptEnv &e);
int o4_isItemInRoom(ScriptEnv &e);
int o4_isNounNotInRoom(ScriptEnv &e);
int o4_skipOneCommand(ScriptEnv &e);
int o4_moveItem(ScriptEnv &e);
int o4_dummy(ScriptEnv &e);
int o4_setTextMode(ScriptEnv &e);
int o4_setDisk(ScriptEnv &e);
int o4_sound(ScriptEnv &e);

Common::Array<Common::String> _itemDesc;
byte _curDisk;
Expand Down
6 changes: 3 additions & 3 deletions engines/adl/hires6.h
View file
Expand Up @@ -25,7 +25,7 @@

#include "common/str.h"

#include "adl/adl_v3.h"
#include "adl/adl_v4.h"
#include "adl/disk.h"

namespace Common {
Expand Down Expand Up @@ -56,10 +56,10 @@ struct DiskDataDesc {
byte volume;
};

class HiRes6Engine : public AdlEngine_v3 {
class HiRes6Engine : public AdlEngine_v4 {
public:
HiRes6Engine(OSystem *syst, const AdlGameDescription *gd) :
AdlEngine_v3(syst, gd),
AdlEngine_v4(syst, gd),
_boot(nullptr),
_currVerb(0),
_currNoun(0) {
Expand Down
2 changes: 1 addition & 1 deletion engines/adl/module.mk
View file
Expand Up @@ -3,7 +3,7 @@ MODULE := engines/adl
MODULE_OBJS := \
adl.o \
adl_v2.o \
adl_v3.o \
adl_v4.o \
console.o \
detection.o \
disk.o \
Expand Down

0 comments on commit 1ca15d7

Please sign in to comment.