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

11 files changed, 11 insertions, 50 deletions

diff --git a/engines/titanic/game/parrot/parrot_lobby_controller.h b/engines/titanic/game/parrot/parrot_lobby_controller.h
index 371e31eaa9..6515a23944 100644
--- a/engines/titanic/game/parrot/parrot_lobby_controller.h
+++ b/engines/titanic/game/parrot/parrot_lobby_controller.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CParrotLobbyController : public CParrotLobbyObject {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CParrotLobbyController"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/parrot/parrot_lobby_link_updater.h b/engines/titanic/game/parrot/parrot_lobby_link_updater.h
index d0843fe9ec..2f3ce7bac4 100644
--- a/engines/titanic/game/parrot/parrot_lobby_link_updater.h
+++ b/engines/titanic/game/parrot/parrot_lobby_link_updater.h
@@ -31,14 +31,10 @@ class CParrotLobbyLinkUpdater : public CParrotLobbyObject {
 public:
 	int _fieldBC;
 public:
+	CLASSDEF
 	CParrotLobbyLinkUpdater() : CParrotLobbyObject(), _fieldBC(1) {}
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CParrotLobbyLinkUpdater"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/parrot/parrot_lobby_object.h b/engines/titanic/game/parrot/parrot_lobby_object.h
index 85f2c3bc77..9cc979cd26 100644
--- a/engines/titanic/game/parrot/parrot_lobby_object.h
+++ b/engines/titanic/game/parrot/parrot_lobby_object.h
@@ -36,10 +36,7 @@ public:
 
 	static void init();
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CParrotLobbyObject"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/parrot/parrot_lobby_view_object.h b/engines/titanic/game/parrot/parrot_lobby_view_object.h
index 00f7bbc72d..1e3e398c2c 100644
--- a/engines/titanic/game/parrot/parrot_lobby_view_object.h
+++ b/engines/titanic/game/parrot/parrot_lobby_view_object.h
@@ -31,14 +31,10 @@ class CParrotLobbyViewObject : public CParrotLobbyObject {
 public:
 	int _fieldBC;
 public:
+	CLASSDEF
 	CParrotLobbyViewObject() : CParrotLobbyObject(), _fieldBC(1) {}
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CParrotLobbyViewObject"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/parrot/parrot_loser.h b/engines/titanic/game/parrot/parrot_loser.h
index dac253e189..806195db19 100644
--- a/engines/titanic/game/parrot/parrot_loser.h
+++ b/engines/titanic/game/parrot/parrot_loser.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CParrotLoser : public CGameObject {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CParrotLoser"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/parrot/parrot_nut_bowl_actor.h b/engines/titanic/game/parrot/parrot_nut_bowl_actor.h
index 623918c85b..d1ccca6a71 100644
--- a/engines/titanic/game/parrot/parrot_nut_bowl_actor.h
+++ b/engines/titanic/game/parrot/parrot_nut_bowl_actor.h
@@ -31,14 +31,10 @@ class CParrotNutBowlActor : public CGameObject {
 public:
 	int _value1, _value2;
 public:
+	CLASSDEF
 	CParrotNutBowlActor();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CParrotNutBowlActor"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/parrot/parrot_nut_eater.h b/engines/titanic/game/parrot/parrot_nut_eater.h
index 55367af818..6a7afd94cf 100644
--- a/engines/titanic/game/parrot/parrot_nut_eater.h
+++ b/engines/titanic/game/parrot/parrot_nut_eater.h
@@ -35,14 +35,10 @@ public:
 	int _fieldC8;
 	int _fieldCC;
 public:
+	CLASSDEF
 	CParrotNutEater();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CParrotNutEater"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/parrot/parrot_perch_holder.h b/engines/titanic/game/parrot/parrot_perch_holder.h
index 489e124a91..f355263846 100644
--- a/engines/titanic/game/parrot/parrot_perch_holder.h
+++ b/engines/titanic/game/parrot/parrot_perch_holder.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CParrotPerchHolder : public CMultiDropTarget {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CParrotPerchHolder"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/parrot/parrot_succubus.h b/engines/titanic/game/parrot/parrot_succubus.h
index aad8a7ffa5..e60d35cd6c 100644
--- a/engines/titanic/game/parrot/parrot_succubus.h
+++ b/engines/titanic/game/parrot/parrot_succubus.h
@@ -35,14 +35,10 @@ public:
 	int _field1F0;
 	int _field1F4;
 public:
+	CLASSDEF
 	CParrotSuccUBus();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CParrotSuccUBus"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/parrot/parrot_trigger.h b/engines/titanic/game/parrot/parrot_trigger.h
index cb0d59c320..33aea157ad 100644
--- a/engines/titanic/game/parrot/parrot_trigger.h
+++ b/engines/titanic/game/parrot/parrot_trigger.h
@@ -31,14 +31,10 @@ class CParrotTrigger : public CGameObject {
 public:
 	int _value;
 public:
+	CLASSDEF
 	CParrotTrigger() : CGameObject(), _value(0x446AB) {}
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CParrotTrigger"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/parrot/player_meets_parrot.h b/engines/titanic/game/parrot/player_meets_parrot.h
index 685e67a95d..d0c3b9d9f3 100644
--- a/engines/titanic/game/parrot/player_meets_parrot.h
+++ b/engines/titanic/game/parrot/player_meets_parrot.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CPlayerMeetsParrot : public CGameObject {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CPlayerMeetsParrot"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file