12 files changed, 12 insertions, 50 deletions
diff --git a/engines/titanic/game/pet/pet.h b/engines/titanic/game/pet/pet.h
index 096c1de9bf..58e3577235 100644
--- a/engines/titanic/game/pet/pet.h
+++ b/engines/titanic/game/pet/pet.h
@@ -37,14 +37,10 @@ public:
 	int _fieldD8;
 	int _fieldDC;
 public:
+	CLASSDEF
 	CPET();
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CPET"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/pet/pet_class1.h b/engines/titanic/game/pet/pet_class1.h
index c390a8732e..12dfb322b2 100644
--- a/engines/titanic/game/pet/pet_class1.h
+++ b/engines/titanic/game/pet/pet_class1.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CPETClass1 : public CGameObject {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CPETClass1"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/pet/pet_class2.h b/engines/titanic/game/pet/pet_class2.h
index cfa445e6e2..5b96118c7c 100644
--- a/engines/titanic/game/pet/pet_class2.h
+++ b/engines/titanic/game/pet/pet_class2.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CPETClass2 : public CGameObject {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CPETClass2"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/pet/pet_class3.h b/engines/titanic/game/pet/pet_class3.h
index a41a4d53f6..d68cb098ec 100644
--- a/engines/titanic/game/pet/pet_class3.h
+++ b/engines/titanic/game/pet/pet_class3.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CPETClass3 : public CGameObject {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CPETClass3"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/pet/pet_lift.h b/engines/titanic/game/pet/pet_lift.h
index 11207cde26..1c56b0515a 100644
--- a/engines/titanic/game/pet/pet_lift.h
+++ b/engines/titanic/game/pet/pet_lift.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CPETLift : public CPETTransport {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CPETLift"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/pet/pet_monitor.h b/engines/titanic/game/pet/pet_monitor.h
index 544bbdea0e..ff2209802d 100644
--- a/engines/titanic/game/pet/pet_monitor.h
+++ b/engines/titanic/game/pet/pet_monitor.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CPETMonitor : public CGameObject {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CPETMonitor"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/pet/pet_pellerator.h b/engines/titanic/game/pet/pet_pellerator.h
index 7314f7297a..1036c93c66 100644
--- a/engines/titanic/game/pet/pet_pellerator.h
+++ b/engines/titanic/game/pet/pet_pellerator.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CPETPellerator : public CPETTransport {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CPETPellerator"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/pet/pet_position.h b/engines/titanic/game/pet/pet_position.h
index 6454b1e489..407a42f0ae 100644
--- a/engines/titanic/game/pet/pet_position.h
+++ b/engines/titanic/game/pet/pet_position.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CPETPosition : public CGameObject {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CPETPosition"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/pet/pet_sentinal.h b/engines/titanic/game/pet/pet_sentinal.h
index 98f05dfee6..728ddbfe57 100644
--- a/engines/titanic/game/pet/pet_sentinal.h
+++ b/engines/titanic/game/pet/pet_sentinal.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CPETSentinal : public CGameObject {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CPETSentinal"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/pet/pet_sounds.h b/engines/titanic/game/pet/pet_sounds.h
index cae45ac89d..f099d9efb5 100644
--- a/engines/titanic/game/pet/pet_sounds.h
+++ b/engines/titanic/game/pet/pet_sounds.h
@@ -31,14 +31,10 @@ class CPETSounds : public CGameObject {
 public:
 	int _value;
 public:
+	CLASSDEF
 	CPETSounds() : CGameObject(), _value(0) {}
 
 	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CPETSounds"; }
-
-	/**
 	 * Save the data for the class to file
 	 */
 	virtual void save(SimpleFile *file, int indent) const;
diff --git a/engines/titanic/game/pet/pet_transition.h b/engines/titanic/game/pet/pet_transition.h
index 3ccb45fb04..c8dc153d53 100644
--- a/engines/titanic/game/pet/pet_transition.h
+++ b/engines/titanic/game/pet/pet_transition.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CPETTransition : public CGameObject {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CPETTransition"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
diff --git a/engines/titanic/game/pet/pet_transport.h b/engines/titanic/game/pet/pet_transport.h
index af821ef334..1aa6df8ced 100644
--- a/engines/titanic/game/pet/pet_transport.h
+++ b/engines/titanic/game/pet/pet_transport.h
@@ -29,10 +29,7 @@ namespace Titanic {
 
 class CPETTransport : public CGameObject {
 public:
-	/**
-	 * Return the class name
-	 */
-	virtual const char *getClassName() const { return "CPETTransport"; }
+	CLASSDEF
 
 	/**
 	 * Save the data for the class to file