MUTATIONOFJB: Add rename command.

12 files changed, 162 insertions, 15 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 {
diff --git a/engines/mutationofjb/gamedata.cpp b/engines/mutationofjb/gamedata.cpp
index 099cea7077..1ece44c740 100644
--- a/engines/mutationofjb/gamedata.cpp
+++ b/engines/mutationofjb/gamedata.cpp
@@ -28,13 +28,13 @@
 namespace MutationOfJB {
 
 static bool readString(Common::ReadStream &stream, char *str) {
-	char buf[MAX_STR_LENGTH];
-	memset(str, 0, MAX_STR_LENGTH + 1);
+	char buf[MAX_ENTITY_NAME_LENGTH];
+	memset(str, 0, MAX_ENTITY_NAME_LENGTH + 1);
 
 	uint8 len = stream.readByte();
-	stream.read(buf, MAX_STR_LENGTH);
+	stream.read(buf, MAX_ENTITY_NAME_LENGTH);
 
-	len = MIN(len, MAX_STR_LENGTH);
+	len = MIN(len, (uint8) MAX_ENTITY_NAME_LENGTH);
 	memcpy(str, buf, len);
 
 	return true;
diff --git a/engines/mutationofjb/gamedata.h b/engines/mutationofjb/gamedata.h
index 64de01ef01..321a688d3c 100644
--- a/engines/mutationofjb/gamedata.h
+++ b/engines/mutationofjb/gamedata.h
@@ -32,7 +32,9 @@ class ReadStream;
 
 namespace MutationOfJB {
 
-static const uint8 MAX_STR_LENGTH = 0x14;
+enum {
+	MAX_ENTITY_NAME_LENGTH = 0x14
+};
 
 /*
 	There are 4 types of entities present in the game data:
@@ -47,7 +49,7 @@ struct Door {
 		Door name.
 		Can be empty - deactivates door completely.
 	*/
-	char _name[MAX_STR_LENGTH + 1];
+	char _name[MAX_ENTITY_NAME_LENGTH + 1];
 	/*
 		Scene ID where the door leads.
 		Can be 0 - you can hover your mouse over it, but clicking it doesn't do anything (unless scripted).
@@ -96,7 +98,7 @@ struct Object {
 
 struct Static {
 	uint8  _active;
-	char _name[MAX_STR_LENGTH + 1];
+	char _name[MAX_ENTITY_NAME_LENGTH + 1];
 	uint16 _x;
 	uint8  _y;
 	uint16 _width;
diff --git a/engines/mutationofjb/inventory.cpp b/engines/mutationofjb/inventory.cpp
index b6561b2e68..2fa7f2ca95 100644
--- a/engines/mutationofjb/inventory.cpp
+++ b/engines/mutationofjb/inventory.cpp
@@ -33,7 +33,7 @@ const Inventory::Items &Inventory::getItems() const {
 }
 
 bool Inventory::hasItem(const Common::String &item) const {
-	Items::const_iterator it = find(_items.begin(), _items.end(), item);
+	Items::const_iterator it = Common::find(_items.begin(), _items.end(), item);
 	return (it != _items.end());
 }
 
@@ -49,7 +49,7 @@ void Inventory::addItem(const Common::String &item) {
 }
 
 void Inventory::removeItem(const Common::String &item) {
-	Items::iterator it = find(_items.begin(), _items.end(), item);
+	Items::iterator it = Common::find(_items.begin(), _items.end(), item);
 	if (it == _items.end()) {
 		debug("Item '%s' not in inventory.", item.c_str());
 		return;
@@ -68,6 +68,19 @@ void Inventory::removeAllItems() {
 	}
 }
 
+void Inventory::renameItem(const Common::String &oldName, const Common::String &newName) {
+	bool renamed = false;
+	for (Items::iterator it = _items.begin(); it != _items.end(); ++it) {
+		if (*it == oldName) {
+			*it = newName;
+			renamed = true;
+		}
+	}
+	if (renamed && _observer) {
+		_observer->onInventoryChanged();
+	}
+}
+
 void Inventory::rotateItemsRight(uint n) {
 	if (_items.size() < 2) {
 		return;
diff --git a/engines/mutationofjb/inventory.h b/engines/mutationofjb/inventory.h
index 91c2932f91..c22422def2 100644
--- a/engines/mutationofjb/inventory.h
+++ b/engines/mutationofjb/inventory.h
@@ -50,6 +50,7 @@ public:
 	void addItem(const Common::String &item);
 	void removeItem(const Common::String &item);
 	void removeAllItems();
+	void renameItem(const Common::String &oldName, const Common::String &newName);
 
 	void rotateItemsRight(uint n);
 	void rotateItemsLeft(uint n);
diff --git a/engines/mutationofjb/module.mk b/engines/mutationofjb/module.mk
index 2352ae9613..f66b67112f 100644
--- a/engines/mutationofjb/module.mk
+++ b/engines/mutationofjb/module.mk
@@ -16,6 +16,7 @@ MODULE_OBJS := \
 	commands/newroomcommand.o \
 	commands/removeallitemscommand.o \
 	commands/removeitemcommand.o \
+	commands/renamecommand.o \
 	commands/saycommand.o \
 	commands/seqcommand.o \
 	widgets/buttonwidget.o \
diff --git a/engines/mutationofjb/script.cpp b/engines/mutationofjb/script.cpp
index f213de98be..1f5571f0b5 100644
--- a/engines/mutationofjb/script.cpp
+++ b/engines/mutationofjb/script.cpp
@@ -42,6 +42,7 @@
 #include "mutationofjb/commands/camefromcommand.h"
 #include "mutationofjb/commands/callmacrocommand.h"
 #include "mutationofjb/commands/newroomcommand.h"
+#include "mutationofjb/commands/renamecommand.h"
 #include "mutationofjb/game.h"
 
 namespace MutationOfJB {
@@ -62,6 +63,7 @@ static CommandParser **getParsers() {
 		new AddItemCommandParser,
 		new RemoveItemCommandParser,
 		new RemoveAllItemsCommandParser,
+		new RenameCommandParser,
 		new NewRoomCommandParser,
 		new GotoCommandParser,
 		new LabelCommandParser,