Merge branch 'master' into xeen

1 files changed, 93 insertions, 0 deletions

diff --git a/engines/titanic/carry/magazine.cpp b/engines/titanic/carry/magazine.cpp
new file mode 100644
index 0000000000..cdf92fc707
--- /dev/null
+++ b/engines/titanic/carry/magazine.cpp
@@ -0,0 +1,93 @@
+/* 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 "titanic/carry/magazine.h"
+#include "titanic/npcs/deskbot.h"
+
+namespace Titanic {
+
+BEGIN_MESSAGE_MAP(CMagazine, CCarry)
+	ON_MESSAGE(UseWithCharMsg)
+	ON_MESSAGE(MouseDoubleClickMsg)
+	ON_MESSAGE(VisibleMsg)
+	ON_MESSAGE(UseWithOtherMsg)
+END_MESSAGE_MAP()
+
+CMagazine::CMagazine() : CCarry() {
+}
+
+void CMagazine::save(SimpleFile *file, int indent) {
+	file->writeNumberLine(1, indent);
+	file->writeNumberLine(_field12C, indent);
+	file->writeNumberLine(_field130, indent);
+
+	CCarry::save(file, indent);
+}
+
+void CMagazine::load(SimpleFile *file) {
+	file->readNumber();
+	_field12C = file->readNumber();
+	_field130 = file->readNumber();
+
+	CCarry::load(file);
+}
+
+bool CMagazine::UseWithCharMsg(CUseWithCharMsg *msg) {
+	CDeskbot *deskbot = static_cast<CDeskbot *>(msg->_character);
+	if (deskbot) {
+		if (deskbot->_deskbotActive) {
+			setVisible(false);
+			setPosition(Point(1000, 1000));
+			CActMsg actMsg("2ndClassUpgrade");
+			actMsg.execute("Deskbot");
+		}
+
+		return true;
+	} else {
+		return CCarry::UseWithCharMsg(msg);
+	}
+}
+
+bool CMagazine::MouseDoubleClickMsg(CMouseDoubleClickMsg *msg) {
+	return true;
+}
+
+bool CMagazine::VisibleMsg(CVisibleMsg *msg) {
+	setVisible(msg->_visible);
+	return true;
+}
+
+bool CMagazine::UseWithOtherMsg(CUseWithOtherMsg *msg) {
+	if (msg->_other->getName() == "SwitchOnDeskbot") {
+		// TODO: other _field108 if
+		if (false) {
+			setVisible(false);
+			setPosition(Point(1000, 1000));
+			CActMsg actMsg("2ndClassUpgrade");
+			actMsg.execute("Deskbot");
+		}
+	}
+
+	return true;
+}
+
+} // End of namespace Titanic