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

4 files changed, 4 insertions, 19 deletions

diff --git a/engines/titanic/game/maitred/maitred_arm_holder.h b/engines/titanic/game/maitred/maitred_arm_holder.h
index b838109fa3..e329157837 100644
--- a/engines/titanic/game/maitred/maitred_arm_holder.h
+++ b/engines/titanic/game/maitred/maitred_arm_holder.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CMaitreDArmHolder : public CDropTarget {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CMaitreDArmHolder"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/maitred/maitred_body.h b/engines/titanic/game/maitred/maitred_body.h
index 29e528b1f6..9dcc2af4ea 100644
--- a/engines/titanic/game/maitred/maitred_body.h
+++ b/engines/titanic/game/maitred/maitred_body.h
@@ -31,14 +31,10 @@ class CMaitreDBody : public CMaitreDProdReceptor {
 private:
 	int _fieldC8;
 public:
+	CLASSDEF
 	CMaitreDBody() : CMaitreDProdReceptor(), _fieldC8(1) {}
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CMaitreDBody"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/maitred/maitred_legs.h b/engines/titanic/game/maitred/maitred_legs.h
index e3ac93c870..0dc1b34143 100644
--- a/engines/titanic/game/maitred/maitred_legs.h
+++ b/engines/titanic/game/maitred/maitred_legs.h
@@ -31,14 +31,10 @@ class CMaitreDLegs : public CMaitreDProdReceptor {
 private:
 	int _fieldC8;
 public:
+	CLASSDEF
 	CMaitreDLegs() : CMaitreDProdReceptor(), _fieldC8(1) {}
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CMaitreDLegs"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/maitred/maitred_prod_receptor.h b/engines/titanic/game/maitred/maitred_prod_receptor.h
index 130bc547b2..b82c95b9b5 100644
--- a/engines/titanic/game/maitred/maitred_prod_receptor.h
+++ b/engines/titanic/game/maitred/maitred_prod_receptor.h
@@ -33,15 +33,11 @@ protected:
 	int _fieldC0;
 	int _fieldC4;
 public:
+	CLASSDEF
 	CMaitreDProdReceptor() : CGameObject(),
 		_fieldBC(0), _fieldC0(0), _fieldC4(1) {}
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CMaitreDProdReceptor"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;