From 5dce31417cd257785b9bbc790a9686e64a4aff37 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 2 Mar 2016 19:21:31 -0500
Subject: TITANIC: More saveable classes implemented

---
 engines/titanic/game/nav_helmet.h | 54 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 engines/titanic/game/nav_helmet.h

(limited to 'engines/titanic/game/nav_helmet.h')

diff --git a/engines/titanic/game/nav_helmet.h b/engines/titanic/game/nav_helmet.h
new file mode 100644
index 0000000000..31eee9977a
--- /dev/null
+++ b/engines/titanic/game/nav_helmet.h
@@ -0,0 +1,54 @@
+/* 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 TITANIC_NAV_HELMET_H
+#define TITANIC_NAV_HELMET_H
+
+#include "titanic/core/game_object.h"
+
+namespace Titanic {
+
+class CNavHelmet : public CGameObject {
+private:
+	int _value;
+public:
+	CNavHelmet() : CGameObject(), _value(0) {}
+
+	/**
+	 * Return the class name
+	 */
+	virtual const char *getClassName() const { return "CNavHelmet"; }
+
+	/**
+	 * Save the data for the class to file
+	 */
+	virtual void save(SimpleFile *file, int indent) const;
+
+	/**
+	 * Load the data for the class from file
+	 */
+	virtual void load(SimpleFile *file);
+};
+
+} // End of namespace Titanic
+
+#endif /* TITANIC_NAV_HELMET_H */
-- 
cgit v1.2.3


From 7375394b810f3503f168d5770555aa1932d7892d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 6 Mar 2016 19:12:49 -0500
Subject: TITANIC: Converting saveable objects hierarchy to have type data

This is necessary for at least message sending, and probably other
areas, that needs to be able to pass class filtering for message
targets. And I could figure out a clean way to use the built-in RTTI
---
 engines/titanic/game/nav_helmet.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'engines/titanic/game/nav_helmet.h')

diff --git a/engines/titanic/game/nav_helmet.h b/engines/titanic/game/nav_helmet.h
index 31eee9977a..ff39280e5b 100644
--- a/engines/titanic/game/nav_helmet.h
+++ b/engines/titanic/game/nav_helmet.h
@@ -31,13 +31,9 @@ class CNavHelmet : public CGameObject {
 private:
 	int _value;
 public:
+	CLASSDEF
 	CNavHelmet() : CGameObject(), _value(0) {}
 
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CNavHelmet"; }
-
 	/**
 	 * Save the data for the class to file
 	 */
-- 
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/game/nav_helmet.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/titanic/game/nav_helmet.h')

diff --git a/engines/titanic/game/nav_helmet.h b/engines/titanic/game/nav_helmet.h
index ff39280e5b..5e17622b65 100644
--- a/engines/titanic/game/nav_helmet.h
+++ b/engines/titanic/game/nav_helmet.h
@@ -37,7 +37,7 @@ public:
 	/**
 	 * Save the data for the class to file
 	 */
-	virtual void save(SimpleFile *file, int indent) const;
+	virtual void save(SimpleFile *file, int indent);
 
 	/**
 	 * Load the data for the class from file
-- 
cgit v1.2.3


From 4d79ee16c07e2398e9058fe93947b4704cd6048a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 Jul 2016 20:30:56 -0400
Subject: TITANIC: Add semicolon after CLASSDEF macro usage

---
 engines/titanic/game/nav_helmet.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/titanic/game/nav_helmet.h')

diff --git a/engines/titanic/game/nav_helmet.h b/engines/titanic/game/nav_helmet.h
index 5e17622b65..74caa52534 100644
--- a/engines/titanic/game/nav_helmet.h
+++ b/engines/titanic/game/nav_helmet.h
@@ -31,7 +31,7 @@ class CNavHelmet : public CGameObject {
 private:
 	int _value;
 public:
-	CLASSDEF
+	CLASSDEF;
 	CNavHelmet() : CGameObject(), _value(0) {}
 
 	/**
-- 
cgit v1.2.3