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

5 files changed, 5 insertions, 23 deletions

diff --git a/engines/titanic/game/gondolier/gondolier_base.h b/engines/titanic/game/gondolier/gondolier_base.h
index 3f0cede70d..c45e3e2283 100644
--- a/engines/titanic/game/gondolier/gondolier_base.h
+++ b/engines/titanic/game/gondolier/gondolier_base.h
@@ -40,10 +40,7 @@ private:
 	static int _v9;
 	static int _v10;
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CGondolierBase"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/gondolier/gondolier_chest.h b/engines/titanic/game/gondolier/gondolier_chest.h
index 277faf994f..d2c13812f4 100644
--- a/engines/titanic/game/gondolier/gondolier_chest.h
+++ b/engines/titanic/game/gondolier/gondolier_chest.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CGondolierChest : public CGondolierBase {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CGondolierChest"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/gondolier/gondolier_face.h b/engines/titanic/game/gondolier/gondolier_face.h
index 5007431337..334cab143f 100644
--- a/engines/titanic/game/gondolier/gondolier_face.h
+++ b/engines/titanic/game/gondolier/gondolier_face.h
@@ -31,14 +31,10 @@ class CGondolierFace : public CGondolierBase {
 private:
 	int _fieldBC;
 public:
+	CLASSDEF
 	CGondolierFace() : CGondolierBase(), _fieldBC(0) {}
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CGondolierMixer"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/gondolier/gondolier_mixer.h b/engines/titanic/game/gondolier/gondolier_mixer.h
index 5b92bc2fb8..173bcd8ac2 100644
--- a/engines/titanic/game/gondolier/gondolier_mixer.h
+++ b/engines/titanic/game/gondolier/gondolier_mixer.h
@@ -37,14 +37,10 @@ private:
 	CString _string2;
 	int _fieldE4;
 public:
+	CLASSDEF
 	CGondolierMixer();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CGondolierMixer"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/gondolier/gondolier_slider.h b/engines/titanic/game/gondolier/gondolier_slider.h
index 9522483dc0..eef4a58089 100644
--- a/engines/titanic/game/gondolier/gondolier_slider.h
+++ b/engines/titanic/game/gondolier/gondolier_slider.h
@@ -48,14 +48,10 @@ private:
 	CString _string3;
 	int _field118;
 public:
+	CLASSDEF
 	CGondolierSlider();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CGondolierSlider"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;