From 63db0980e5f48764667863afe15b8f43b386c1a8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 25 Feb 2016 08:48:21 -0500
Subject: TITANIC: Rename of sub-folders for better clarity

---
 engines/titanic/core/message_target.cpp | 37 +++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 engines/titanic/core/message_target.cpp

(limited to 'engines/titanic/core/message_target.cpp')

diff --git a/engines/titanic/core/message_target.cpp b/engines/titanic/core/message_target.cpp
new file mode 100644
index 0000000000..a7dd3a02a2
--- /dev/null
+++ b/engines/titanic/core/message_target.cpp
@@ -0,0 +1,37 @@
+/* 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/core/message_target.h"
+
+namespace Titanic {
+	
+void CMessageTarget::save(SimpleFile *file, int indent) const {
+	file->writeNumberLine(0, indent);
+	CSaveableObject::save(file, indent);
+}
+
+void CMessageTarget::load(SimpleFile *file) {
+	file->readNumber();
+	CSaveableObject::load(file);
+}
+
+} // End of namespace Titanic
-- 
cgit v1.2.3


From 51df4d98d3a066e092f34cf7968c436a3e430df2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 6 Apr 2016 22:17:26 -0400
Subject: TITANIC: In-progress converting message handling to be more like
 original

I currently was using multiple inheritance to define the message classes
that a class supports, but this caused problems when, for example, a
class tested to see if an object supported CMouseMsg. The class in
question supported several mouse messages, but a standard dynamic_cast
returned nullptr for the class, since it didn't directly support it
---
 engines/titanic/core/message_target.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'engines/titanic/core/message_target.cpp')

diff --git a/engines/titanic/core/message_target.cpp b/engines/titanic/core/message_target.cpp
index a7dd3a02a2..b99fa5c606 100644
--- a/engines/titanic/core/message_target.cpp
+++ b/engines/titanic/core/message_target.cpp
@@ -23,7 +23,20 @@
 #include "titanic/core/message_target.h"
 
 namespace Titanic {
-	
+
+const MSGMAP *CMessageTarget::getMessageMap() const { 
+	return getThisMessageMap();
+}
+
+const MSGMAP *CMessageTarget::getThisMessageMap() {
+	static const MSGMAP_ENTRY _messageEntries[] = {
+		{ (PMSG)nullptr, nullptr }
+	};
+
+	static const MSGMAP messageMap = { nullptr, &_messageEntries[0] };
+	return &messageMap;
+}
+
 void CMessageTarget::save(SimpleFile *file, int indent) const {
 	file->writeNumberLine(0, indent);
 	CSaveableObject::save(file, indent);
-- 
cgit v1.2.3


From 5ccc0a66da38d23520234e7060efaf966d3345b9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 29 Jun 2016 19:53:16 -0400
Subject: TITANIC: Removed const modifier from all saveable objects

Turns out that CGameObject::save regenerates the _movieRangeInfo list.
So the const suffix can no longer be used for the entire hierarchy
---
 engines/titanic/core/message_target.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/titanic/core/message_target.cpp')

diff --git a/engines/titanic/core/message_target.cpp b/engines/titanic/core/message_target.cpp
index b99fa5c606..4815d03973 100644
--- a/engines/titanic/core/message_target.cpp
+++ b/engines/titanic/core/message_target.cpp
@@ -37,7 +37,7 @@ const MSGMAP *CMessageTarget::getThisMessageMap() {
 	return &messageMap;
 }
 
-void CMessageTarget::save(SimpleFile *file, int indent) const {
+void CMessageTarget::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(0, indent);
 	CSaveableObject::save(file, indent);
 }
-- 
cgit v1.2.3