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

19 files changed, 19 insertions, 83 deletions

diff --git a/engines/titanic/game/sgt/armchair.h b/engines/titanic/game/sgt/armchair.h
index 2157c3c556..1ce6955c58 100644
--- a/engines/titanic/game/sgt/armchair.h
+++ b/engines/titanic/game/sgt/armchair.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CArmchair : public CSGTStateRoom {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CArmchair"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/sgt/basin.h b/engines/titanic/game/sgt/basin.h
index 85aaf476dd..cc9739fd1d 100644
--- a/engines/titanic/game/sgt/basin.h
+++ b/engines/titanic/game/sgt/basin.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CBasin : public CSGTStateRoom {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CBasin"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/sgt/bedfoot.h b/engines/titanic/game/sgt/bedfoot.h
index 7794fc4349..55be4fdadd 100644
--- a/engines/titanic/game/sgt/bedfoot.h
+++ b/engines/titanic/game/sgt/bedfoot.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CBedfoot : public CSGTStateRoom {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CBedfoot"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/sgt/bedhead.h b/engines/titanic/game/sgt/bedhead.h
index 36691639fc..317b7eb2a3 100644
--- a/engines/titanic/game/sgt/bedhead.h
+++ b/engines/titanic/game/sgt/bedhead.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CBedhead : public CSGTStateRoom {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CBedhead"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/sgt/chest_of_drawers.h b/engines/titanic/game/sgt/chest_of_drawers.h
index 17f5cf9e9b..e0bdd7579e 100644
--- a/engines/titanic/game/sgt/chest_of_drawers.h
+++ b/engines/titanic/game/sgt/chest_of_drawers.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CChestOfDrawers : public CSGTStateRoom {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CChestOfDrawers"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/sgt/desk.h b/engines/titanic/game/sgt/desk.h
index 4c89c04e4b..7fbb65ad5e 100644
--- a/engines/titanic/game/sgt/desk.h
+++ b/engines/titanic/game/sgt/desk.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CDesk : public CSGTStateRoom {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CDesk"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/sgt/deskchair.h b/engines/titanic/game/sgt/deskchair.h
index 762b639eb7..205209c22c 100644
--- a/engines/titanic/game/sgt/deskchair.h
+++ b/engines/titanic/game/sgt/deskchair.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CDeskchair : public CSGTStateRoom {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CDeskchair"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/sgt/drawer.h b/engines/titanic/game/sgt/drawer.h
index 100e27cb52..8436e5ccb7 100644
--- a/engines/titanic/game/sgt/drawer.h
+++ b/engines/titanic/game/sgt/drawer.h
@@ -31,14 +31,10 @@ class CDrawer : public CSGTStateRoom {
 private:
 	int _fieldF4;
 public:
+	CLASSDEF
 	CDrawer();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CDrawer"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/sgt/sgt_doors.h b/engines/titanic/game/sgt/sgt_doors.h
index 946404936f..9828708377 100644
--- a/engines/titanic/game/sgt/sgt_doors.h
+++ b/engines/titanic/game/sgt/sgt_doors.h
@@ -31,14 +31,10 @@ class CSGTDoors : public CGameObject {
 public:
 	int _value1, _value2;
 public:
+	CLASSDEF
 	CSGTDoors() : CGameObject(), _value1(0), _value2(0) {}
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CSGTDoors"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/sgt/sgt_nav.h b/engines/titanic/game/sgt/sgt_nav.h
index 7f1912dc35..7d7f57f851 100644
--- a/engines/titanic/game/sgt/sgt_nav.h
+++ b/engines/titanic/game/sgt/sgt_nav.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class SGTNav : public CSGTStateRoom {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "SGTNav"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/sgt/sgt_navigation.h b/engines/titanic/game/sgt/sgt_navigation.h
index 539a6073a8..083efa8cfa 100644
--- a/engines/titanic/game/sgt/sgt_navigation.h
+++ b/engines/titanic/game/sgt/sgt_navigation.h
@@ -37,15 +37,11 @@ class CSGTNavigation : public CGameObject {
 private:
 	static CSGTNavigationStatics *_statics;
 public:
+	CLASSDEF
 	static void init();
 	static void deinit();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CSGTNavigation"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/sgt/sgt_restaurant_doors.h b/engines/titanic/game/sgt/sgt_restaurant_doors.h
index 904c0c6b60..14677ea5f9 100644
--- a/engines/titanic/game/sgt/sgt_restaurant_doors.h
+++ b/engines/titanic/game/sgt/sgt_restaurant_doors.h
@@ -31,14 +31,10 @@ class CSGTRestaurantDoors : public CGameObject {
 private:
 	int _fieldBC;
 public:
+	CLASSDEF
 	CSGTRestaurantDoors() : CGameObject(), _fieldBC(0) {}
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CSGTRestaurantDoors"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/sgt/sgt_state_control.h b/engines/titanic/game/sgt/sgt_state_control.h
index b22095cb14..05d8fde7d1 100644
--- a/engines/titanic/game/sgt/sgt_state_control.h
+++ b/engines/titanic/game/sgt/sgt_state_control.h
@@ -31,14 +31,10 @@ class CSGTStateControl : public CBackground {
 private:
 	int _fieldE0;
 public:
+	CLASSDEF
 	CSGTStateControl() : CBackground(), _fieldE0(1) {}
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CSGTStateControl"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/sgt/sgt_state_room.h b/engines/titanic/game/sgt/sgt_state_room.h
index f67a916f1f..dfac6894b9 100644
--- a/engines/titanic/game/sgt/sgt_state_room.h
+++ b/engines/titanic/game/sgt/sgt_state_room.h
@@ -54,16 +54,12 @@ private:
 	int _fieldEC;
 	int _fieldF0;
 public:
+	CLASSDEF
 	CSGTStateRoom();
 	static void init();
 	static void deinit();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CSGTStateRoom"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/sgt/sgt_tv.h b/engines/titanic/game/sgt/sgt_tv.h
index 79e7efde4f..347d2c74ab 100644
--- a/engines/titanic/game/sgt/sgt_tv.h
+++ b/engines/titanic/game/sgt/sgt_tv.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CSGTTV : public CSGTStateRoom {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CSGTTV"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/sgt/sgt_upper_doors_sound.h b/engines/titanic/game/sgt/sgt_upper_doors_sound.h
index ed97627315..cd62aa5cf6 100644
--- a/engines/titanic/game/sgt/sgt_upper_doors_sound.h
+++ b/engines/titanic/game/sgt/sgt_upper_doors_sound.h
@@ -29,14 +29,10 @@ namespace Titanic {
 
 class CSGTUpperDoorsSound : public CClickResponder {
 public:
+	CLASSDEF
 	CSGTUpperDoorsSound();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CSGTUpperDoorsSound"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/sgt/toilet.h b/engines/titanic/game/sgt/toilet.h
index a5265e7473..08926516ee 100644
--- a/engines/titanic/game/sgt/toilet.h
+++ b/engines/titanic/game/sgt/toilet.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CToilet : public CSGTStateRoom {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CToilet"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/sgt/vase.h b/engines/titanic/game/sgt/vase.h
index 37a58181a2..1b2a89f17b 100644
--- a/engines/titanic/game/sgt/vase.h
+++ b/engines/titanic/game/sgt/vase.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CVase : public CSGTStateRoom {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CVase"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/sgt/washstand.h b/engines/titanic/game/sgt/washstand.h
index 40eb5a4eee..975a4d57c9 100644
--- a/engines/titanic/game/sgt/washstand.h
+++ b/engines/titanic/game/sgt/washstand.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CWashstand : public CSGTStateRoom {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CWashstand"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file