Skip to content

Commit

Permalink
MUTATIONOFJB: Add change scene command, implement listsections and sh…
Browse files Browse the repository at this point in the history 
…owsection debug console commands.
  • Loading branch information
@LubomirR
LubomirR committed Aug 19, 2018
1 parent a999f0c commit 17d5c51
Show file tree
Hide file tree
Showing 15 changed files with 538 additions and 47 deletions.
180 changes: 178 additions & 2 deletions engines/mutationofjb/commands/changecommand.cpp
View file
Expand Up @@ -96,6 +96,30 @@ bool ChangeCommandParser::parseValueString(const Common::String &valueString, ui
} else if (valueString.hasPrefix("CA")) {
reg = ChangeCommand::CA;
ccv._byteVal = parseInteger(val, op);
} else if (valueString.hasPrefix("DS")) {
reg = ChangeCommand::DS;
ccv._byteVal = parseInteger(val, op);
} else if (valueString.hasPrefix("DL")) {
reg = ChangeCommand::DL;
ccv._byteVal = parseInteger(val, op);
} else if (valueString.hasPrefix("ND")) {
reg = ChangeCommand::ND;
ccv._byteVal = parseInteger(val, op);
} else if (valueString.hasPrefix("NO")) {
reg = ChangeCommand::NO;
ccv._byteVal = parseInteger(val, op);
} else if (valueString.hasPrefix("NS")) {
reg = ChangeCommand::NS;
ccv._byteVal = parseInteger(val, op);
} else if (valueString.hasPrefix("PF")) {
reg = ChangeCommand::PF;
ccv._byteVal = parseInteger(val, op);
} else if (valueString.hasPrefix("PL")) {
reg = ChangeCommand::PL;
ccv._byteVal = parseInteger(val, op);
} else if (valueString.hasPrefix("PD")) {
reg = ChangeCommand::PD;
ccv._byteVal = parseInteger(val, op);
}

return true;
Expand All @@ -115,7 +139,7 @@ bool ChangeDoorCommandParser::parse(const Common::String &line, ScriptParseConte
return false;
}

command = new ChangeObjectCommand(sceneId, objectId, reg, op, val);
command = new ChangeDoorCommand(sceneId, objectId, reg, op, val);
return true;
}

Expand Down Expand Up @@ -149,7 +173,24 @@ bool ChangeStaticCommandParser::parse(const Common::String &line, ScriptParseCon
return false;
}

command = new ChangeObjectCommand(sceneId, objectId, reg, op, val);
command = new ChangeStaticCommand(sceneId, objectId, reg, op, val);
return true;
}

bool ChangeSceneCommandParser::parse(const Common::String &line, ScriptParseContext &, Command *&command) {
if (!line.hasPrefix("CHANGE ")) {
return false;
}
uint8 sceneId = 0;
uint8 objectId = 0;
ChangeCommand::ChangeRegister reg;
ChangeCommand::ChangeOperation op;
ChangeCommandValue val;
if (!parseValueString(line.c_str() + 8, sceneId, objectId, reg, op, val)) {
return false;
}

command = new ChangeSceneCommand(sceneId, objectId, reg, op, val);
return true;
}

Expand All @@ -173,6 +214,86 @@ int ChangeCommandParser::parseInteger(const char *val, ChangeCommand::ChangeOper
return atoi(val);
}


const char *ChangeCommand::getRegisterAsString() const {
switch (_register) {
case NM: return "NM";
case LT: return "LT";
case SX: return "SX";
case SY: return "SY";
case XX: return "XX";
case YY: return "YY";
case XL: return "XL";
case YL: return "YL";
case WX: return "WX";
case WY: return "WY";
case SP: return "SP";
case AC: return "AC";
case FA: return "FA";
case FR: return "FR";
case NA: return "NA";
case FS: return "FS";
case CA: return "CA";
case DS: return "DS";
case DL: return "DL";
case ND: return "ND";
case NO: return "NO";
case NS: return "NS";
case PF: return "PF";
case PL: return "PL";
case PD: return "PD";
default: return "(unknown)";
}
}

Common::String ChangeCommand::getValueAsString() const {
switch (_register) {
case NM:
return Common::String::format("\"%s\"", _value._strVal);
case LT:
case YY:
case YL:
case WY:
case SP:
case AC:
case FA:
case FR:
case NA:
case FS:
case CA:
case DS:
case DL:
case ND:
case NO:
case NS:
case PF:
case PL:
case PD:
return Common::String::format("%d", (int)_value._byteVal);
case SX:
case SY:
case XX:
case XL:
case WX:
return Common::String::format("%d", (int)_value._wordVal);
default:
return "(unknown)";
}
}

const char *ChangeCommand::getOperationAsString() const {
switch (_operation) {
case SetValue:
return "=";
case AddValue:
return "+=";
case SubtractValue:
return "-=";
default:
return "(unknown)";
}
}

