diff options
author | Ľubomír Remák | 2018-08-19 16:29:41 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2018-08-25 23:12:01 +0200 |
commit | 561309eaa2fb2d5298567366068ac9daafc7c2f7 (patch) | |
tree | aa15622ec2847a9308bc9e560af53ee5613aa9a7 /engines/mutationofjb/commands | |
parent | 9f1c628d4bfbd6600ceb67b5b872cf08825dc1e4 (diff) | |
download | scummvm-rg350-561309eaa2fb2d5298567366068ac9daafc7c2f7.tar.gz scummvm-rg350-561309eaa2fb2d5298567366068ac9daafc7c2f7.tar.bz2 scummvm-rg350-561309eaa2fb2d5298567366068ac9daafc7c2f7.zip |
MUTATIONOFJB: Fix missing lines between block ends.
Diffstat (limited to 'engines/mutationofjb/commands')
-rw-r--r-- | engines/mutationofjb/commands/changecommand.cpp | 1 | ||||
-rw-r--r-- | engines/mutationofjb/commands/conditionalcommand.cpp | 5 | ||||
-rw-r--r-- | engines/mutationofjb/commands/definestructcommand.cpp | 1 | ||||
-rw-r--r-- | engines/mutationofjb/commands/definestructcommand.h | 1 | ||||
-rw-r--r-- | engines/mutationofjb/commands/ifcommand.cpp | 5 | ||||
-rw-r--r-- | engines/mutationofjb/commands/ifitemcommand.cpp | 4 | ||||
-rw-r--r-- | engines/mutationofjb/commands/ifpiggycommand.cpp | 1 | ||||
-rw-r--r-- | engines/mutationofjb/commands/labelcommand.cpp | 1 | ||||
-rw-r--r-- | engines/mutationofjb/commands/newroomcommand.cpp | 1 | ||||
-rw-r--r-- | engines/mutationofjb/commands/randomcommand.cpp | 2 | ||||
-rw-r--r-- | engines/mutationofjb/commands/seqcommand.h | 1 |
11 files changed, 11 insertions, 12 deletions
diff --git a/engines/mutationofjb/commands/changecommand.cpp b/engines/mutationofjb/commands/changecommand.cpp index 7d2e7e6910..e3c8a993c5 100644 --- a/engines/mutationofjb/commands/changecommand.cpp +++ b/engines/mutationofjb/commands/changecommand.cpp @@ -556,4 +556,5 @@ Command::ExecuteResult ChangeSceneCommand::execute(ScriptExecutionContext &scrip Common::String ChangeSceneCommand::debugString() const { return Common::String::format("SCENE%d.%s %s %s", _sceneId, getRegisterAsString(), getOperationAsString(), getValueAsString().c_str()); } + } diff --git a/engines/mutationofjb/commands/conditionalcommand.cpp b/engines/mutationofjb/commands/conditionalcommand.cpp index 27b271409a..2a6b36a979 100644 --- a/engines/mutationofjb/commands/conditionalcommand.cpp +++ b/engines/mutationofjb/commands/conditionalcommand.cpp @@ -46,9 +46,7 @@ void ConditionalCommandParser::finish(ScriptParseContext &) { ConditionalCommand::ConditionalCommand() : _trueCommand(nullptr), _falseCommand(nullptr), - _cachedResult(false) -{} - + _cachedResult(false) {} Command *ConditionalCommand::getTrueCommand() const { return _trueCommand; @@ -73,4 +71,5 @@ Command *ConditionalCommand::next() const { return _falseCommand; } } + } diff --git a/engines/mutationofjb/commands/definestructcommand.cpp b/engines/mutationofjb/commands/definestructcommand.cpp index bea3497a3d..455e2433ab 100644 --- a/engines/mutationofjb/commands/definestructcommand.cpp +++ b/engines/mutationofjb/commands/definestructcommand.cpp @@ -96,4 +96,5 @@ Command::ExecuteResult DefineStructCommand::execute(ScriptExecutionContext &scri Common::String DefineStructCommand::debugString() const { return "DEFINE_STRUCT <data omitted>"; } + } diff --git a/engines/mutationofjb/commands/definestructcommand.h b/engines/mutationofjb/commands/definestructcommand.h index 13fc910403..651f9439c7 100644 --- a/engines/mutationofjb/commands/definestructcommand.h +++ b/engines/mutationofjb/commands/definestructcommand.h @@ -38,4 +38,5 @@ public: private: ConversationInfo _conversationInfo; }; + } diff --git a/engines/mutationofjb/commands/ifcommand.cpp b/engines/mutationofjb/commands/ifcommand.cpp index 06fb5ca4c6..9c435881b7 100644 --- a/engines/mutationofjb/commands/ifcommand.cpp +++ b/engines/mutationofjb/commands/ifcommand.cpp @@ -77,12 +77,12 @@ bool IfCommandParser::parse(const Common::String &line, ScriptParseContext &, Co return true; } + IfCommand::IfCommand(uint8 sceneId, uint8 objectId, uint16 value, bool negative) : _sceneId(sceneId), _objectId(objectId), _value(value), - _negative(negative) -{} + _negative(negative) {} Command::ExecuteResult IfCommand::execute(ScriptExecutionContext &scriptExecCtx) { Scene *const scene = scriptExecCtx.getGameData().getScene(_sceneId); @@ -108,4 +108,3 @@ Common::String IfCommand::debugString() const { } } - diff --git a/engines/mutationofjb/commands/ifitemcommand.cpp b/engines/mutationofjb/commands/ifitemcommand.cpp index eec4621292..ccbf09e8af 100644 --- a/engines/mutationofjb/commands/ifitemcommand.cpp +++ b/engines/mutationofjb/commands/ifitemcommand.cpp @@ -70,8 +70,7 @@ bool IfItemCommandParser::parse(const Common::String &line, ScriptParseContext & IfItemCommand::IfItemCommand(const Common::String &item, bool negative) : _item(item), - _negative(negative) -{} + _negative(negative) {} Command::ExecuteResult IfItemCommand::execute(ScriptExecutionContext &scriptExecCtx) { _cachedResult = scriptExecCtx.getGameData()._inventory.hasItem(_item); @@ -87,4 +86,3 @@ Common::String IfItemCommand::debugString() const { } } - diff --git a/engines/mutationofjb/commands/ifpiggycommand.cpp b/engines/mutationofjb/commands/ifpiggycommand.cpp index e3107806ec..d500b4adf2 100644 --- a/engines/mutationofjb/commands/ifpiggycommand.cpp +++ b/engines/mutationofjb/commands/ifpiggycommand.cpp @@ -68,4 +68,3 @@ Common::String IfPiggyCommand::debugString() const { } } - diff --git a/engines/mutationofjb/commands/labelcommand.cpp b/engines/mutationofjb/commands/labelcommand.cpp index 7593e52bb3..ef2410aff0 100644 --- a/engines/mutationofjb/commands/labelcommand.cpp +++ b/engines/mutationofjb/commands/labelcommand.cpp @@ -59,6 +59,7 @@ bool LabelCommandParser::parse(const Common::String &line, ScriptParseContext &p return true; } + const Common::String &LabelCommand::getName() const { return _name; } diff --git a/engines/mutationofjb/commands/newroomcommand.cpp b/engines/mutationofjb/commands/newroomcommand.cpp index 5aabc6705f..0f4d214f18 100644 --- a/engines/mutationofjb/commands/newroomcommand.cpp +++ b/engines/mutationofjb/commands/newroomcommand.cpp @@ -80,4 +80,3 @@ Common::String NewRoomCommand::debugString() const { } } - diff --git a/engines/mutationofjb/commands/randomcommand.cpp b/engines/mutationofjb/commands/randomcommand.cpp index 467f7888d3..260fd3a812 100644 --- a/engines/mutationofjb/commands/randomcommand.cpp +++ b/engines/mutationofjb/commands/randomcommand.cpp @@ -61,6 +61,7 @@ bool RandomCommandParser::parse(const Common::String &line, ScriptParseContext & return true; } + bool RandomBlockStartParser::parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&) { if (line != "/") { return false; @@ -84,6 +85,7 @@ void RandomBlockStartParser::transition(ScriptParseContext &parseCtx, Command *, } } + RandomCommand::RandomCommand(uint numChoices) : _numChoices(numChoices), _chosenNext(nullptr) { diff --git a/engines/mutationofjb/commands/seqcommand.h b/engines/mutationofjb/commands/seqcommand.h index e37f77ff70..f61f33b66f 100644 --- a/engines/mutationofjb/commands/seqcommand.h +++ b/engines/mutationofjb/commands/seqcommand.h @@ -49,4 +49,3 @@ private: } #endif - |