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

7 files changed, 7 insertions, 32 deletions

diff --git a/engines/titanic/game/transport/exit_pellerator.h b/engines/titanic/game/transport/exit_pellerator.h
index d327ea6ba6..e72cbb4b9d 100644
--- a/engines/titanic/game/transport/exit_pellerator.h
+++ b/engines/titanic/game/transport/exit_pellerator.h
@@ -32,10 +32,7 @@ private:
 	static int _v1;
 	static int _v2;
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CPellerator"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/transport/gondolier.h b/engines/titanic/game/transport/gondolier.h
index 1d874beb3a..bdfb3e7156 100644
--- a/engines/titanic/game/transport/gondolier.h
+++ b/engines/titanic/game/transport/gondolier.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CGondolier : public CTransport {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CGondolier"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/transport/lift.h b/engines/titanic/game/transport/lift.h
index acb5fde45b..b1cd48960e 100644
--- a/engines/titanic/game/transport/lift.h
+++ b/engines/titanic/game/transport/lift.h
@@ -38,14 +38,10 @@ private:
 
 	int _fieldF8;
 public:
+	CLASSDEF
 	CLift() : CTransport(), _fieldF8(1) {}
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CLift"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/transport/lift_indicator.h b/engines/titanic/game/transport/lift_indicator.h
index bbd6cb2867..2fe6e1a61e 100644
--- a/engines/titanic/game/transport/lift_indicator.h
+++ b/engines/titanic/game/transport/lift_indicator.h
@@ -34,14 +34,10 @@ private:
 	int _field108;
 	int _field10C;
 public:
+	CLASSDEF
 	CLiftindicator();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CLiftindicator"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/transport/pellerator.h b/engines/titanic/game/transport/pellerator.h
index d327ea6ba6..e72cbb4b9d 100644
--- a/engines/titanic/game/transport/pellerator.h
+++ b/engines/titanic/game/transport/pellerator.h
@@ -32,10 +32,7 @@ private:
 	static int _v1;
 	static int _v2;
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CPellerator"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/transport/service_elevator.h b/engines/titanic/game/transport/service_elevator.h
index f97e3bcd5e..9edc1f9100 100644
--- a/engines/titanic/game/transport/service_elevator.h
+++ b/engines/titanic/game/transport/service_elevator.h
@@ -38,14 +38,10 @@ private:
 	int _field100;
 	int _field104;
 public:
+	CLASSDEF
 	CServiceElevator();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CServiceElevator"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/transport/transport.h b/engines/titanic/game/transport/transport.h
index 6e3f1a2d1d..faa00b4dd9 100644
--- a/engines/titanic/game/transport/transport.h
+++ b/engines/titanic/game/transport/transport.h
@@ -32,14 +32,10 @@ public:
 	CString _string1;
 	CString _string2;
 public:
+	CLASSDEF
 	CTransport();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CTransport"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;