Command::ExecuteResult ChangeDoorCommand::execute(GameData &gameData) {
Scene *const scene = gameData.getScene(_sceneId);
if (!scene) {
Expand Down Expand Up @@ -226,6 +347,10 @@ Command::ExecuteResult ChangeDoorCommand::execute(GameData &gameData) {
return Finished;
}

Common::String ChangeDoorCommand::debugString() const {
return Common::String::format("scene%d.door%d.%s %s %s", _sceneId, _entityId, getRegisterAsString(), getOperationAsString(), getValueAsString().c_str());
}

Command::ExecuteResult ChangeObjectCommand::execute(GameData &gameData) {
Scene *const scene = gameData.getScene(_sceneId);
if (!scene) {
Expand Down Expand Up @@ -285,6 +410,10 @@ Command::ExecuteResult ChangeObjectCommand::execute(GameData &gameData) {
return Finished;
}

Common::String ChangeObjectCommand::debugString() const {
return Common::String::format("scene%d.object%d.%s %s %s", _sceneId, _entityId, getRegisterAsString(), getOperationAsString(), getValueAsString().c_str());
}

Command::ExecuteResult ChangeStaticCommand::execute(GameData &gameData) {
Scene *const scene = gameData.getScene(_sceneId);
if (!scene) {
Expand Down Expand Up @@ -331,4 +460,51 @@ Command::ExecuteResult ChangeStaticCommand::execute(GameData &gameData) {

return Finished;
}

Common::String ChangeStaticCommand::debugString() const {
return Common::String::format("scene%d.static%d.%s %s %s", _sceneId, _entityId, getRegisterAsString(), getOperationAsString(), getValueAsString().c_str());
}

Command::ExecuteResult ChangeSceneCommand::execute(GameData &gameData) {
Scene *const scene = gameData.getScene(_sceneId);
if (!scene) {
return Finished;
}

switch (_register) {
case DS:
scene->_startup = _value._byteVal;
break;
case DL:
scene->_DL = _value._byteVal;
break;
case ND:
scene->_noDoors = _value._byteVal;
break;
case NO:
scene->_noObjects = _value._byteVal;
break;
case NS:
scene->_noStatics = _value._byteVal;
break;
case PF:
scene->_palRotStart = _value._byteVal;
break;
case PL:
scene->_palRotEnd = _value._byteVal;
break;
case PD:
scene->_palRotPeriod = _value._byteVal;
break;
default:
warning("Scene does not support changing this register.");
break;
}

return Finished;
}

Common::String ChangeSceneCommand::debugString() const {
return Common::String::format("scene%d.%s %s %s", _sceneId, getRegisterAsString(), getOperationAsString(), getValueAsString().c_str());
}
}
31 changes: 29 additions & 2 deletions engines/mutationofjb/commands/changecommand.h
View file
Expand Up @@ -50,7 +50,15 @@ class ChangeCommand : public SeqCommand {
FR,
NA,
FS,
CA
CA,
DS, // Startup
DL,
ND, // Number of doors
NO, // Number of objects
NS, // Number of statics
PF, // Palette rotation first
PL, // Palette rotation last
PD // Palette rotation delay
};

enum ChangeOperation {
Expand All @@ -63,6 +71,10 @@ class ChangeCommand : public SeqCommand {
_sceneId(sceneId), _entityId(entityId), _register(reg), _operation(op), _value(val)
{}
protected:
const char *getRegisterAsString() const;
Common::String getValueAsString() const;
const char *getOperationAsString() const;

uint8 _sceneId;
uint8 _entityId;
ChangeRegister _register;
Expand Down Expand Up @@ -91,14 +103,18 @@ class ChangeStaticCommandParser : public ChangeCommandParser {
virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override;
};


class ChangeSceneCommandParser : public ChangeCommandParser {
public:
virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override;
};

class ChangeDoorCommand : public ChangeCommand {
public:
ChangeDoorCommand(uint8 sceneId, uint8 doorId, ChangeRegister reg, ChangeOperation op, const ChangeCommandValue& val)
: ChangeCommand(sceneId, doorId, reg, op, val)
{}
virtual ExecuteResult execute(GameData &gameData) override;
virtual Common::String debugString() const;
};

class ChangeObjectCommand : public ChangeCommand {
Expand All @@ -107,6 +123,7 @@ class ChangeObjectCommand : public ChangeCommand {
: ChangeCommand(sceneId, objectId, reg, op, val)
{}
virtual ExecuteResult execute(GameData &gameData) override;
virtual Common::String debugString() const;
};

class ChangeStaticCommand : public ChangeCommand {
Expand All @@ -115,6 +132,16 @@ class ChangeStaticCommand : public ChangeCommand {
: ChangeCommand(sceneId, staticId, reg, op, val)
{}
virtual ExecuteResult execute(GameData &gameData) override;
virtual Common::String debugString() const;
};

class ChangeSceneCommand : public ChangeCommand {
public:
ChangeSceneCommand(uint8 sceneId, uint8 staticId, ChangeRegister reg, ChangeOperation op, const ChangeCommandValue& val)
: ChangeCommand(sceneId, staticId, reg, op, val)
{}
virtual ExecuteResult execute(GameData &gameData) override;
virtual Common::String debugString() const;
};

}
2 changes: 1 addition & 1 deletion engines/mutationofjb/commands/command.cpp
View file
Expand Up @@ -25,7 +25,7 @@

namespace MutationOfJB {

void CommandParser::transition(ScriptParseContext &, Command *, Command *) {}
void CommandParser::transition(ScriptParseContext &, Command *, Command *, CommandParser *) {}
CommandParser::~CommandParser() {}

Command::~Command() {}
Expand Down
3 changes: 2 additions & 1 deletion engines/mutationofjb/commands/command.h
View file
Expand Up @@ -42,7 +42,7 @@ class CommandParser {
virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) = 0;

/* Old command - created by this parser. */
virtual void transition(ScriptParseContext &parseCtx, Command *oldCommand, Command *newCommand);
virtual void transition(ScriptParseContext &parseCtx, Command *oldCommand, Command *newCommand, CommandParser *newCommandParser);
};

class Command {
Expand All @@ -59,6 +59,7 @@ class Command {
virtual Command *next() const = 0;

virtual SeqCommand *asSeqCommand();
virtual Common::String debugString() const = 0;
};
}

Expand Down

0 comments on commit 17d5c51

Please sign in to comment.