diff options
author | Ľubomír Remák | 2018-04-11 21:54:18 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2018-08-25 23:12:01 +0200 |
commit | 29a809d691c77b549bea615421d9e840f3773142 (patch) | |
tree | cb9b737f67a7e7bede369bf72e65c244712e41b3 /engines/mutationofjb/commands | |
parent | c25ed8957228cfd580216383c3391ccc7e512bb5 (diff) | |
download | scummvm-rg350-29a809d691c77b549bea615421d9e840f3773142.tar.gz scummvm-rg350-29a809d691c77b549bea615421d9e840f3773142.tar.bz2 scummvm-rg350-29a809d691c77b549bea615421d9e840f3773142.zip |
MUTATIONOFJB: Add rename command.
Diffstat (limited to 'engines/mutationofjb/commands')
-rw-r--r-- | engines/mutationofjb/commands/changecommand.cpp | 6 | ||||
-rw-r--r-- | engines/mutationofjb/commands/changecommand.h | 2 | ||||
-rw-r--r-- | engines/mutationofjb/commands/gotocommand.h | 2 | ||||
-rw-r--r-- | engines/mutationofjb/commands/renamecommand.cpp | 78 | ||||
-rw-r--r-- | engines/mutationofjb/commands/renamecommand.h | 50 | ||||
-rw-r--r-- | engines/mutationofjb/commands/saycommand.h | 2 |
6 files changed, 134 insertions, 6 deletions
diff --git a/engines/mutationofjb/commands/changecommand.cpp b/engines/mutationofjb/commands/changecommand.cpp index f2639b620e..a2d45260f5 100644 --- a/engines/mutationofjb/commands/changecommand.cpp +++ b/engines/mutationofjb/commands/changecommand.cpp @@ -66,7 +66,7 @@ bool ChangeCommandParser::parseValueString(const Common::String &valueString, bo if (valueString.hasPrefix("NM")) { reg = ChangeCommand::NM; op = ChangeCommand::SetValue; - strncpy(ccv._strVal, val, MAX_STR_LENGTH); + strncpy(ccv._strVal, val, MAX_ENTITY_NAME_LENGTH); } else if (valueString.hasPrefix("LT")) { reg = ChangeCommand::LT; ccv._byteVal = parseInteger(val, op); @@ -324,7 +324,7 @@ Command::ExecuteResult ChangeDoorCommand::execute(ScriptExecutionContext &script switch (_register) { case NM: - strncpy(door->_name, _value._strVal, MAX_STR_LENGTH); + strncpy(door->_name, _value._strVal, MAX_ENTITY_NAME_LENGTH); break; case LT: door->_destSceneId = _value._byteVal; @@ -447,7 +447,7 @@ Command::ExecuteResult ChangeStaticCommand::execute(ScriptExecutionContext &scri stat->_active = _value._byteVal; break; case NM: - strncpy(stat->_name, _value._strVal, MAX_STR_LENGTH); + strncpy(stat->_name, _value._strVal, MAX_ENTITY_NAME_LENGTH); break; case XX: stat->_x = _value._wordVal; diff --git a/engines/mutationofjb/commands/changecommand.h b/engines/mutationofjb/commands/changecommand.h index f5d7cf5e52..6fa090ef6d 100644 --- a/engines/mutationofjb/commands/changecommand.h +++ b/engines/mutationofjb/commands/changecommand.h @@ -28,7 +28,7 @@ namespace MutationOfJB { union ChangeCommandValue { uint8 _byteVal; uint16 _wordVal; - char _strVal[MAX_STR_LENGTH + 1]; + char _strVal[MAX_ENTITY_NAME_LENGTH + 1]; }; class ChangeCommand : public SeqCommand { diff --git a/engines/mutationofjb/commands/gotocommand.h b/engines/mutationofjb/commands/gotocommand.h index 09d426fd85..b56e6424dd 100644 --- a/engines/mutationofjb/commands/gotocommand.h +++ b/engines/mutationofjb/commands/gotocommand.h @@ -34,7 +34,7 @@ class GotoCommandParser : public CommandParser { public: GotoCommandParser() {} - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command); + virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class GotoCommand : public Command { diff --git a/engines/mutationofjb/commands/renamecommand.cpp b/engines/mutationofjb/commands/renamecommand.cpp new file mode 100644 index 0000000000..03a883261c --- /dev/null +++ b/engines/mutationofjb/commands/renamecommand.cpp @@ -0,0 +1,78 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "mutationofjb/commands/renamecommand.h" +#include "mutationofjb/game.h" +#include "mutationofjb/gamedata.h" +#include "common/algorithm.h" + +/* + "REN " <oldName> " " <newName> + Renames every door, static (in the current scene) and inventory item + with the name oldName to newName. +*/ + +namespace MutationOfJB { + +bool RenameCommandParser::parse(const Common::String &line, ScriptParseContext &, Command *&command) { + if (line.size() < 7 || !line.hasPrefix("REN")) { + return false; + } + + Common::String::const_iterator sep = Common::find(line.begin() + 4, line.end(), ' '); + if (sep == line.end() || sep + 1 == line.end()) { + return false; + } + + const Common::String oldName(line.begin() + 4, sep); + const Common::String newName(sep + 1, line.end()); + command = new RenameCommand(oldName, newName); + + return true; +} + + +Command::ExecuteResult RenameCommand::execute(ScriptExecutionContext &scriptExecCtx) { + Scene *const scene = scriptExecCtx.getGameData().getCurrentScene(); + + for (int i = 1; i <= scene->getNoDoors(); ++i) { + Door *const door = scene->getDoor(i); + if (strcmp(door->_name, _oldName.c_str()) == 0) { + strncpy(door->_name, _newName.c_str(), MAX_ENTITY_NAME_LENGTH); + } + } + for (int i = 1; i <= scene->getNoStatics(); ++i) { + Static *const stat = scene->getStatic(i); + if (strcmp(stat->_name, _oldName.c_str()) == 0) { + strncpy(stat->_name, _newName.c_str(), MAX_ENTITY_NAME_LENGTH); + } + } + + scriptExecCtx.getGameData().getInventory().renameItem(_oldName, _newName); + return Finished; +} + +Common::String RenameCommand::debugString() const { + return Common::String::format("RENAME '%s' '%s'", _oldName.c_str(), _newName.c_str()); +} + +} diff --git a/engines/mutationofjb/commands/renamecommand.h b/engines/mutationofjb/commands/renamecommand.h new file mode 100644 index 0000000000..566d46eda4 --- /dev/null +++ b/engines/mutationofjb/commands/renamecommand.h @@ -0,0 +1,50 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef MUTATIONOFJB_RENAMECOMMAND_H +#define MUTATIONOFJB_RENAMECOMMAND_H + +#include "mutationofjb/commands/seqcommand.h" +#include "common/str.h" + +namespace MutationOfJB { + +class RenameCommandParser : public SeqCommandParser { +public: + virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; +}; + +class RenameCommand : public SeqCommand { +public: + RenameCommand(const Common::String &oldName, const Common::String &newName) : _oldName(oldName), _newName(newName) {} + + virtual Command::ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + virtual Common::String debugString() const override; + +private: + Common::String _oldName; + Common::String _newName; +}; + +} + +#endif diff --git a/engines/mutationofjb/commands/saycommand.h b/engines/mutationofjb/commands/saycommand.h index e41d10fb17..60c7cc8e0b 100644 --- a/engines/mutationofjb/commands/saycommand.h +++ b/engines/mutationofjb/commands/saycommand.h @@ -32,7 +32,7 @@ class SayCommandParser : public SeqCommandParser { public: SayCommandParser() {} - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command); + virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class SayCommand : public SeqCommand { |