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, 5 insertions, 17 deletions

diff --git a/engines/titanic/game/placeholder/bar_shelf_vis_centre.h b/engines/titanic/game/placeholder/bar_shelf_vis_centre.h
index 1cd3ca22bf..a2d39c3ea7 100644
--- a/engines/titanic/game/placeholder/bar_shelf_vis_centre.h
+++ b/engines/titanic/game/placeholder/bar_shelf_vis_centre.h
@@ -31,12 +31,9 @@ class CBarShelfVisCentre : public CPlaceHolder {
 private:
 	int _value;
 public:
+	CLASSDEF
 	CBarShelfVisCentre() : CPlaceHolder(), _value(0) {}
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CBarShelfVisCentre"; }
-
+	
 	/**
 	 * Save the data for the class to file
 	 */
diff --git a/engines/titanic/game/placeholder/lemon_on_bar.h b/engines/titanic/game/placeholder/lemon_on_bar.h
index d02f7a9eb8..c88698fcab 100644
--- a/engines/titanic/game/placeholder/lemon_on_bar.h
+++ b/engines/titanic/game/placeholder/lemon_on_bar.h
@@ -31,10 +31,7 @@ class CLemonOnBar : public CPlaceHolder {
 private:
 	Common::Point _pos1;
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CLemonOnBar"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/placeholder/place_holder.h b/engines/titanic/game/placeholder/place_holder.h
index dd1c89dd86..4d01cd6c39 100644
--- a/engines/titanic/game/placeholder/place_holder.h
+++ b/engines/titanic/game/placeholder/place_holder.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CPlaceHolder : public CGameObject {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CPlaceHolder"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/placeholder/tv_on_bar.h b/engines/titanic/game/placeholder/tv_on_bar.h
index 1583dad05a..3358cd6fec 100644
--- a/engines/titanic/game/placeholder/tv_on_bar.h
+++ b/engines/titanic/game/placeholder/tv_on_bar.h
@@ -31,10 +31,7 @@ class CTVOnBar : public CPlaceHolder {
 private:
 	Common::Point _pos1;
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CTVOnBar"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file