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

16 files changed, 16 insertions, 80 deletions

diff --git a/engines/titanic/npcs/barbot.h b/engines/titanic/npcs/barbot.h
index d14d5a2d1d..7e2d323d46 100644
--- a/engines/titanic/npcs/barbot.h
+++ b/engines/titanic/npcs/barbot.h
@@ -173,14 +173,10 @@ private:
 	int _field33C;
 	int _field340;
 public:
+	CLASSDEF
 	CBarbot();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CBarbot"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/npcs/bellbot.h b/engines/titanic/npcs/bellbot.h
index b47daa1404..c3d38f65ec 100644
--- a/engines/titanic/npcs/bellbot.h
+++ b/engines/titanic/npcs/bellbot.h
@@ -31,14 +31,10 @@ class CBellBot : public CTrueTalkNPC {
 private:
 	int _field108;
 public:
+	CLASSDEF
 	CBellBot();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CBellBot"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/npcs/callbot.h b/engines/titanic/npcs/callbot.h
index 2f9edd3734..299a329c07 100644
--- a/engines/titanic/npcs/callbot.h
+++ b/engines/titanic/npcs/callbot.h
@@ -32,14 +32,10 @@ protected:
 	CString _string1;
 	int _fieldC8;
 public:
+	CLASSDEF
 	CCallBot();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CCallBot"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/npcs/character.h b/engines/titanic/npcs/character.h
index 8e1e87eb95..2fb83e9288 100644
--- a/engines/titanic/npcs/character.h
+++ b/engines/titanic/npcs/character.h
@@ -34,14 +34,10 @@ protected:
 	int _fieldC4;
 	CString _charName;
 public:
+	CLASSDEF
 	CCharacter();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CCharacter"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/npcs/deskbot.h b/engines/titanic/npcs/deskbot.h
index 2826b01660..cb977e416d 100644
--- a/engines/titanic/npcs/deskbot.h
+++ b/engines/titanic/npcs/deskbot.h
@@ -35,14 +35,10 @@ private:
 	int _field108;
 	int _field10C;
 public:
+	CLASSDEF
 	CDeskbot();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CDeskbot"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/npcs/doorbot.h b/engines/titanic/npcs/doorbot.h
index e3ec7e83a4..f0c46e5a16 100644
--- a/engines/titanic/npcs/doorbot.h
+++ b/engines/titanic/npcs/doorbot.h
@@ -37,14 +37,10 @@ private:
 	int _field110;
 	int _field114;
 public:
+	CLASSDEF
 	CDoorbot();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CDoorbot"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/npcs/liftbot.h b/engines/titanic/npcs/liftbot.h
index f18fd7f32d..27556ed942 100644
--- a/engines/titanic/npcs/liftbot.h
+++ b/engines/titanic/npcs/liftbot.h
@@ -34,14 +34,10 @@ private:
 private:
 	int _field108;
 public:
+	CLASSDEF
 	CLiftBot();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CLiftBot"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/npcs/maitre_d.h b/engines/titanic/npcs/maitre_d.h
index f44d6eeec0..bae682bc74 100644
--- a/engines/titanic/npcs/maitre_d.h
+++ b/engines/titanic/npcs/maitre_d.h
@@ -41,14 +41,10 @@ private:
 	int _field134;
 	int _field138;
 public:
+	CLASSDEF
 	CMaitreD();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CMaitreD"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/npcs/mobile.h b/engines/titanic/npcs/mobile.h
index 9c74170ac0..512bb9fe9f 100644
--- a/engines/titanic/npcs/mobile.h
+++ b/engines/titanic/npcs/mobile.h
@@ -32,14 +32,10 @@ private:
 	Common::Point _pos1;
 	int _fieldDC;
 public:
+	CLASSDEF
 	CMobile();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CMobile"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/npcs/parrot.h b/engines/titanic/npcs/parrot.h
index 991066e3b5..b69c8723d3 100644
--- a/engines/titanic/npcs/parrot.h
+++ b/engines/titanic/npcs/parrot.h
@@ -92,14 +92,10 @@ private:
 	int _field1E8;
 	int _field1EC;
 public:
+	CLASSDEF
 	CParrot();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CParrot"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/npcs/robot_controller.h b/engines/titanic/npcs/robot_controller.h
index 876285e70d..998453eb62 100644
--- a/engines/titanic/npcs/robot_controller.h
+++ b/engines/titanic/npcs/robot_controller.h
@@ -31,14 +31,10 @@ class CRobotController : public CGameObject {
 protected:
 	CString _string1;
 public:
+	CLASSDEF
 	CRobotController();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CRobotController"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/npcs/starlings.h b/engines/titanic/npcs/starlings.h
index 472d0f58fb..f7b144273c 100644
--- a/engines/titanic/npcs/starlings.h
+++ b/engines/titanic/npcs/starlings.h
@@ -31,14 +31,10 @@ class CStarlings : public CCharacter {
 private:
 	static int _v1;
 public:
+	CLASSDEF
 	CStarlings();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CStarlings"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/npcs/succubus.h b/engines/titanic/npcs/succubus.h
index 2e30b12ab5..e46592caa1 100644
--- a/engines/titanic/npcs/succubus.h
+++ b/engines/titanic/npcs/succubus.h
@@ -87,14 +87,10 @@ private:
 	int _field1D4;
 	int _field1D8;
 public:
+	CLASSDEF
 	CSuccUBus();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CSuccUBus"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/npcs/summon_bots.h b/engines/titanic/npcs/summon_bots.h
index d525ff69f3..80aef73486 100644
--- a/engines/titanic/npcs/summon_bots.h
+++ b/engines/titanic/npcs/summon_bots.h
@@ -33,14 +33,10 @@ protected:
 	int _fieldC8;
 	int _fieldCC;
 public:
+	CLASSDEF
 	CSummonBots();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CSummonBots"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/npcs/titania.h b/engines/titanic/npcs/titania.h
index ee61222be4..4c4c81267b 100644
--- a/engines/titanic/npcs/titania.h
+++ b/engines/titanic/npcs/titania.h
@@ -42,14 +42,10 @@ private:
 	int _fieldFC;
 	int _field100;
 public:
+	CLASSDEF
 	CTitania();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CTitania"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/npcs/true_talk_npc.h b/engines/titanic/npcs/true_talk_npc.h
index aed1ddb404..9546f18e0c 100644
--- a/engines/titanic/npcs/true_talk_npc.h
+++ b/engines/titanic/npcs/true_talk_npc.h
@@ -41,14 +41,10 @@ protected:
 	int _field100;
 	int _field104;
 public:
+	CLASSDEF
 	CTrueTalkNPC();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CTrueTalkNPC"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;