diff options
385 files changed, 1215 insertions, 2579 deletions
diff --git a/engines/titanic/carry/arm.h b/engines/titanic/carry/arm.h index 4874707fc5..1f93009d04 100644 --- a/engines/titanic/carry/arm.h +++ b/engines/titanic/carry/arm.h @@ -44,14 +44,10 @@ private: int _field16C; int _field170; public: + CLASSDEF CArm(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CArm"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/auditory_centre.h b/engines/titanic/carry/auditory_centre.h index 9708b6fbfa..c429fd78cd 100644 --- a/engines/titanic/carry/auditory_centre.h +++ b/engines/titanic/carry/auditory_centre.h @@ -29,10 +29,7 @@ namespace Titanic { class CAuditoryCentre : public CBrain { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CAuditoryCentre"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/carry/bowl_ear.h b/engines/titanic/carry/bowl_ear.h index c03446dc99..1617ceda8d 100644 --- a/engines/titanic/carry/bowl_ear.h +++ b/engines/titanic/carry/bowl_ear.h @@ -29,10 +29,7 @@ namespace Titanic { class CBowlEar : public CEar { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBowlEar"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/carry/brain.h b/engines/titanic/carry/brain.h index b5ec70e836..8cfd491cea 100644 --- a/engines/titanic/carry/brain.h +++ b/engines/titanic/carry/brain.h @@ -33,14 +33,10 @@ private: int _field134; int _field138; public: + CLASSDEF CBrain(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBrain"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/bridge_piece.h b/engines/titanic/carry/bridge_piece.h index 50a26c9048..b96015a2a9 100644 --- a/engines/titanic/carry/bridge_piece.h +++ b/engines/titanic/carry/bridge_piece.h @@ -33,14 +33,10 @@ private: Common::Point _pos3; int _field140; public: + CLASSDEF CBridgePiece(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBridgePiece"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/carry.h b/engines/titanic/carry/carry.h index b83ecb7aca..6b3ae2323e 100644 --- a/engines/titanic/carry/carry.h +++ b/engines/titanic/carry/carry.h @@ -47,14 +47,10 @@ private: int _field124; int _field128; public: + CLASSDEF CCarry(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCarry"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/carry_parrot.h b/engines/titanic/carry/carry_parrot.h index d4c71000fe..a2b17004ac 100644 --- a/engines/titanic/carry/carry_parrot.h +++ b/engines/titanic/carry/carry_parrot.h @@ -38,14 +38,10 @@ private: int _field14C; int _field150; public: + CLASSDEF CCarryParrot(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCarryParrot"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/central_core.h b/engines/titanic/carry/central_core.h index 277b302e5b..b397046088 100644 --- a/engines/titanic/carry/central_core.h +++ b/engines/titanic/carry/central_core.h @@ -29,10 +29,7 @@ namespace Titanic { class CCentralCore : public CBrain { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCentralCore"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/carry/chicken.h b/engines/titanic/carry/chicken.h index a2ca321998..a81c27c7e1 100644 --- a/engines/titanic/carry/chicken.h +++ b/engines/titanic/carry/chicken.h @@ -36,14 +36,10 @@ private: int _field13C; int _field140; public: + CLASSDEF CChicken(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CChicken"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/crushed_tv.h b/engines/titanic/carry/crushed_tv.h index ccbeac577a..b2bfd7580e 100644 --- a/engines/titanic/carry/crushed_tv.h +++ b/engines/titanic/carry/crushed_tv.h @@ -29,14 +29,10 @@ namespace Titanic { class CCrushedTV : public CCarry { public: + CLASSDEF CCrushedTV(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCrushedTV"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/ear.h b/engines/titanic/carry/ear.h index fbee7d02a3..2a20620342 100644 --- a/engines/titanic/carry/ear.h +++ b/engines/titanic/carry/ear.h @@ -29,14 +29,10 @@ namespace Titanic { class CEar : public CHeadPiece { public: + CLASSDEF CEar(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEar"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/eye.h b/engines/titanic/carry/eye.h index 0f0e73b0d3..f7e17fa81f 100644 --- a/engines/titanic/carry/eye.h +++ b/engines/titanic/carry/eye.h @@ -31,14 +31,10 @@ class CEye : public CHeadPiece { private: int _eyeNum; public: + CLASSDEF CEye(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEye"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/feathers.h b/engines/titanic/carry/feathers.h index 8fc11b7137..106e9a0620 100644 --- a/engines/titanic/carry/feathers.h +++ b/engines/titanic/carry/feathers.h @@ -29,14 +29,10 @@ namespace Titanic { class CFeathers : public CCarry { public: + CLASSDEF CFeathers(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CFeathers"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/fruit.h b/engines/titanic/carry/fruit.h index bc8a109e0f..3d23afd389 100644 --- a/engines/titanic/carry/fruit.h +++ b/engines/titanic/carry/fruit.h @@ -34,14 +34,10 @@ private: int _field134; int _field138; public: + CLASSDEF CFruit(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CFruit"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/glass.h b/engines/titanic/carry/glass.h index 57922c1920..55c032269a 100644 --- a/engines/titanic/carry/glass.h +++ b/engines/titanic/carry/glass.h @@ -31,14 +31,10 @@ class CGlass : public CCarry { private: CString _string6; public: + CLASSDEF CGlass(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGlass"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/hammer.h b/engines/titanic/carry/hammer.h index ec05435529..e3180e76a0 100644 --- a/engines/titanic/carry/hammer.h +++ b/engines/titanic/carry/hammer.h @@ -29,14 +29,10 @@ namespace Titanic { class CHammer : public CCarry { public: + CLASSDEF CHammer(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHammer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/head_piece.h b/engines/titanic/carry/head_piece.h index ddadb75880..daa5925530 100644 --- a/engines/titanic/carry/head_piece.h +++ b/engines/titanic/carry/head_piece.h @@ -33,14 +33,10 @@ private: CString _string6; int _field13C; public: + CLASSDEF CHeadPiece(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHeadPiece"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/hose.h b/engines/titanic/carry/hose.h index dc60f6832f..c16351b937 100644 --- a/engines/titanic/carry/hose.h +++ b/engines/titanic/carry/hose.h @@ -38,16 +38,12 @@ protected: CString _string6; public: + CLASSDEF CHose(); static void init(); static void deinit(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHose"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/hose_end.h b/engines/titanic/carry/hose_end.h index efce6b8db0..d9efb594bc 100644 --- a/engines/titanic/carry/hose_end.h +++ b/engines/titanic/carry/hose_end.h @@ -29,14 +29,10 @@ namespace Titanic { class CHoseEnd : public CHose { public: + CLASSDEF CHoseEnd(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHoseEnd"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/key.h b/engines/titanic/carry/key.h index 815bb95c2b..e6973b5c7c 100644 --- a/engines/titanic/carry/key.h +++ b/engines/titanic/carry/key.h @@ -29,14 +29,10 @@ namespace Titanic { class CKey : public CCarry { public: + CLASSDEF CKey(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CKey"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/liftbot_head.h b/engines/titanic/carry/liftbot_head.h index be4ad581b4..f2b60c1d7e 100644 --- a/engines/titanic/carry/liftbot_head.h +++ b/engines/titanic/carry/liftbot_head.h @@ -31,14 +31,10 @@ class CLiftbotHead : public CCarry { private: int _field12C; public: + CLASSDEF CLiftbotHead(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CLiftbotHead"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/long_stick.h b/engines/titanic/carry/long_stick.h index 3c8646d6a2..e2718a3d2b 100644 --- a/engines/titanic/carry/long_stick.h +++ b/engines/titanic/carry/long_stick.h @@ -29,14 +29,10 @@ namespace Titanic { class CLongStick : public CCarry { public: + CLASSDEF CLongStick(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CLongStick"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/magazine.h b/engines/titanic/carry/magazine.h index a1a7eee148..7621599038 100644 --- a/engines/titanic/carry/magazine.h +++ b/engines/titanic/carry/magazine.h @@ -32,14 +32,10 @@ private: int _field12C; int _field130; public: + CLASSDEF CMagazine(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMagazine"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/maitred_left_arm.h b/engines/titanic/carry/maitred_left_arm.h index f6cf6986ef..e46485cdac 100644 --- a/engines/titanic/carry/maitred_left_arm.h +++ b/engines/titanic/carry/maitred_left_arm.h @@ -31,14 +31,10 @@ class CMaitreDLeftArm : public CArm { private: int _field174; public: + CLASSDEF CMaitreDLeftArm() : CArm(), _field174(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMaitreDLeftArm"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/maitred_right_arm.h b/engines/titanic/carry/maitred_right_arm.h index a4a44895da..c89b7e82a3 100644 --- a/engines/titanic/carry/maitred_right_arm.h +++ b/engines/titanic/carry/maitred_right_arm.h @@ -29,10 +29,7 @@ namespace Titanic { class CMaitreDRightArm : public CArm { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMaitreDRightArm"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/carry/mouth.h b/engines/titanic/carry/mouth.h index 837a658d9e..1c446b2296 100644 --- a/engines/titanic/carry/mouth.h +++ b/engines/titanic/carry/mouth.h @@ -29,14 +29,10 @@ namespace Titanic { class CMouth : public CHeadPiece { public: + CLASSDEF CMouth(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMouth"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/napkin.h b/engines/titanic/carry/napkin.h index 549b29293e..144189be5c 100644 --- a/engines/titanic/carry/napkin.h +++ b/engines/titanic/carry/napkin.h @@ -29,14 +29,10 @@ namespace Titanic { class CNapkin : public CCarry { public: + CLASSDEF CNapkin(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNapkin"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/nose.h b/engines/titanic/carry/nose.h index 349c0c6e9b..717b639e82 100644 --- a/engines/titanic/carry/nose.h +++ b/engines/titanic/carry/nose.h @@ -29,14 +29,10 @@ namespace Titanic { class CNose : public CHeadPiece { public: + CLASSDEF CNose(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNose"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/note.h b/engines/titanic/carry/note.h index d3923c8402..b96e2cf855 100644 --- a/engines/titanic/carry/note.h +++ b/engines/titanic/carry/note.h @@ -32,14 +32,10 @@ private: CString _string6; int _field138; public: + CLASSDEF CNote(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNote"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/parcel.h b/engines/titanic/carry/parcel.h index e16ea9bcf9..59f3ed9d6c 100644 --- a/engines/titanic/carry/parcel.h +++ b/engines/titanic/carry/parcel.h @@ -29,14 +29,10 @@ namespace Titanic { class CParcel : public CCarry { public: + CLASSDEF CParcel(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CParcel"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/perch.h b/engines/titanic/carry/perch.h index ce13dbe684..1ed2ccaa9f 100644 --- a/engines/titanic/carry/perch.h +++ b/engines/titanic/carry/perch.h @@ -29,10 +29,7 @@ namespace Titanic { class CPerch : public CCentralCore { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPerch"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/carry/phonograph_cylinder.h b/engines/titanic/carry/phonograph_cylinder.h index 327ba3e541..271ede54b0 100644 --- a/engines/titanic/carry/phonograph_cylinder.h +++ b/engines/titanic/carry/phonograph_cylinder.h @@ -51,14 +51,10 @@ private: int _field180; int _field184; public: + CLASSDEF CPhonographCylinder(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPhonographCylinder"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/phonograph_ear.h b/engines/titanic/carry/phonograph_ear.h index ec6cfedf5e..71ef38f926 100644 --- a/engines/titanic/carry/phonograph_ear.h +++ b/engines/titanic/carry/phonograph_ear.h @@ -31,14 +31,10 @@ class CPhonographEar : public CEar { private: int _field140; public: + CLASSDEF CPhonographEar() : CEar(), _field140(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPhonographEar"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/photograph.h b/engines/titanic/carry/photograph.h index 1148df1ec3..4141280a6b 100644 --- a/engines/titanic/carry/photograph.h +++ b/engines/titanic/carry/photograph.h @@ -34,14 +34,10 @@ private: int _field12C; int _field130; public: + CLASSDEF CPhotograph(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPhotograph"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/plug_in.h b/engines/titanic/carry/plug_in.h index aefb3d113a..89a483278d 100644 --- a/engines/titanic/carry/plug_in.h +++ b/engines/titanic/carry/plug_in.h @@ -31,14 +31,10 @@ class CPlugIn : public CCarry { private: int _field12C; public: + CLASSDEF CPlugIn(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPlugIn"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/speech_centre.h b/engines/titanic/carry/speech_centre.h index 4b5ced53a0..8f6fdfdcd0 100644 --- a/engines/titanic/carry/speech_centre.h +++ b/engines/titanic/carry/speech_centre.h @@ -33,15 +33,11 @@ private: CString _string1; int _field14C; public: + CLASSDEF CSpeechCentre() : CBrain(), _string1("Summer"), _field13C(1), _field14C(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSpeechCentre"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/sweets.h b/engines/titanic/carry/sweets.h index 1912e89789..a18a1fbeeb 100644 --- a/engines/titanic/carry/sweets.h +++ b/engines/titanic/carry/sweets.h @@ -29,14 +29,10 @@ namespace Titanic { class CSweets : public CCarry { public: + CLASSDEF CSweets(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSweets"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/test_carry.h b/engines/titanic/carry/test_carry.h index b542fb7aac..56526b424e 100644 --- a/engines/titanic/carry/test_carry.h +++ b/engines/titanic/carry/test_carry.h @@ -31,14 +31,10 @@ class CTestArray : public CGameObject { public: int _value1, _value2; public: + CLASSDEF CTestArray() : CGameObject(), _value1(0), _value2(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTestArray"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/carry/vision_centre.h b/engines/titanic/carry/vision_centre.h index ce21fe547c..ce1d9599a2 100644 --- a/engines/titanic/carry/vision_centre.h +++ b/engines/titanic/carry/vision_centre.h @@ -29,10 +29,7 @@ namespace Titanic { class CVisionCentre : public CBrain { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CVisionCentre"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/core/background.h b/engines/titanic/core/background.h index a4735250ae..4ce5651fc4 100644 --- a/engines/titanic/core/background.h +++ b/engines/titanic/core/background.h @@ -35,14 +35,10 @@ protected: CString _string2; int _fieldDC; public: + CLASSDEF CBackground(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBackground"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/core/click_responder.h b/engines/titanic/core/click_responder.h index 1f2fa72f18..68d3e34cdd 100644 --- a/engines/titanic/core/click_responder.h +++ b/engines/titanic/core/click_responder.h @@ -31,10 +31,7 @@ class CClickResponder : public CGameObject { protected: CString _string1, _string2; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CClickResponder"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/core/dont_save_file_item.h b/engines/titanic/core/dont_save_file_item.h index f2b321c4fc..d4d5da2e4b 100644 --- a/engines/titanic/core/dont_save_file_item.h +++ b/engines/titanic/core/dont_save_file_item.h @@ -29,10 +29,7 @@ namespace Titanic { class CDontSaveFileItem : public CFileItem { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CDontSaveFileItem"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/core/drop_target.h b/engines/titanic/core/drop_target.h index b106623f62..22cb057bb7 100644 --- a/engines/titanic/core/drop_target.h +++ b/engines/titanic/core/drop_target.h @@ -44,14 +44,10 @@ private: int _field110; int _field114; public: + CLASSDEF CDropTarget(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CDropTarget"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/core/file_item.h b/engines/titanic/core/file_item.h index 0795b05d11..65dbf9d526 100644 --- a/engines/titanic/core/file_item.h +++ b/engines/titanic/core/file_item.h @@ -33,10 +33,7 @@ class CFileItem: public CTreeItem { private: CString _filename; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CFileItem"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h index 7d15882884..0d9f9184b2 100644 --- a/engines/titanic/core/game_object.h +++ b/engines/titanic/core/game_object.h @@ -59,14 +59,10 @@ protected: CString _string; int _fieldB8; public: + CLASSDEF CGameObject(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGameObject"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/core/link_item.h b/engines/titanic/core/link_item.h index aeb827e69d..f46f8d3ba0 100644 --- a/engines/titanic/core/link_item.h +++ b/engines/titanic/core/link_item.h @@ -48,14 +48,10 @@ protected: int _field34; CLinkItemSub _sub; public: + CLASSDEF CLinkItem(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CLinkItem"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/core/list.h b/engines/titanic/core/list.h index 0ede36e9cc..a37bca3db2 100644 --- a/engines/titanic/core/list.h +++ b/engines/titanic/core/list.h @@ -35,10 +35,7 @@ namespace Titanic { */ class ListItem: public CSaveableObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "ListItem"; } + CLASSDEF /** * Save the data for the class to file @@ -54,10 +51,7 @@ public: template<typename T> class List : public CSaveableObject, public Common::List<T *> { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return nullptr; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/core/message_target.h b/engines/titanic/core/message_target.h index 1afc48bd9b..b099546852 100644 --- a/engines/titanic/core/message_target.h +++ b/engines/titanic/core/message_target.h @@ -29,10 +29,7 @@ namespace Titanic { class CMessageTarget: public CSaveableObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMessageTarget"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/core/movie_clip.h b/engines/titanic/core/movie_clip.h index f16e3eb820..3db24debb6 100644 --- a/engines/titanic/core/movie_clip.h +++ b/engines/titanic/core/movie_clip.h @@ -43,14 +43,10 @@ private: CString _string2; CString _string3; public: + CLASSDEF CMovieClip(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMovieClip"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; @@ -66,7 +62,7 @@ public: */ class CMovieClipList: public List<CMovieClip> { public: - virtual const char *getClassName() const { return "CMovieClipList"; } + CLASSDEF }; } // End of namespace Titanic diff --git a/engines/titanic/core/multi_drop_target.h b/engines/titanic/core/multi_drop_target.h index db6f605062..ddf20e441e 100644 --- a/engines/titanic/core/multi_drop_target.h +++ b/engines/titanic/core/multi_drop_target.h @@ -32,14 +32,10 @@ public: CString _string5; CString _string6; public: + CLASSDEF CMultiDropTarget() : CDropTarget(), _string5("1,2") {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMultiDropTarget"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/core/named_item.h b/engines/titanic/core/named_item.h index 75635fcf72..c86aae2529 100644 --- a/engines/titanic/core/named_item.h +++ b/engines/titanic/core/named_item.h @@ -31,10 +31,7 @@ class CNamedItem: public CTreeItem { public: CString _name; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNamedItem"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/core/node_item.h b/engines/titanic/core/node_item.h index e05c2eb6ff..45309a1891 100644 --- a/engines/titanic/core/node_item.h +++ b/engines/titanic/core/node_item.h @@ -33,14 +33,10 @@ private: int _field28; int _field2C; public: + CLASSDEF CNodeItem(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNodeItem"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/core/project_item.h b/engines/titanic/core/project_item.h index 3c334986a8..f454392383 100644 --- a/engines/titanic/core/project_item.h +++ b/engines/titanic/core/project_item.h @@ -39,8 +39,8 @@ class CPetControl; class CFileListItem : public ListItem { public: CString _name; - - virtual const char *getClassName() const { return "CFileListItem"; } +public: + CLASSDEF /** * Save the data for the class to file @@ -59,7 +59,7 @@ public: */ class CFileList: public List<CFileListItem> { public: - virtual const char *getClassName() const { return "CFileList"; } + CLASSDEF }; @@ -92,14 +92,10 @@ private: */ void gameLoaded(); public: + CLASSDEF CProjectItem(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CProjectItem"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/core/resource_key.h b/engines/titanic/core/resource_key.h index 1b3d900abc..b38448aa4f 100644 --- a/engines/titanic/core/resource_key.h +++ b/engines/titanic/core/resource_key.h @@ -33,10 +33,7 @@ private: CString _key; CString _value; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CResourceKey"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/core/saveable_object.cpp b/engines/titanic/core/saveable_object.cpp index 8a1d3c982e..1b56d1b85f 100644 --- a/engines/titanic/core/saveable_object.cpp +++ b/engines/titanic/core/saveable_object.cpp @@ -93,6 +93,7 @@ #include "titanic/game/bottom_of_well_monitor.h" #include "titanic/game/bowl_unlocker.h" #include "titanic/game/brain_slot.h" +#include "titanic/game/bridge_door.h" #include "titanic/game/bridge_view.h" #include "titanic/game/broken_pell_base.h" #include "titanic/game/broken_pellerator.h" @@ -104,6 +105,8 @@ #include "titanic/game/cdrom_computer.h" #include "titanic/game/cdrom_tray.h" #include "titanic/game/cell_point_button.h" +#include "titanic/game/chev_code.h" +#include "titanic/game/chev_panel.h" #include "titanic/game/chicken_cooler.h" #include "titanic/game/chicken_dispensor.h" #include "titanic/game/close_broken_pel.h" @@ -142,7 +145,9 @@ #include "titanic/game/head_slot.h" #include "titanic/game/head_smash_event.h" #include "titanic/game/head_smash_lever.h" +#include "titanic/game/head_spinner.h" #include "titanic/game/idle_summoner.h" +#include "titanic/game/leave_sec_class_state.h" #include "titanic/game/lemon_dispensor.h" #include "titanic/game/light.h" #include "titanic/game/light_switch.h" @@ -151,6 +156,7 @@ #include "titanic/game/mail_man.h" #include "titanic/game/missiveomat.h" #include "titanic/game/missiveomat_button.h" +#include "titanic/game/movie_tester.h" #include "titanic/game/musical_instrument.h" #include "titanic/game/music_console_button.h" #include "titanic/game/music_room_phonograph.h" @@ -184,10 +190,12 @@ #include "titanic/game/ship_setting_button.h" #include "titanic/game/show_cell_points.h" #include "titanic/game/speech_dispensor.h" +#include "titanic/game/splash_animation.h" #include "titanic/game/starling_puret.h" #include "titanic/game/start_action.h" #include "titanic/game/stop_phonograph_button.h" #include "titanic/game/sub_glass.h" +#include "titanic/game/sub_wrapper.h" #include "titanic/game/sweet_bowl.h" #include "titanic/game/television.h" #include "titanic/game/third_class_canal.h" @@ -369,6 +377,7 @@ #include "titanic/npcs/succubus.h" #include "titanic/npcs/summon_bots.h" #include "titanic/npcs/titania.h" +#include "titanic/npcs/true_talk_npc.h" #include "titanic/pet_control/pet_control.h" @@ -378,6 +387,7 @@ #include "titanic/sound/auto_sound_player_adsr.h" #include "titanic/sound/background_sound_maker.h" #include "titanic/sound/bird_song.h" +#include "titanic/sound/dome_from_top_of_well.h" #include "titanic/sound/gondolier_song.h" #include "titanic/sound/enter_view_toggles_other_music.h" #include "titanic/sound/music_player.h" @@ -398,9 +408,12 @@ namespace Titanic { Common::HashMap<Common::String, CSaveableObject::CreateFunction> * CSaveableObject::_classList = nullptr; +Common::List<ClassDef *> *CSaveableObject::_classDefs; -#define DEFFN(T) CSaveableObject *Function##T() { return new T(); } -#define ADDFN(T) (*_classList)[#T] = Function##T +#define DEFFN(T) ClassDef *T::_type; \ + CSaveableObject *Function##T() { return new T(); } +#define ADDFN(CHILD, PARENT) (*_classList)[#CHILD] = Function##CHILD; \ + ##CHILD::_type = new TypeTemplate<CHILD>(#CHILD, nullptr) DEFFN(CArm) DEFFN(CAuditoryCentre) @@ -411,7 +424,6 @@ DEFFN(CCarry) DEFFN(CCarryParrot) DEFFN(CCentralCore) DEFFN(CChicken) -DEFFN(CChickenCooler) DEFFN(CCrushedTV) DEFFN(CEar) DEFFN(CEye) @@ -448,13 +460,17 @@ DEFFN(CDontSaveFileItem) DEFFN(CDropTarget) DEFFN(CFileItem) DEFFN(CFileListItem) +DEFFN(CGameObject) DEFFN(CLinkItem) +DEFFN(ListItem) DEFFN(CMessageTarget) DEFFN(CMovieClip) DEFFN(CMovieClipList) DEFFN(CMultiDropTarget) +DEFFN(CNamedItem) DEFFN(CNodeItem) DEFFN(CProjectItem) +DEFFN(CSaveableObject) DEFFN(CStaticImage) DEFFN(CTurnOnObject) DEFFN(CTurnOnPlaySound) @@ -476,6 +492,7 @@ DEFFN(CBomb) DEFFN(CBottomOfWellMonitor) DEFFN(CBowlUnlocker) DEFFN(CBrainSlot) +DEFFN(CBridgeDoor) DEFFN(CBridgeView) DEFFN(CBrokenPellBase) DEFFN(CBrokenPellerator) @@ -487,12 +504,15 @@ DEFFN(CCDROM) DEFFN(CCDROMComputer) DEFFN(CCDROMTray) DEFFN(CCellPointButton) +DEFFN(CChevCode) +DEFFN(CChevPanel) +DEFFN(CChickenCooler) DEFFN(CChickenDispensor) DEFFN(CCloseBrokenPel) DEFFN(CodeWheel) DEFFN(CComputer) -DEFFN(CCookie) DEFFN(CComputerScreen) +DEFFN(CCookie) DEFFN(CCredits) DEFFN(CCreditsButton) DEFFN(CDeadArea) @@ -524,7 +544,9 @@ DEFFN(CHammerDispensorButton) DEFFN(CHeadSlot) DEFFN(CHeadSmashEvent) DEFFN(CHeadSmashLever) +DEFFN(CHeadSpinner) DEFFN(CIdleSummoner) +DEFFN(CLeaveSecClassState) DEFFN(CLemonDispensor) DEFFN(CLight) DEFFN(CLightSwitch) @@ -533,6 +555,7 @@ DEFFN(CLongStickDispenser) DEFFN(CMailMan) DEFFN(CMissiveOMat) DEFFN(CMissiveOMatButton) +DEFFN(CMovieTester); DEFFN(CMusicalInstrument) DEFFN(CMusicConsoleButton) DEFFN(CMusicRoomPhonograph) @@ -566,10 +589,12 @@ DEFFN(CShipSetting) DEFFN(CShipSettingButton) DEFFN(CShowCellpoints) DEFFN(CSpeechDispensor) +DEFFN(CSplashAnimation) DEFFN(CStarlingPuret) DEFFN(CStartAction) DEFFN(CStopPhonographButton) DEFFN(CSUBGlass) +DEFFN(CSUBWrapper) DEFFN(CSweetBowl) DEFFN(CTelevision) DEFFN(CThirdClassCanal) @@ -914,22 +939,26 @@ DEFFN(CTripDownCanal) DEFFN(CBarbot) DEFFN(CBellBot) DEFFN(CCallBot) +DEFFN(CCharacter) DEFFN(CDeskbot) DEFFN(CDoorbot) DEFFN(CLiftBot) DEFFN(CMaitreD) DEFFN(CMobile) DEFFN(CParrot) +DEFFN(CRobotController) DEFFN(CStarlings) DEFFN(CSummonBots) DEFFN(CSuccUBus) DEFFN(CTitania) +DEFFN(CTrueTalkNPC) DEFFN(CAutoMusicPlayer) DEFFN(CAutoMusicPlayerBase) DEFFN(CAutoSoundPlayer) DEFFN(CAutoSoundPlayerADSR) DEFFN(CBackgroundSoundMaker) DEFFN(CBirdSong) +DEFFN(CDomeFromTopOfWell) DEFFN(CEnterViewTogglesOtherMusic) DEFFN(CGondolierSong) DEFFN(CMusicPlayer) @@ -946,556 +975,579 @@ DEFFN(CWaterLappingSounds) DEFFN(CStarControl); void CSaveableObject::initClassList() { + _classDefs = new Common::List<ClassDef *>(); _classList = new Common::HashMap<Common::String, CreateFunction>(); - ADDFN(CArm); - ADDFN(CAuditoryCentre); - ADDFN(CBowlEar); - ADDFN(CBrain); - ADDFN(CBridgePiece); - ADDFN(CCarry); - ADDFN(CCarryParrot); - ADDFN(CCentralCore); - ADDFN(CChicken); - ADDFN(CChickenCooler); - ADDFN(CCrushedTV); - ADDFN(CEar); - ADDFN(CEye); - ADDFN(CFeathers); - ADDFN(CFruit); - ADDFN(CGlass); - ADDFN(CHammer); - ADDFN(CHeadPiece); - ADDFN(CHose); - ADDFN(CHoseEnd); - ADDFN(CKey); - ADDFN(CLiftbotHead); - ADDFN(CLongStick); - ADDFN(CMagazine); - ADDFN(CMaitreDLeftArm); - ADDFN(CMaitreDRightArm); - ADDFN(CMouth); - ADDFN(CNapkin); - ADDFN(CNose); - ADDFN(CNote); - ADDFN(CParcel); - ADDFN(CPerch); - ADDFN(CPhonographCylinder); - ADDFN(CPhonographEar); - ADDFN(CPhotograph); - ADDFN(CPlugIn); - ADDFN(CSpeechCentre); - ADDFN(CSweets); - ADDFN(CVisionCentre); - - ADDFN(CBackground); - ADDFN(CClickResponder); - ADDFN(CDontSaveFileItem); - ADDFN(CDropTarget); - ADDFN(CFileItem); - ADDFN(CFileListItem); - ADDFN(CLinkItem); - ADDFN(CMessageTarget); - ADDFN(CMovieClip); - ADDFN(CMovieClipList); - ADDFN(CMultiDropTarget); - ADDFN(CNodeItem); - ADDFN(CProjectItem); - ADDFN(CStaticImage); - ADDFN(CTurnOnObject); - ADDFN(CTreeItem); - ADDFN(CTurnOnPlaySound); - ADDFN(CTurnOnTurnOff); - ADDFN(CViewItem); + ADDFN(CArm, CCarry); + ADDFN(CAuditoryCentre, CBrain); + ADDFN(CBowlEar, CEar); + ADDFN(CBrain, CCarry); + ADDFN(CBridgePiece, CCarry); + ADDFN(CCarry, CGameObject); + ADDFN(CCarryParrot, CCarry); + ADDFN(CCentralCore, CBrain); + ADDFN(CChicken, CCarry); + ADDFN(CCrushedTV, CCarry); + ADDFN(CEar, CHeadPiece); + ADDFN(CEye, CHeadPiece); + ADDFN(CFeathers, CCarry); + ADDFN(CFruit, CCarry); + ADDFN(CGlass, CCarry); + ADDFN(CHammer, CCarry); + ADDFN(CHeadPiece, CCarry); + ADDFN(CHose, CCarry); + ADDFN(CHoseEnd, CHose); + ADDFN(CKey, CCarry); + ADDFN(CLiftbotHead, CCarry); + ADDFN(CLongStick, CCarry); + ADDFN(CMagazine, CCarry); + ADDFN(CMaitreDLeftArm, CArm); + ADDFN(CMaitreDRightArm, CArm); + ADDFN(CMouth, CHeadPiece); + ADDFN(CNapkin, CCarry); + ADDFN(CNose, CHeadPiece); + ADDFN(CNote, CCarry); + ADDFN(CParcel, CCarry); + ADDFN(CPerch, CCentralCore); + ADDFN(CPhonographCylinder, CCarry); + ADDFN(CPhonographEar, CEar); + ADDFN(CPhotograph, CCarry); + ADDFN(CPlugIn, CCarry); + ADDFN(CSpeechCentre, CBrain); + ADDFN(CSweets, CCarry); + ADDFN(CVisionCentre, CBrain); - ADDFN(CAnnounce); - ADDFN(CAnnoyBarbot); - ADDFN(CArbBackground); - ADDFN(CArboretumGate); - ADDFN(CAutoAnimate); - ADDFN(CBarBell); - ADDFN(CBarMenu); - ADDFN(CBarMenuButton); - ADDFN(CBelbotGetLight); - ADDFN(CBilgeSuccUBus); - ADDFN(CBomb); - ADDFN(CBottomOfWellMonitor); - ADDFN(CBrainSlot); - ADDFN(CBowlUnlocker); - ADDFN(CBridgeView); - ADDFN(CBrokenPellBase); - ADDFN(CBrokenPellerator); - ADDFN(CBrokenPelleratorFroz); - ADDFN(CCage); - ADDFN(CCallPellerator); - ADDFN(CCaptainsWheel); - ADDFN(CCDROM); - ADDFN(CCDROMComputer); - ADDFN(CCDROMTray); - ADDFN(CCellPointButton); - ADDFN(CChickenDispensor); - ADDFN(CodeWheel); - ADDFN(CComputerScreen); - ADDFN(CCloseBrokenPel); - ADDFN(CComputer); - ADDFN(CCookie); - ADDFN(CCredits); - ADDFN(CCreditsButton); - ADDFN(CDeadArea); - ADDFN(CDeskClickResponder); - ADDFN(CDoorbotElevatorHandler); - ADDFN(CDoorbotHomeHandler); - ADDFN(CDropTarget); - ADDFN(CEarSweetBowl); - ADDFN(CEjectPhonographButton); - ADDFN(CElevatorActionArea); - ADDFN(CEmmaControl); - ADDFN(CEmptyNutBowl); - ADDFN(CEndCreditText); - ADDFN(CEndCredits); - ADDFN(CEndExplodeShip); - ADDFN(CEndGameCredits); - ADDFN(CEndSequenceControl); - ADDFN(CFan); - ADDFN(CFanControl); - ADDFN(CFanDecrease); - ADDFN(CFanIncrease); - ADDFN(CFanNoises); - ADDFN(CFloorIndicator); - ADDFN(CGamesConsole); - ADDFN(CGetLiftEye2); - ADDFN(CGlassSmasher); - ADDFN(CHammerClip); - ADDFN(CHammerDispensor); - ADDFN(CHammerDispensorButton); - ADDFN(CHeadSlot); - ADDFN(CHeadSmashEvent); - ADDFN(CHeadSmashLever); - ADDFN(CIdleSummoner); - ADDFN(CLemonDispensor); - ADDFN(CLight); - ADDFN(CLightSwitch); - ADDFN(CLittleLiftButton); - ADDFN(CLongStickDispenser); - ADDFN(CMailMan); - ADDFN(CMissiveOMat); - ADDFN(CMissiveOMatButton); - ADDFN(CMusicalInstrument); - ADDFN(CMusicConsoleButton); - ADDFN(CMusicRoomPhonograph); - ADDFN(CMusicRoomStopPhonographButton); - ADDFN(CMusicSystemLock); - ADDFN(CNavHelmet); - ADDFN(CNavigationComputer); - ADDFN(CNoNutBowl); - ADDFN(CNoseHolder); - ADDFN(CNullPortHole); - ADDFN(CNutReplacer); - ADDFN(CPetDisabler); - ADDFN(CPhonograph); - ADDFN(CPhonographLid); - ADDFN(CPlayMusicButton); - ADDFN(CPlayOnAct); - ADDFN(CPortHole); - ADDFN(CRecordPhonographButton); - ADDFN(CReplacementEar); - ADDFN(CReservedTable); - ADDFN(CRestaurantCylinderHolder); - ADDFN(CRestaurantPhonograph); - ADDFN(CRoomItem); - ADDFN(CSauceDispensor); - ADDFN(CSearchPoint); - ADDFN(CSeasonBackground); - ADDFN(CSeasonBarrel); - ADDFN(CSeasonalAdjustment); - ADDFN(CServiceElevatorWindow); - ADDFN(CShipSetting); - ADDFN(CShipSettingButton); - ADDFN(CShowCellpoints); - ADDFN(CSpeechDispensor); - ADDFN(CStarlingPuret); - ADDFN(CStartAction); - ADDFN(CStopPhonographButton); - ADDFN(CSUBGlass); - ADDFN(CSweetBowl); - ADDFN(CTelevision); - ADDFN(CThirdClassCanal); - ADDFN(CThrowTVDownWell); - ADDFN(CTitaniaStillControl); - ADDFN(CTOWParrotNav); - ADDFN(CUpLighter); - ADDFN(CUselessLever); - ADDFN(CWheelButton); - ADDFN(CWheelHotSpot); - ADDFN(CWheelSpin); - ADDFN(CWheelSpinHorn); - ADDFN(CGondolierBase); - ADDFN(CGondolierChest); - ADDFN(CGondolierFace); - ADDFN(CGondolierMixer); - ADDFN(CGondolierSlider); - ADDFN(CMaitreDArmHolder); - ADDFN(CMaitreDBody); - ADDFN(CMaitreDLegs); - ADDFN(CMaitreDProdReceptor); - ADDFN(CParrotLobbyController); - ADDFN(CParrotLobbyLinkUpdater); - ADDFN(CParrotLobbyObject); - ADDFN(CParrotLobbyViewObject); - ADDFN(CParrotLoser); - ADDFN(CParrotNutBowlActor); - ADDFN(CParrotNutEater); - ADDFN(CParrotPerchHolder); - ADDFN(CParrotSuccUBus); - ADDFN(CParrotTrigger); - ADDFN(CPlayerMeetsParrot); - ADDFN(CPET); - ADDFN(CPETClass1); - ADDFN(CPETClass2); - ADDFN(CPETClass3); - ADDFN(CPetControl); - ADDFN(CPetDragChev); - ADDFN(CPetGraphic); - ADDFN(CPetGraphic2); - ADDFN(PETLeaf); - ADDFN(CPETLift); - ADDFN(CPETMonitor); - ADDFN(CPETPellerator); - ADDFN(CPETPosition); - ADDFN(CPETSentinal); - ADDFN(CPETSounds); - ADDFN(CPETTransition); - ADDFN(CPETTransport); - ADDFN(CPickUp); - ADDFN(CPickUpBarGlass); - ADDFN(CPickUpHose); - ADDFN(CPickUpLemon); - ADDFN(CPickUpSpeechCentre); - ADDFN(CPickUpVisCentre); - ADDFN(CBarShelfVisCentre); - ADDFN(CLemonOnBar); - ADDFN(CPlaceHolder); - ADDFN(CTVOnBar); - ADDFN(CArmchair); - ADDFN(CBasin); - ADDFN(CBedfoot); - ADDFN(CBedhead); - ADDFN(CChestOfDrawers); - ADDFN(CDesk); - ADDFN(CDeskchair); - ADDFN(CDrawer); - ADDFN(CSGTDoors); - ADDFN(SGTNav); - ADDFN(CSGTNavigation); - ADDFN(CSGTRestaurantDoors); - ADDFN(CSGTStateControl); - ADDFN(CSGTStateRoom); - ADDFN(CSGTTV); - ADDFN(CSGTUpperDoorsSound); - ADDFN(CToilet); - ADDFN(CVase); - ADDFN(CWashstand); + ADDFN(CBackground, CGameObject); + ADDFN(CClickResponder, CGameObject); + ADDFN(CDontSaveFileItem, CFileItem); + ADDFN(CDropTarget, CGameObject); + ADDFN(CFileItem, CTreeItem); + ADDFN(CFileListItem, ListItem); + ADDFN(CGameObject, CNamedItem); + ADDFN(CLinkItem, CNamedItem); + ADDFN(ListItem, CSaveableObject); + ADDFN(CMessageTarget, CSaveableObject); + ADDFN(CMovieClip, ListItem); + ADDFN(CMovieClipList, List); + ADDFN(CMultiDropTarget, CDropTarget); + ADDFN(CNamedItem, CTreeItem); + ADDFN(CNodeItem, CNamedItem); + ADDFN(CProjectItem, CFileItem); + ADDFN(CSaveableObject, CSaveableObject); + ADDFN(CStaticImage, CGameObject); + ADDFN(CTurnOnObject, CBackground); + ADDFN(CTreeItem, CMessageTarget); + ADDFN(CTurnOnPlaySound, CTurnOnObject); + ADDFN(CTurnOnTurnOff, CBackground); + ADDFN(CViewItem, CNamedItem); - ADDFN(CGondolier); - ADDFN(CLift); - ADDFN(CLiftindicator); - ADDFN(CPellerator); - ADDFN(CServiceElevator); - ADDFN(CTransport); + ADDFN(CAnnounce, CGameObject); + ADDFN(CAnnoyBarbot, CGameObject); + ADDFN(CArbBackground, CBackground); + ADDFN(CArboretumGate, CBackground); + ADDFN(CAutoAnimate, CBackground); + ADDFN(CBarBell, CGameObject); + ADDFN(CBarMenu, CGameObject); + ADDFN(CBarMenuButton, CGameObject); + ADDFN(CBelbotGetLight, CGameObject); + ADDFN(CBilgeSuccUBus, CSuccUBus); + ADDFN(CBomb, CBackground); + ADDFN(CBottomOfWellMonitor, CGameObject); + ADDFN(CBowlUnlocker, CGameObject); + ADDFN(CBrainSlot, CGameObject); + ADDFN(CBridgeDoor, CGameObject); + ADDFN(CBridgeView, CBackground); + ADDFN(CBrokenPellBase, CBackground); + ADDFN(CBrokenPellerator, CBrokenPellBase); + ADDFN(CBrokenPelleratorFroz, CBrokenPellBase); + ADDFN(CCage, CBackground); + ADDFN(CCallPellerator, CGameObject); + ADDFN(CCaptainsWheel, CBackground); + ADDFN(CCDROM, CGameObject); + ADDFN(CCDROMComputer, CGameObject); + ADDFN(CCDROMTray, CGameObject); + ADDFN(CCellPointButton, CBackground); + ADDFN(CChevCode, CGameObject); + ADDFN(CChevPanel, CGameObject); + ADDFN(CChickenCooler, CGameObject); + ADDFN(CChickenDispensor, CBackground); + ADDFN(CodeWheel, CBomb); + ADDFN(CCloseBrokenPel, CBackground); + ADDFN(CComputer, CBackground); + ADDFN(CComputerScreen, CGameObject); + ADDFN(CCookie, CGameObject); + ADDFN(CCredits, CGameObject); + ADDFN(CCreditsButton, CBackground); + ADDFN(CDeadArea, CGameObject); + ADDFN(CDeskClickResponder, CClickResponder); + ADDFN(CDoorbotElevatorHandler, CGameObject); + ADDFN(CDoorbotHomeHandler, CGameObject); + ADDFN(CDropTarget, CGameObject); + ADDFN(CEarSweetBowl, CSweetBowl); + ADDFN(CEjectPhonographButton, CBackground); + ADDFN(CElevatorActionArea, CGameObject); + ADDFN(CEmmaControl, CBackground); + ADDFN(CEmptyNutBowl, CGameObject); + ADDFN(CEndCreditText, CGameObject); + ADDFN(CEndCredits, CGameObject); + ADDFN(CEndExplodeShip, CGameObject); + ADDFN(CEndGameCredits, CGameObject); + ADDFN(CEndSequenceControl, CGameObject); + ADDFN(CFan, CGameObject); + ADDFN(CFanControl, CGameObject); + ADDFN(CFanDecrease, CGameObject); + ADDFN(CFanIncrease, CGameObject); + ADDFN(CFanNoises, CGameObject); + ADDFN(CFloorIndicator, CGameObject); + ADDFN(CGamesConsole, CBackground); + ADDFN(CGetLiftEye2, CGameObject); + ADDFN(CGlassSmasher, CGameObject); + ADDFN(CHammerClip, CGameObject); + ADDFN(CHammerDispensor, CBackground); + ADDFN(CHammerDispensorButton, CStartAction); + ADDFN(CHeadSlot, CGameObject); + ADDFN(CHeadSmashEvent, CBackground); + ADDFN(CHeadSmashLever, CBackground); + ADDFN(CHeadSpinner, CGameObject); + ADDFN(CIdleSummoner, CGameObject); + ADDFN(CLeaveSecClassState, CGameObject); + ADDFN(CLemonDispensor, CBackground); + ADDFN(CLight, CBackground); + ADDFN(CLightSwitch, CBackground); + ADDFN(CLittleLiftButton, CBackground); + ADDFN(CLongStickDispenser, CGameObject); + ADDFN(CMailMan, CGameObject); + ADDFN(CMissiveOMat, CGameObject); + ADDFN(CMissiveOMatButton, CEditControl); + ADDFN(CMovieTester, CGameObject); + ADDFN(CMusicalInstrument, CBackground); + ADDFN(CMusicConsoleButton, CMusicPlayer); + ADDFN(CMusicRoomPhonograph, CRestaurantPhonograph); + ADDFN(CMusicRoomStopPhonographButton, CEjectPhonographButton); + ADDFN(CMusicSystemLock, CDropTarget); + ADDFN(CNavHelmet, CGameObject); + ADDFN(CNavigationComputer, CGameObject); + ADDFN(CNoNutBowl, CBackground); + ADDFN(CNoseHolder, CDropTarget); + ADDFN(CNullPortHole, CClickResponder); + ADDFN(CNutReplacer, CGameObject); + ADDFN(CPetDisabler, CGameObject); + ADDFN(CPhonograph, CMusicPlayer); + ADDFN(CPhonographLid, CGameObject); + ADDFN(CPlayMusicButton, CBackground); + ADDFN(CPlayOnAct, CBackground); + ADDFN(CPortHole, CGameObject); + ADDFN(CRecordPhonographButton, CBackground); + ADDFN(CReplacementEar, CBackground); + ADDFN(CReservedTable, CGameObject); + ADDFN(CRestaurantCylinderHolder, CDropTarget); + ADDFN(CRestaurantPhonograph, CPhonograph); + ADDFN(CRoomItem, CNamedItem); + ADDFN(CSauceDispensor, CBackground); + ADDFN(CSearchPoint, CGameObject); + ADDFN(CSeasonBackground, CBackground); + ADDFN(CSeasonBarrel, CBackground); + ADDFN(CSeasonalAdjustment, CBackground); + ADDFN(CServiceElevatorWindow, CBackground); + ADDFN(CShipSetting, CBackground); + ADDFN(CShipSettingButton, CGameObject); + ADDFN(CShowCellpoints, CGameObject); + ADDFN(CSpeechDispensor, CBackground); + ADDFN(CSplashAnimation, CGameObject); + ADDFN(CStarlingPuret, CGameObject); + ADDFN(CStartAction, CBackground); + ADDFN(CStopPhonographButton, CBackground); + ADDFN(CSUBGlass, CGameObject); + ADDFN(CSUBWrapper, CGameObject); + ADDFN(CSweetBowl, CGameObject); + ADDFN(CTelevision, CBackground); + ADDFN(CThirdClassCanal, CBackground); + ADDFN(CThrowTVDownWell, CGameObject); + ADDFN(CTitaniaStillControl, CGameObject); + ADDFN(CTOWParrotNav, CGameObject); + ADDFN(CUpLighter, CDropTarget); + ADDFN(CUselessLever, CToggleButton); + ADDFN(CWheelButton, CBackground); + ADDFN(CWheelHotSpot, CBackground); + ADDFN(CWheelSpin, CBackground); + ADDFN(CWheelSpinHorn, CWheelSpin); + ADDFN(CGondolierBase, CGameObject); + ADDFN(CGondolierChest, CGondolierBase); + ADDFN(CGondolierFace, CGondolierBase); + ADDFN(CGondolierMixer, CGondolierBase); + ADDFN(CGondolierSlider, CGondolierBase); + ADDFN(CMaitreDArmHolder, CDropTarget); + ADDFN(CMaitreDBody, CMaitreDProdReceptor); + ADDFN(CMaitreDLegs, CMaitreDProdReceptor); + ADDFN(CMaitreDProdReceptor, CGameObject); + ADDFN(CParrotLobbyController, CParrotLobbyObject); + ADDFN(CParrotLobbyLinkUpdater, CParrotLobbyObject); + ADDFN(CParrotLobbyObject, CGameObject); + ADDFN(CParrotLobbyViewObject, CParrotLobbyObject); + ADDFN(CParrotLoser, CGameObject); + ADDFN(CParrotNutBowlActor, CGameObject); + ADDFN(CParrotNutEater, CGameObject); + ADDFN(CParrotPerchHolder, CMultiDropTarget); + ADDFN(CParrotSuccUBus, CSuccUBus); + ADDFN(CParrotTrigger, CGameObject); + ADDFN(CPlayerMeetsParrot, CGameObject); + ADDFN(CPET, CGameObject); + ADDFN(CPETClass1, CGameObject); + ADDFN(CPETClass2, CGameObject); + ADDFN(CPETClass3, CGameObject); + ADDFN(CPETLift, CPETTransport); + ADDFN(CPETMonitor, CGameObject); + ADDFN(CPETPellerator, CPETTransport); + ADDFN(CPETPosition, CGameObject); + ADDFN(CPETSentinal, CGameObject); + ADDFN(CPETSounds, CGameObject); + ADDFN(CPETTransition, CGameObject); + ADDFN(CPETTransport, CGameObject); + ADDFN(CPickUp, CGameObject); + ADDFN(CPickUpBarGlass, CPickUp); + ADDFN(CPickUpHose, CPickUp); + ADDFN(CPickUpLemon, CPickUp); + ADDFN(CPickUpSpeechCentre, CPickUp); + ADDFN(CPickUpVisCentre, CPickUp); + ADDFN(CBarShelfVisCentre, CPlaceHolder); + ADDFN(CLemonOnBar, CPlaceHolder); + ADDFN(CPlaceHolder, CGameObject); + ADDFN(CTVOnBar, CPlaceHolder); + ADDFN(CArmchair, CSGTStateRoom); + ADDFN(CBasin, CSGTStateRoom); + ADDFN(CBedfoot, CSGTStateRoom); + ADDFN(CBedhead, CSGTStateRoom); + ADDFN(CChestOfDrawers, CSGTStateRoom); + ADDFN(CDesk, CSGTStateRoom); + ADDFN(CDeskchair, CSGTStateRoom); + ADDFN(CDrawer, CSGTStateRoom); + ADDFN(CSGTDoors, CGameObject); + ADDFN(SGTNav, CSGTStateRoom); + ADDFN(CSGTNavigation, CGameObject); + ADDFN(CSGTRestaurantDoors, CGameObject); + ADDFN(CSGTStateControl, CBackground); + ADDFN(CSGTStateRoom, CBackground); + ADDFN(CSGTTV, CSGTStateRoom); + ADDFN(CSGTUpperDoorsSound, CClickResponder); + ADDFN(CToilet, CSGTStateRoom); + ADDFN(CVase, CSGTStateRoom); + ADDFN(CWashstand, CSGTStateRoom); - ADDFN(CActButton); - ADDFN(CChangesSeasonButton); - ADDFN(CChevLeftOff); - ADDFN(CChevLeftOn); - ADDFN(CChevRightOff); - ADDFN(CChevRightOn); - ADDFN(CChevSendRecSwitch); - ADDFN(CChevSwitch); - ADDFN(CEditControl); - ADDFN(CElevatorButton); - ADDFN(CGetFromSucc); - ADDFN(CHelmetOnOff); - ADDFN(CHomePhoto); - ADDFN(CIconNavAction); - ADDFN(CIconNavButt); - ADDFN(CIconNavDown); - ADDFN(CIconNavImage); - ADDFN(CIconNavLeft); - ADDFN(CIconNavReceive); - ADDFN(CIconNavRight); - ADDFN(CIconNavSend); - ADDFN(CIconNavUp); - ADDFN(CKeybrdButt); - ADDFN(CMoveObjectButton); - ADDFN(CMusicControl); - ADDFN(CMusicSlider); - ADDFN(CMusicSliderPitch); - ADDFN(CMusicSliderSpeed); - ADDFN(CMusicSwitch); - ADDFN(CMusicSwitchInversion); - ADDFN(CMusicSwitchReverse); - ADDFN(CMusicVoiceMute); - ADDFN(CPetModeOff); - ADDFN(CPetModeOn); - ADDFN(CPetModePanel); - ADDFN(CPetPannel1); - ADDFN(CPetPannel2); - ADDFN(CPetPannel3); - ADDFN(CSendToSucc); - ADDFN(CSGTSelector); - ADDFN(CSliderButton); - ADDFN(CSmallChevLeftOff); - ADDFN(CSmallChevLeftOn); - ADDFN(CSmallChevRightOff); - ADDFN(CSmallChevRightOn); - ADDFN(CStatusChangeButton); - ADDFN(CSTButton); - ADDFN(CTextDown); - ADDFN(CTextSkrew); - ADDFN(CTextUp); - ADDFN(CToggleButton); - ADDFN(CToggleSwitch); - ADDFN(CVolumeControl); + ADDFN(CGondolier, CTransport); + ADDFN(CLift, CTransport); + ADDFN(CLiftindicator, CLift); + ADDFN(CPellerator, CTransport); + ADDFN(CServiceElevator, CTransport); + ADDFN(CTransport, CMobile); - ADDFN(CActMsg); - ADDFN(CActivationmsg); - ADDFN(CAddHeadPieceMsg); - ADDFN(CAnimateMaitreDMsg); - ADDFN(CArboretumGateMsg); - ADDFN(CArmPickedUpFromTableMsg); - ADDFN(CBodyInBilgeRoomMsg); - ADDFN(CBowlStateChange); - ADDFN(CCarryObjectArrivedMsg); - ADDFN(CChangeSeasonMsg); - ADDFN(CCheckAllPossibleCodes); - ADDFN(CCheckChevCode); - ADDFN(CChildDragEndMsg); - ADDFN(CChildDragMoveMsg); - ADDFN(CChildDragStartMsg); - ADDFN(CClearChevPanelBits); - ADDFN(CCorrectMusicPlayedMsg); - ADDFN(CCreateMusicPlayerMsg); - ADDFN(CCylinderHolderReadyMsg); - ADDFN(CDeactivationMsg); - ADDFN(CDeliverCCarryMsg); - ADDFN(CDisableMaitreDProdReceptor); - ADDFN(CDismissBotMsg); - ADDFN(CDoffNavHelmet); - ADDFN(CDonNavHelmet); - ADDFN(CDoorbotNeededInElevatorMsg); - ADDFN(CDoorbotNeededInHomeMsg); - ADDFN(CDropobjectMsg); - ADDFN(CDropZoneGotObjectMsg); - ADDFN(CDropZoneLostObjectMsg); - ADDFN(CEditControlMsg); - ADDFN(CEjectCylinderMsg); - ADDFN(CErasePhonographCylinderMsg); - ADDFN(CFreshenCookieMsg); - ADDFN(CGetChevClassBits); - ADDFN(CGetChevClassNum); - ADDFN(CGetChevCodeFromRoomNameMsg); - ADDFN(CGetChevFloorBits); - ADDFN(CGetChevFloorNum); - ADDFN(CGetChevLiftBits); - ADDFN(CGetChevLiftNum); - ADDFN(CGetChevRoomBits); - ADDFN(CGetChevRoomNum); - ADDFN(CHoseConnectedMsg); - ADDFN(CInitializeAnimMsg); - ADDFN(CIsEarBowlPuzzleDone); - ADDFN(CIsHookedOnMsg); - ADDFN(CIsParrotPresentMsg); - ADDFN(CKeyCharMsg); - ADDFN(CLemonFallsFromTreeMsg); - ADDFN(CLightsMsg); - ADDFN(CLockPhonographMsg); - ADDFN(CMaitreDDefeatedMsg); - ADDFN(CMaitreDHappyMsg); - ADDFN(CMissiveOMatActionMsg); - ADDFN(CMouseMsg); - ADDFN(CMouseMoveMsg); - ADDFN(CMouseButtonMsg); - ADDFN(CMouseButtonDownMsg); - ADDFN(CMouseButtonUpMsg); - ADDFN(CMouseButtonDoubleClickMsg); - ADDFN(CMouseDragMsg); - ADDFN(CMouseDragStartMsg); - ADDFN(CMouseDragMoveMsg); - ADDFN(CMouseDragEndMsg); - ADDFN(CMoveToStartPosMsg); - ADDFN(CMovieEndMsg); - ADDFN(CMovieFrameMsg); - ADDFN(CMusicHasStartedMsg); - ADDFN(CMusicHasStoppedMsg); - ADDFN(CMusicSettingChangedMsg); - ADDFN(CNPCPlayAnimationMsg); - ADDFN(CNPCPlayIdleAnimationMsg); - ADDFN(CNPCPlayTalkingAnimationMsg); - ADDFN(CNPCQueueIdleAnimMsg); - ADDFN(CNutPuzzleMsg); - ADDFN(COnSummonBotMsg); - ADDFN(COpeningCreditsMsg); - ADDFN(CPETDeliverMsg); - ADDFN(CPETGainedObjectMsg); - ADDFN(CPETHelmetOnOffMsg); - ADDFN(CPETKeyboardOnOffMsg); - ADDFN(CPETLostObjectMsg); - ADDFN(CPETObjectSelectedMsg); - ADDFN(CPETObjectStateMsg); - ADDFN(CPETPhotoOnOffMsg); - ADDFN(CPETPlaySoundMsg); - ADDFN(CPETReceiveMsg); - ADDFN(CPETSetStarDestinationMsg); - ADDFN(CPETStarFieldLockMsg); - ADDFN(CPETStereoFieldOnOffMsg); - ADDFN(CPETTargetMsg); - ADDFN(CPanningAwayFromParrotMsg); - ADDFN(CParrotSpeakMsg); - ADDFN(CParrotTriesChickenMsg); - ADDFN(CPassOnDragStartMsg); - ADDFN(CPhonographPlayMsg); - ADDFN(CPhonographReadyToPlayMsg); - ADDFN(CPhonographRecordMsg); - ADDFN(CPhonographStopMsg); - ADDFN(CPlayRangeMsg); - ADDFN(CPlayerTriesRestaurantTableMsg); - ADDFN(CPreSaveMsg); - ADDFN(CProdMaitreDMsg); - ADDFN(CPumpingMsg); - ADDFN(CPutBotBackInHisBoxMsg); - ADDFN(CPutParrotBackMsg); - ADDFN(CPuzzleSolvedMsg); - ADDFN(CQueryCylinderHolderMsg); - ADDFN(CQueryCylinderMsg); - ADDFN(CQueryCylinderNameMsg); - ADDFN(CQueryCylinderTypeMsg); - ADDFN(CQueryMusicControlSettingMsg); - ADDFN(CQueryPhonographState); - ADDFN(CRecordOntoCylinderMsg); - ADDFN(CRemoveFromGameMsg); - ADDFN(CReplaceBowlAndNutsMsg); - ADDFN(CRestaurantMusicChanged); - ADDFN(CSendCCarryMsg); - ADDFN(CSenseWorkingMsg); - ADDFN(CServiceElevatorDoor); - ADDFN(CServiceElevatorFloorChangeMsg); - ADDFN(CServiceElevatorFloorRequestMsg); - ADDFN(CServiceElevatorMsg); - ADDFN(CSetChevButtonImageMsg); - ADDFN(CSetChevClassBits); - ADDFN(CSetChevFloorBits); - ADDFN(CSetChevLiftBits); - ADDFN(CSetChevPanelBitMsg); - ADDFN(CSetChevPanelButtonsMsg); - ADDFN(CSetChevRoomBits); - ADDFN(CSetMusicControlsMsg); - ADDFN(CSetVarMsg); - ADDFN(CSetVolumeMsg); - ADDFN(CShipSettingMsg); - ADDFN(CShowTextMsg); - ADDFN(CSignalObject); - ADDFN(CSpeechFallsFromTreeMsg); - ADDFN(CStartMusicMsg); - ADDFN(CStatusChangeMsg); - ADDFN(CStopMusicMsg); - ADDFN(CSubAcceptCCarryMsg); - ADDFN(CSubDeliverCCarryMsg); - ADDFN(CSubSendCCarryMsg); - ADDFN(CSUBTransition); - ADDFN(CSubTurnOffMsg); - ADDFN(CSubTurnOnMsg); - ADDFN(CSummonBotMsg); - ADDFN(CSummonBotQuerryMsg); - ADDFN(CTakeHeadPieceMsg); - ADDFN(CTextInputMsg); - ADDFN(CTimeDilationMsg); - ADDFN(CTimeMsg); - ADDFN(CTitleSequenceEndedMsg); - ADDFN(CTransitMsg); - ADDFN(CTransportMsg); - ADDFN(CTriggerAutoMusicPlayerMsg); - ADDFN(CTriggerNPCEvent); - ADDFN(CTrueTalkGetAnimSetMsg); - ADDFN(CTrueTalkGetAssetDetailsMsg); - ADDFN(CTrueTalkGetStateValueMsg); - ADDFN(CTrueTalkNotifySpeechEndedMsg); - ADDFN(CTrueTalkNotifySpeechStartedMsg); - ADDFN(CTrueTalkQueueUpAnimSetMsg); - ADDFN(CTrueTalkSelfQueueAnimSetMsg); - ADDFN(CTrueTalkTriggerActionMsg); - ADDFN(CTurnOff); - ADDFN(CTurnOn); - ADDFN(CUse); - ADDFN(CUseWithCharMsg); - ADDFN(CUseWithOtherMsg); - ADDFN(CVirtualKeyCharMsg); - ADDFN(CVisibleMsg); + ADDFN(CActButton, CSTButton); + ADDFN(CChangesSeasonButton, CSTButton); + ADDFN(CChevLeftOff, CToggleSwitch); + ADDFN(CChevLeftOn, CToggleSwitch); + ADDFN(CChevRightOff, CToggleSwitch); + ADDFN(CChevRightOn, CToggleSwitch); + ADDFN(CChevSendRecSwitch, CToggleSwitch); + ADDFN(CChevSwitch, CToggleSwitch); + ADDFN(CEditControl, CGameObject); + ADDFN(CElevatorButton, CSTButton); + ADDFN(CGetFromSucc, CToggleSwitch); + ADDFN(CHelmetOnOff, CToggleSwitch); + ADDFN(CHomePhoto, CToggleSwitch); + ADDFN(CIconNavAction, CToggleSwitch); + ADDFN(CIconNavButt, CPetGraphic); + ADDFN(CIconNavDown, CToggleSwitch); + ADDFN(CIconNavImage, CPetGraphic); + ADDFN(CIconNavLeft, CToggleSwitch); + ADDFN(CIconNavReceive, CPetGraphic); + ADDFN(CIconNavRight, CToggleSwitch); + ADDFN(CIconNavSend, CPetGraphic); + ADDFN(CIconNavUp, CToggleSwitch); + ADDFN(CKeybrdButt, CToggleSwitch); + ADDFN(CMoveObjectButton, CSTButton); + ADDFN(CMusicControl, CBackground); + ADDFN(CMusicSlider, CMusicControl); + ADDFN(CMusicSliderPitch, CMusicSlider); + ADDFN(CMusicSliderSpeed, CMusicSlider); + ADDFN(CMusicSwitch, CMusicControl); + ADDFN(CMusicSwitchInversion, CMusicSwitch); + ADDFN(CMusicSwitchReverse, CMusicSwitch); + ADDFN(CMusicVoiceMute, CMusicControl); + ADDFN(CPetControl, CGameObject); + ADDFN(CPetDragChev, CPetGraphic2); + ADDFN(CPetGraphic, CGameObject); + ADDFN(CPetGraphic2, CGameObject); + ADDFN(PETLeaf, CGameObject); + ADDFN(CPetModeOff, CToggleSwitch); + ADDFN(CPetModeOn, CToggleSwitch); + ADDFN(CPetModePanel, CToggleSwitch); + ADDFN(CPetPannel1, CPetGraphic); + ADDFN(CPetPannel2, CPetGraphic); + ADDFN(CPetPannel3, CPetGraphic); + ADDFN(CSendToSucc, CToggleSwitch); + ADDFN(CSGTSelector, CPetGraphic); + ADDFN(CSliderButton, CSTButton); + ADDFN(CSmallChevLeftOff, CToggleSwitch); + ADDFN(CSmallChevLeftOn, CToggleSwitch); + ADDFN(CSmallChevRightOff, CToggleSwitch); + ADDFN(CSmallChevRightOn, CToggleSwitch); + ADDFN(CStatusChangeButton, CSTButtonClass); + ADDFN(CSTButton, CBackground); + ADDFN(CTextDown, CPetGraphic); + ADDFN(CTextSkrew, CPetGraphic); + ADDFN(CTextUp, CPetGraphic); + ADDFN(CToggleButton, CBackground); + ADDFN(CToggleSwitch, CGameObject); + ADDFN(CVolumeControl, CGameObject); + + ADDFN(CActMsg, CMessage); + ADDFN(CActivationmsg, CMessage); + ADDFN(CAddHeadPieceMsg, CMessage); + ADDFN(CAnimateMaitreDMsg, CMessage); + ADDFN(CArboretumGateMsg, CMessage); + ADDFN(CArmPickedUpFromTableMsg, CMessage); + ADDFN(CAutoSoundEvent, CGameObject); + ADDFN(CBilgeAutoSoundEvent, CAutoSoundEvent); + ADDFN(CBilgeDispensorEvent, CAutoSoundEvent); + ADDFN(CBodyInBilgeRoomMsg, CMessage); + ADDFN(CBowlStateChange, CMessage); + ADDFN(CCarryObjectArrivedMsg, CMessage); + ADDFN(CChangeSeasonMsg, CMessage); + ADDFN(CCheckAllPossibleCodes, CMessage); + ADDFN(CCheckChevCode, CMessage); + ADDFN(CChildDragEndMsg, CMessage); + ADDFN(CChildDragMoveMsg, CMessage); + ADDFN(CChildDragStartMsg, CMessage); + ADDFN(CClearChevPanelBits, CMessage); + ADDFN(CCorrectMusicPlayedMsg, CMessage); + ADDFN(CCreateMusicPlayerMsg, CMessage); + ADDFN(CCylinderHolderReadyMsg, CMessage); + ADDFN(CDeactivationMsg, CMessage); + ADDFN(CDeliverCCarryMsg, CMessage); + ADDFN(CDisableMaitreDProdReceptor, CMessage); + ADDFN(CDismissBotMsg, CMessage); + ADDFN(CDoffNavHelmet, CMessage); + ADDFN(CDonNavHelmet, CMessage); + ADDFN(CDoorAutoSoundEvent, CAutoSoundEvent); + ADDFN(CDoorbotNeededInElevatorMsg, CMessage); + ADDFN(CDoorbotNeededInHomeMsg, CMessage); + ADDFN(CDropobjectMsg, CMessage); + ADDFN(CDropZoneGotObjectMsg, CMessage); + ADDFN(CDropZoneLostObjectMsg, CMessage); + ADDFN(CEditControlMsg, CMessage); + ADDFN(CEjectCylinderMsg, CMessage); + ADDFN(CErasePhonographCylinderMsg, CMessage); + ADDFN(CFreshenCookieMsg, CMessage); + ADDFN(CGetChevClassBits, CMessage); + ADDFN(CGetChevClassNum, CMessage); + ADDFN(CGetChevCodeFromRoomNameMsg, CMessage); + ADDFN(CGetChevFloorBits, CMessage); + ADDFN(CGetChevFloorNum, CMessage); + ADDFN(CGetChevLiftBits, CMessage); + ADDFN(CGetChevLiftNum, CMessage); + ADDFN(CGetChevRoomBits, CMessage); + ADDFN(CGetChevRoomNum, CMessage); + ADDFN(CHoseConnectedMsg, CMessage); + ADDFN(CInitializeAnimMsg, CMessage); + ADDFN(CIsEarBowlPuzzleDone, CMessage); + ADDFN(CIsHookedOnMsg, CMessage); + ADDFN(CIsParrotPresentMsg, CMessage); + ADDFN(CKeyCharMsg, CMessage); + ADDFN(CLemonFallsFromTreeMsg, CMessage); + ADDFN(CLightsMsg, CMessage); + ADDFN(CLockPhonographMsg, CMessage); + ADDFN(CMaitreDDefeatedMsg, CMessage); + ADDFN(CMaitreDHappyMsg, CMessage); + ADDFN(CMissiveOMatActionMsg, CMessage); + ADDFN(CMouseMsg, CMessage); + ADDFN(CMouseMoveMsg, CMouseMsg); + ADDFN(CMouseButtonMsg, CMouseMsg); + ADDFN(CMouseButtonDownMsg, CMouseButtonMsg); + ADDFN(CMouseButtonUpMsg, CMouseButtonMsg); + ADDFN(CMouseButtonDoubleClickMsg, CMouseButtonMsg); + ADDFN(CMouseDragMsg, CMouseMsg); + ADDFN(CMouseDragStartMsg, CMouseDragMsg); + ADDFN(CMouseDragMoveMsg, CMouseDragMsg); + ADDFN(CMouseDragEndMsg, CMouseDragMsg); + ADDFN(CMoveToStartPosMsg, CMessage); + ADDFN(CMovieEndMsg, CMessage); + ADDFN(CMovieFrameMsg, CMessage); + ADDFN(CMusicHasStartedMsg, CMessage); + ADDFN(CMusicHasStoppedMsg, CMessage); + ADDFN(CMusicSettingChangedMsg, CMessage); + ADDFN(CNPCPlayAnimationMsg, CMessage); + ADDFN(CNPCPlayIdleAnimationMsg, CMessage); + ADDFN(CNPCPlayTalkingAnimationMsg, CMessage); + ADDFN(CNPCQueueIdleAnimMsg, CMessage); + ADDFN(CNutPuzzleMsg, CMessage); + ADDFN(COnSummonBotMsg, CMessage); + ADDFN(COpeningCreditsMsg, CMessage); + ADDFN(CPETDeliverMsg, CMessage); + ADDFN(CPETGainedObjectMsg, CMessage); + ADDFN(CPETHelmetOnOffMsg, CMessage); + ADDFN(CPETKeyboardOnOffMsg, CMessage); + ADDFN(CPETLostObjectMsg, CMessage); + ADDFN(CPETObjectSelectedMsg, CMessage); + ADDFN(CPETObjectStateMsg, CMessage); + ADDFN(CPETPhotoOnOffMsg, CMessage); + ADDFN(CPETPlaySoundMsg, CMessage); + ADDFN(CPETReceiveMsg, CMessage); + ADDFN(CPETSetStarDestinationMsg, CMessage); + ADDFN(CPETStarFieldLockMsg, CMessage); + ADDFN(CPETStereoFieldOnOffMsg, CMessage); + ADDFN(CPETTargetMsg, CMessage); + ADDFN(CPanningAwayFromParrotMsg, CMessage); + ADDFN(CParrotSpeakMsg, CMessage); + ADDFN(CParrotTriesChickenMsg, CMessage); + ADDFN(CPassOnDragStartMsg, CMessage); + ADDFN(CPhonographPlayMsg, CMessage); + ADDFN(CPhonographReadyToPlayMsg, CMessage); + ADDFN(CPhonographRecordMsg, CMessage); + ADDFN(CPhonographStopMsg, CMessage); + ADDFN(CPlayRangeMsg, CMessage); + ADDFN(CPlayerTriesRestaurantTableMsg, CMessage); + ADDFN(CPreSaveMsg, CMessage); + ADDFN(CProdMaitreDMsg, CMessage); + ADDFN(CPumpingMsg, CMessage); + ADDFN(CPutBotBackInHisBoxMsg, CMessage); + ADDFN(CPutParrotBackMsg, CMessage); + ADDFN(CPuzzleSolvedMsg, CMessage); + ADDFN(CQueryCylinderHolderMsg, CMessage); + ADDFN(CQueryCylinderMsg, CMessage); + ADDFN(CQueryCylinderNameMsg, CMessage); + ADDFN(CQueryCylinderTypeMsg, CMessage); + ADDFN(CQueryMusicControlSettingMsg, CMessage); + ADDFN(CQueryPhonographState, CMessage); + ADDFN(CRecordOntoCylinderMsg, CMessage); + ADDFN(CRemoveFromGameMsg, CMessage); + ADDFN(CReplaceBowlAndNutsMsg, CMessage); + ADDFN(CRestaurantMusicChanged, CMessage); + ADDFN(CSendCCarryMsg, CMessage); + ADDFN(CSenseWorkingMsg, CMessage); + ADDFN(CServiceElevatorDoor, CMessage); + ADDFN(CServiceElevatorFloorChangeMsg, CMessage); + ADDFN(CServiceElevatorFloorRequestMsg, CMessage); + ADDFN(CServiceElevatorMsg, CMessage); + ADDFN(CSetChevButtonImageMsg, CMessage); + ADDFN(CSetChevClassBits, CMessage); + ADDFN(CSetChevFloorBits, CMessage); + ADDFN(CSetChevLiftBits, CMessage); + ADDFN(CSetChevPanelBitMsg, CMessage); + ADDFN(CSetChevPanelButtonsMsg, CMessage); + ADDFN(CSetChevRoomBits, CMessage); + ADDFN(CSetMusicControlsMsg, CMessage); + ADDFN(CSetVarMsg, CMessage); + ADDFN(CSetVolumeMsg, CMessage); + ADDFN(CShipSettingMsg, CMessage); + ADDFN(CShowTextMsg, CMessage); + ADDFN(CSignalObject, CMessage); + ADDFN(CSpeechFallsFromTreeMsg, CMessage); + ADDFN(CStartMusicMsg, CMessage); + ADDFN(CStatusChangeMsg, CMessage); + ADDFN(CStopMusicMsg, CMessage); + ADDFN(CSubAcceptCCarryMsg, CMessage); + ADDFN(CSubDeliverCCarryMsg, CMessage); + ADDFN(CSubSendCCarryMsg, CMessage); + ADDFN(CSUBTransition, CMessage); + ADDFN(CSubTurnOffMsg, CMessage); + ADDFN(CSubTurnOnMsg, CMessage); + ADDFN(CSummonBotMsg, CMessage); + ADDFN(CSummonBotQuerryMsg, CMessage); + ADDFN(CTakeHeadPieceMsg, CMessage); + ADDFN(CTextInputMsg, CMessage); + ADDFN(CTimeDilationMsg, CMessage); + ADDFN(CTimeMsg, CMessage); + ADDFN(CTitleSequenceEndedMsg, CMessage); + ADDFN(CTransitMsg, CMessage); + ADDFN(CTransportMsg, CMessage); + ADDFN(CTriggerAutoMusicPlayerMsg, CMessage); + ADDFN(CTriggerNPCEvent, CMessage); + ADDFN(CTrueTalkGetAnimSetMsg, CMessage); + ADDFN(CTrueTalkGetAssetDetailsMsg, CMessage); + ADDFN(CTrueTalkGetStateValueMsg, CMessage); + ADDFN(CTrueTalkNotifySpeechEndedMsg, CMessage); + ADDFN(CTrueTalkNotifySpeechStartedMsg, CMessage); + ADDFN(CTrueTalkQueueUpAnimSetMsg, CMessage); + ADDFN(CTrueTalkSelfQueueAnimSetMsg, CMessage); + ADDFN(CTrueTalkTriggerActionMsg, CMessage); + ADDFN(CTurnOff, CMessage); + ADDFN(CTurnOn, CMessage); + ADDFN(CUse, CMessage); + ADDFN(CUseWithCharMsg, CMessage); + ADDFN(CUseWithOtherMsg, CMessage); + ADDFN(CVirtualKeyCharMsg, CMessage); + ADDFN(CVisibleMsg, CMessage); - ADDFN(CEnterBombRoom); - ADDFN(CEnterBridge); - ADDFN(CEnterExitFirstClassState); - ADDFN(CEnterExitMiniLift); - ADDFN(CEnterExitSecClassMiniLift); - ADDFN(CEnterExitView); - ADDFN(CEnterSecClassState); - ADDFN(CExitArboretum); - ADDFN(CExitBridge); - ADDFN(CExitLift); - ADDFN(CExitPellerator); - ADDFN(CExitStateRoom); - ADDFN(CExitTiania); - ADDFN(CMovePlayerInParrotRoom); - ADDFN(CMovePlayerTo); - ADDFN(CMovePlayerToFrom); - ADDFN(CMultiMove); - ADDFN(CPanFromPel); - ADDFN(CRestaurantPanHandler); - ADDFN(CScraliontisTable); - ADDFN(CRestrictedMove); - ADDFN(CTripDownCanal); + ADDFN(CEnterBombRoom, CMovePlayerTo); + ADDFN(CEnterBridge, CGameObject); + ADDFN(CEnterExitFirstClassState, CGameObject); + ADDFN(CEnterExitMiniLift, CSGTNavigation); + ADDFN(CEnterExitSecClassMiniLift, CGameObject); + ADDFN(CEnterExitView, CGameObject); + ADDFN(CEnterSecClassState, CGameObject); + ADDFN(CExitArboretum, CMovePlayerTo); + ADDFN(CExitBridge, CMovePlayerTo); + ADDFN(CExitLift, CGameObject); + ADDFN(CExitPellerator, CGameObject); + ADDFN(CExitStateRoom, CMovePlayerTo); + ADDFN(CExitTiania, CMovePlayerTo); + ADDFN(CMovePlayerInParrotRoom, CMovePlayerTo); + ADDFN(CMovePlayerTo, CGameObject); + ADDFN(CMovePlayerToFrom, CGameObject); + ADDFN(CMultiMove, CMovePlayerTo); + ADDFN(CPanFromPel, CMovePlayerTo); + ADDFN(CRestaurantPanHandler, CMovePlayerTo); + ADDFN(CScraliontisTable, CRestaurantPanHandler); + ADDFN(CRestrictedMove, CMovePlayerTo); + ADDFN(CTripDownCanal, CMovePlayerTo); - ADDFN(CBarbot); - ADDFN(CBellBot); - ADDFN(CCallBot); - ADDFN(CDeskbot); - ADDFN(CDoorbot); - ADDFN(CMaitreD); - ADDFN(CLiftBot); - ADDFN(CMobile); - ADDFN(CParrot); - ADDFN(CStarlings); - ADDFN(CSuccUBus); - ADDFN(CSummonBots); - ADDFN(CTitania); + ADDFN(CBarbot, CTrueTalkNPC); + ADDFN(CBellBot, CTrueTalkNPC); + ADDFN(CCallBot, CGameObject); + ADDFN(CCharacter, CGameObject); + ADDFN(CDeskbot, CTrueTalkNPC); + ADDFN(CDoorbot, CTrueTalkNPC); + ADDFN(CMaitreD, CTrueTalkNPC); + ADDFN(CLiftBot, CTrueTalkNPC); + ADDFN(CMobile, CCharacter); + ADDFN(CParrot, CTrueTalkNPC); + ADDFN(CRobotController, CGameObject); + ADDFN(CStarlings, CCharacter); + ADDFN(CSuccUBus, CTrueTalkNPC); + ADDFN(CSummonBots, CRobotController); + ADDFN(CTitania, CCharacter); + ADDFN(CTrueTalkNPC, CCharacter); - ADDFN(CAutoMusicPlayer); - ADDFN(CAutoSoundEvent); - ADDFN(CAutoMusicPlayerBase); - ADDFN(CAutoSoundPlayer); - ADDFN(CAutoSoundPlayerADSR); - ADDFN(CBackgroundSoundMaker); - ADDFN(CBilgeAutoSoundEvent); - ADDFN(CBilgeDispensorEvent); - ADDFN(CBirdSong); - ADDFN(CDoorAutoSoundEvent); - ADDFN(CGondolierSong); - ADDFN(CEnterViewTogglesOtherMusic); - ADDFN(CGondolierSong); - ADDFN(CMusicPlayer); - ADDFN(CNodeAutoSoundPlayer); - ADDFN(CRestrictedAutoMusicPlayer); - ADDFN(CRoomAutoSoundPlayer); - ADDFN(CSeasonNoises); - ADDFN(CSeasonalMusicPlayer); - ADDFN(CAutoMusicPlayer); - ADDFN(CTitaniaSpeech); - ADDFN(CTriggerAutoMusicPlayer); - ADDFN(CViewAutoSoundPlayer); - ADDFN(CViewTogglesOtherMusic); - ADDFN(CWaterLappingSounds); - ADDFN(CStarControl); + ADDFN(CAutoMusicPlayer, CAutoMusicPlayerBase); + ADDFN(CAutoMusicPlayerBase, CGameObject); + ADDFN(CAutoSoundPlayer, CGameObject); + ADDFN(CAutoSoundPlayerADSR, CAutoSoundPlayer); + ADDFN(CBackgroundSoundMaker, CGameObject); + ADDFN(CBirdSong, CRoomAutoSoundPlayer); + ADDFN(CDomeFromTopOfWell, CViewAutoSoundPlayer); + ADDFN(CGondolierSong, CGameObject); + ADDFN(CEnterViewTogglesOtherMusic, CTriggerAutoMusicPlayer); + ADDFN(CGondolierSong, CRoomAutoSoundPlayer); + ADDFN(CMusicPlayer, CGameObject); + ADDFN(CNodeAutoSoundPlayer, CAutoSoundPlayer); + ADDFN(CRestrictedAutoMusicPlayer, CAutoMusicPlayer); + ADDFN(CRoomAutoSoundPlayer, CAutoSoundPlayer); + ADDFN(CSeasonNoises, CViewAutoSoundPlayer); + ADDFN(CSeasonalMusicPlayer, CAutoMusicPlayerBase); + ADDFN(CAutoMusicPlayer, CAutoMusicPlayerBase); + ADDFN(CAutoMusicPlayerBase, CAutoMusicPlayer); + ADDFN(CTitaniaSpeech, CGameObject); + ADDFN(CTriggerAutoMusicPlayer, CGameObject); + ADDFN(CViewAutoSoundPlayer, CAutoSoundPlayer); + ADDFN(CViewTogglesOtherMusic, CEnterViewTogglesOtherMusic); + ADDFN(CWaterLappingSounds, CRoomAutoSoundPlayer); + ADDFN(CStarControl, CGameObject); } void CSaveableObject::freeClassList() { + Common::List<ClassDef *>::iterator i; + for (i = _classDefs->begin(); i != _classDefs->end(); ++i) + delete *i; + + delete _classDefs; delete _classList; } @@ -1512,11 +1564,17 @@ void CSaveableObject::load(SimpleFile *file) { } void CSaveableObject::saveHeader(SimpleFile *file, int indent) const { - file->writeClassStart(getClassName(), indent); + file->writeClassStart(getType()->_className, indent); } void CSaveableObject::saveFooter(SimpleFile *file, int indent) const { file->writeClassEnd(indent); } +/*------------------------------------------------------------------------*/ + +CSaveableObject *ClassDef::create() { + return new CSaveableObject(); +} + } // End of namespace Titanic diff --git a/engines/titanic/core/saveable_object.h b/engines/titanic/core/saveable_object.h index ed26163557..8368c71d3f 100644 --- a/engines/titanic/core/saveable_object.h +++ b/engines/titanic/core/saveable_object.h @@ -30,9 +30,34 @@ namespace Titanic { +class CSaveableObject; + +class ClassDef { +public: + const char *_className; + ClassDef *_parent; +public: + ClassDef(const char *className, ClassDef *parent) : + _className(className), _parent(parent) {} + virtual CSaveableObject *create(); +}; + +template<typename T> +class TypeTemplate : public ClassDef { +public: + TypeTemplate(const char *className, ClassDef *parent) : + ClassDef(className, parent) {} + virtual CSaveableObject *create() { return new T(); } +}; + +#define CLASSDEF \ + static ClassDef *_type; \ + virtual ClassDef *getType() const { return _type; } + class CSaveableObject { typedef CSaveableObject *(*CreateFunction)(); private: + static Common::List<ClassDef *> *_classDefs; static Common::HashMap<Common::String, CreateFunction> *_classList; public: /** @@ -50,13 +75,9 @@ public: */ static CSaveableObject *createInstance(const Common::String &name); public: + CLASSDEF virtual ~CSaveableObject() {} - - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSaveableObject"; } - + /** * Save the data for the class to file */ diff --git a/engines/titanic/core/static_image.h b/engines/titanic/core/static_image.h index ac556f243e..2b0a3ad071 100644 --- a/engines/titanic/core/static_image.h +++ b/engines/titanic/core/static_image.h @@ -29,10 +29,7 @@ namespace Titanic { class CStaticImage : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CStaticImage"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/core/tree_item.h b/engines/titanic/core/tree_item.h index ea5de32161..78a58fa735 100644 --- a/engines/titanic/core/tree_item.h +++ b/engines/titanic/core/tree_item.h @@ -38,14 +38,10 @@ private: CTreeItem *_firstChild; int _field14; public: + CLASSDEF CTreeItem(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTreeItem"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/core/turn_on_object.h b/engines/titanic/core/turn_on_object.h index a17d58e762..d87e205983 100644 --- a/engines/titanic/core/turn_on_object.h +++ b/engines/titanic/core/turn_on_object.h @@ -31,14 +31,10 @@ class CTurnOnObject : public CBackground { protected: CString _string3; public: + CLASSDEF CTurnOnObject(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTurnOnObject"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/core/turn_on_play_sound.h b/engines/titanic/core/turn_on_play_sound.h index a0fc8eedfb..263709b844 100644 --- a/engines/titanic/core/turn_on_play_sound.h +++ b/engines/titanic/core/turn_on_play_sound.h @@ -33,14 +33,10 @@ private: int _fieldF8; int _fieldFC; public: + CLASSDEF CTurnOnPlaySound(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTurnOnPlaySound"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/core/turn_on_turn_off.h b/engines/titanic/core/turn_on_turn_off.h index 41a0156391..5683a0db0e 100644 --- a/engines/titanic/core/turn_on_turn_off.h +++ b/engines/titanic/core/turn_on_turn_off.h @@ -35,14 +35,10 @@ private: int _fieldEC; int _fieldF0; public: + CLASSDEF CTurnOnTurnOff(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTurnOnTurnOff"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/core/view_item.h b/engines/titanic/core/view_item.h index 592bb21632..a5ce575171 100644 --- a/engines/titanic/core/view_item.h +++ b/engines/titanic/core/view_item.h @@ -39,14 +39,10 @@ protected: int _field50; int _field54; public: + CLASSDEF CViewItem(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNamedItem"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/announce.h b/engines/titanic/game/announce.h index baa5f1a55a..18702c3baf 100644 --- a/engines/titanic/game/announce.h +++ b/engines/titanic/game/announce.h @@ -34,14 +34,10 @@ private: int _fieldC4; int _fieldC8; public: + CLASSDEF CAnnounce(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CAnnounce"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/annoy_barbot.h b/engines/titanic/game/annoy_barbot.h index c1598e100d..c15b41dc85 100644 --- a/engines/titanic/game/annoy_barbot.h +++ b/engines/titanic/game/annoy_barbot.h @@ -31,10 +31,7 @@ class CAnnoyBarbot : public CGameObject { private: static int _v1; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CAnnoyBarbot"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/arb_background.h b/engines/titanic/game/arb_background.h index e443c4b41c..50a9075750 100644 --- a/engines/titanic/game/arb_background.h +++ b/engines/titanic/game/arb_background.h @@ -34,14 +34,10 @@ public: int _fieldE8; int _fieldEC; public: + CLASSDEF CArbBackground(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CArbBackground"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/arboretum_gate.h b/engines/titanic/game/arboretum_gate.h index 8cbe49be14..eb82333f8f 100644 --- a/engines/titanic/game/arboretum_gate.h +++ b/engines/titanic/game/arboretum_gate.h @@ -64,14 +64,10 @@ public: int _field150; CString _string2; public: + CLASSDEF CArboretumGate(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CArboretumGate"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/auto_animate.h b/engines/titanic/game/auto_animate.h index 2afb85b9d5..0fd4ad768f 100644 --- a/engines/titanic/game/auto_animate.h +++ b/engines/titanic/game/auto_animate.h @@ -33,11 +33,8 @@ public: int _fieldE4; int _fieldE8; public: + CLASSDEF CAutoAnimate() : CBackground(), _fieldE0(1), _fieldE4(1), _fieldE8(0) {} - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CAutoAnimate"; } /** * Save the data for the class to file diff --git a/engines/titanic/game/bar_bell.h b/engines/titanic/game/bar_bell.h index 87c244d9bf..279379feaf 100644 --- a/engines/titanic/game/bar_bell.h +++ b/engines/titanic/game/bar_bell.h @@ -35,14 +35,10 @@ public: int _fieldC8; int _fieldCC; public: + CLASSDEF CBarBell(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBarBell"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/bar_menu.h b/engines/titanic/game/bar_menu.h index 69ba0aa3e3..ac253fc747 100644 --- a/engines/titanic/game/bar_menu.h +++ b/engines/titanic/game/bar_menu.h @@ -33,14 +33,10 @@ public: int _fieldC0; int _fieldC4; public: + CLASSDEF CBarMenu(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBarMenu"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/bar_menu_button.h b/engines/titanic/game/bar_menu_button.h index 56b618dd1e..1a9d42c5d2 100644 --- a/engines/titanic/game/bar_menu_button.h +++ b/engines/titanic/game/bar_menu_button.h @@ -31,14 +31,10 @@ class CBarMenuButton : public CGameObject { public: int _value; public: + CLASSDEF CBarMenuButton() : CGameObject(), _value(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBarMenuButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/belbot_get_light.h b/engines/titanic/game/belbot_get_light.h index 2c2d547dcc..05c14f5b45 100644 --- a/engines/titanic/game/belbot_get_light.h +++ b/engines/titanic/game/belbot_get_light.h @@ -31,10 +31,7 @@ class CBelbotGetLight : public CGameObject { private: CString _value; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBelbotGetLight"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/bilge_succubus.h b/engines/titanic/game/bilge_succubus.h index 795fe865c2..4ff72a57c7 100644 --- a/engines/titanic/game/bilge_succubus.h +++ b/engines/titanic/game/bilge_succubus.h @@ -34,14 +34,10 @@ public: int _field1E4; int _field1E8; public: + CLASSDEF CBilgeSuccUBus(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBilgeSuccUBus"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/bomb.h b/engines/titanic/game/bomb.h index a7294f422a..2e7ba4658e 100644 --- a/engines/titanic/game/bomb.h +++ b/engines/titanic/game/bomb.h @@ -40,14 +40,10 @@ public: int _field100; int _field104; public: + CLASSDEF CBomb(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBomb"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/bottom_of_well_monitor.h b/engines/titanic/game/bottom_of_well_monitor.h index f1a9f5d710..e063579056 100644 --- a/engines/titanic/game/bottom_of_well_monitor.h +++ b/engines/titanic/game/bottom_of_well_monitor.h @@ -32,14 +32,10 @@ public: static int _v1, _v2; int _value; public: + CLASSDEF CBottomOfWellMonitor() : _value(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBottomOfWellMonitor"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/bowl_unlocker.h b/engines/titanic/game/bowl_unlocker.h index 455b0a7fd8..7b886c406a 100644 --- a/engines/titanic/game/bowl_unlocker.h +++ b/engines/titanic/game/bowl_unlocker.h @@ -31,14 +31,10 @@ class CBowlUnlocker : public CGameObject { public: int _value; public: + CLASSDEF CBowlUnlocker() : CGameObject(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBowlUnlocker"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/brain_slot.h b/engines/titanic/game/brain_slot.h index fa197a85d7..ae797ebb2f 100644 --- a/engines/titanic/game/brain_slot.h +++ b/engines/titanic/game/brain_slot.h @@ -34,14 +34,10 @@ public: int _value1; CString _value2; public: + CLASSDEF CBrainSlot() : CGameObject(), _value1(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBrainSlot"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/bridge_door.h b/engines/titanic/game/bridge_door.h index 96703c1c6f..828562dfa3 100644 --- a/engines/titanic/game/bridge_door.h +++ b/engines/titanic/game/bridge_door.h @@ -29,10 +29,7 @@ namespace Titanic { class CBridgeDoor : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBridgeDoor"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/bridge_view.h b/engines/titanic/game/bridge_view.h index 7a765cf21a..35de076573 100644 --- a/engines/titanic/game/bridge_view.h +++ b/engines/titanic/game/bridge_view.h @@ -31,14 +31,10 @@ class CBridgeView : public CBackground { public: int _fieldE0; public: + CLASSDEF CBridgeView() : CBackground(), _fieldE0(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBridgeView"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/broken_pell_base.h b/engines/titanic/game/broken_pell_base.h index 8e77501aa5..46e7a70581 100644 --- a/engines/titanic/game/broken_pell_base.h +++ b/engines/titanic/game/broken_pell_base.h @@ -34,14 +34,10 @@ private: int _fieldE0; public: + CLASSDEF CBrokenPellBase() : CBackground(), _fieldE0(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBrokenPellBase"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/broken_pellerator.h b/engines/titanic/game/broken_pellerator.h index 71bae32e17..974d5d21b4 100644 --- a/engines/titanic/game/broken_pellerator.h +++ b/engines/titanic/game/broken_pellerator.h @@ -34,10 +34,7 @@ private: CString _string4; CString _string5; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBrokenPellerator"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/broken_pellerator_froz.h b/engines/titanic/game/broken_pellerator_froz.h index 1fded7c09f..c3674f0af7 100644 --- a/engines/titanic/game/broken_pellerator_froz.h +++ b/engines/titanic/game/broken_pellerator_froz.h @@ -34,10 +34,7 @@ private: CString _string4; CString _string5; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBrokenPelleratorFroz"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/cage.h b/engines/titanic/game/cage.h index 4c097f3b93..08fc8c8c43 100644 --- a/engines/titanic/game/cage.h +++ b/engines/titanic/game/cage.h @@ -32,10 +32,7 @@ public: static int _v1; static int _v2; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCage"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/call_pellerator.h b/engines/titanic/game/call_pellerator.h index a6e8ded2a2..dc9afe0a1a 100644 --- a/engines/titanic/game/call_pellerator.h +++ b/engines/titanic/game/call_pellerator.h @@ -29,10 +29,7 @@ namespace Titanic { class CCallPellerator : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCallPellerator"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/captains_wheel.h b/engines/titanic/game/captains_wheel.h index 3d35b9b041..bcfc5136e7 100644 --- a/engines/titanic/game/captains_wheel.h +++ b/engines/titanic/game/captains_wheel.h @@ -36,14 +36,10 @@ public: int _fieldF0; int _fieldF4; public: + CLASSDEF CCaptainsWheel(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCaptainsWheel"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/cdrom.h b/engines/titanic/game/cdrom.h index cd05c79d0a..f810056e4f 100644 --- a/engines/titanic/game/cdrom.h +++ b/engines/titanic/game/cdrom.h @@ -31,14 +31,10 @@ class CCDROM : public CGameObject { private: Common::Point _pos1; public: + CLASSDEF CCDROM(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCDROM"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/cdrom_computer.h b/engines/titanic/game/cdrom_computer.h index 368c45f266..de070b007b 100644 --- a/engines/titanic/game/cdrom_computer.h +++ b/engines/titanic/game/cdrom_computer.h @@ -34,14 +34,10 @@ private: int _fieldC4; int _fieldC8; public: + CLASSDEF CCDROMComputer(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCDROMComputer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/cdrom_tray.h b/engines/titanic/game/cdrom_tray.h index 371187e946..85d26c5a1d 100644 --- a/engines/titanic/game/cdrom_tray.h +++ b/engines/titanic/game/cdrom_tray.h @@ -32,14 +32,10 @@ private: int _fieldBC; CString _string1; public: + CLASSDEF CCDROMTray(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCDROMTray"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/cell_point_button.h b/engines/titanic/game/cell_point_button.h index a16e7ae705..02710f6ce5 100644 --- a/engines/titanic/game/cell_point_button.h +++ b/engines/titanic/game/cell_point_button.h @@ -43,14 +43,10 @@ public: CString _string3; int _field118; public: + CLASSDEF CCellPointButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCellPointButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/chev_code.h b/engines/titanic/game/chev_code.h index 6bd624258e..3d5347bd05 100644 --- a/engines/titanic/game/chev_code.h +++ b/engines/titanic/game/chev_code.h @@ -31,14 +31,10 @@ class CChevCode : public CGameObject { public: int _value; public: + CLASSDEF CChevCode() : CGameObject(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CChevCode"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/chev_panel.h b/engines/titanic/game/chev_panel.h index 39ad43628d..9ddca37dc3 100644 --- a/engines/titanic/game/chev_panel.h +++ b/engines/titanic/game/chev_panel.h @@ -33,14 +33,10 @@ public: int _fieldC0; int _fieldC4; public: + CLASSDEF CChevPanel() : _fieldBC(0), _fieldC0(0), _fieldC4(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CChevPanel"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/chicken_cooler.h b/engines/titanic/game/chicken_cooler.h index 42e8a2724e..9e150572f4 100644 --- a/engines/titanic/game/chicken_cooler.h +++ b/engines/titanic/game/chicken_cooler.h @@ -32,14 +32,10 @@ public: int _fieldBC; int _fieldC0; public: + CLASSDEF CChickenCooler() : CGameObject(), _fieldBC(0), _fieldC0(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CChickenCooler"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/chicken_dispensor.h b/engines/titanic/game/chicken_dispensor.h index 10fcba1d17..97e5f864f6 100644 --- a/engines/titanic/game/chicken_dispensor.h +++ b/engines/titanic/game/chicken_dispensor.h @@ -33,14 +33,10 @@ public: int _fieldE4; int _fieldE8; public: + CLASSDEF CChickenDispensor(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNoNutBowl"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/close_broken_pel.h b/engines/titanic/game/close_broken_pel.h index ea174a4f1c..ecf38d904c 100644 --- a/engines/titanic/game/close_broken_pel.h +++ b/engines/titanic/game/close_broken_pel.h @@ -31,10 +31,7 @@ class CCloseBrokenPel : public CBackground { public: CString _string3; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCloseBrokenPel"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/code_wheel.h b/engines/titanic/game/code_wheel.h index 70879826e9..6080e92041 100644 --- a/engines/titanic/game/code_wheel.h +++ b/engines/titanic/game/code_wheel.h @@ -33,14 +33,10 @@ private: int _field10C; int _field110; public: + CLASSDEF CodeWheel(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CodeWheel"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/computer.h b/engines/titanic/game/computer.h index 074d17c0fa..793fecc491 100644 --- a/engines/titanic/game/computer.h +++ b/engines/titanic/game/computer.h @@ -32,14 +32,10 @@ public: CString _string3; int _fieldEC; public: + CLASSDEF CComputer() : CBackground(), _string3("None"), _fieldEC(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CComputer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/computer_screen.h b/engines/titanic/game/computer_screen.h index adb8b99093..aa47482207 100644 --- a/engines/titanic/game/computer_screen.h +++ b/engines/titanic/game/computer_screen.h @@ -29,14 +29,10 @@ namespace Titanic { class CComputerScreen : public CGameObject { public: + CLASSDEF CComputerScreen(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CComputerScreen"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/cookie.h b/engines/titanic/game/cookie.h index a1a72c96c8..bd9d1fff04 100644 --- a/engines/titanic/game/cookie.h +++ b/engines/titanic/game/cookie.h @@ -32,14 +32,10 @@ public: int _value1; int _value2; public: + CLASSDEF CCookie() : CGameObject(), _value1(0), _value2(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCookie"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/credits.h b/engines/titanic/game/credits.h index 0e35a58174..dc229127c8 100644 --- a/engines/titanic/game/credits.h +++ b/engines/titanic/game/credits.h @@ -31,14 +31,10 @@ class CCredits : public CGameObject { public: int _fieldBC, _fieldC0; public: + CLASSDEF CCredits(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCredits"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/credits_button.h b/engines/titanic/game/credits_button.h index b22ce79a3b..fd7a8ad0c2 100644 --- a/engines/titanic/game/credits_button.h +++ b/engines/titanic/game/credits_button.h @@ -31,14 +31,10 @@ class CCreditsButton : public CBackground { public: int _fieldE0; public: + CLASSDEF CCreditsButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCreditsButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/dead_area.h b/engines/titanic/game/dead_area.h index 374e45e9d3..4abcd58dd9 100644 --- a/engines/titanic/game/dead_area.h +++ b/engines/titanic/game/dead_area.h @@ -29,14 +29,10 @@ namespace Titanic { class CDeadArea : public CGameObject { public: + CLASSDEF CDeadArea(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CDeadArea"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/desk_click_responder.h b/engines/titanic/game/desk_click_responder.h index 94afece266..a11d7ae328 100644 --- a/engines/titanic/game/desk_click_responder.h +++ b/engines/titanic/game/desk_click_responder.h @@ -32,10 +32,7 @@ protected: int _fieldD4; int _fieldD8; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CDeskClickResponder"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/doorbot_elevator_handler.h b/engines/titanic/game/doorbot_elevator_handler.h index 41d6068f1b..e46929dfed 100644 --- a/engines/titanic/game/doorbot_elevator_handler.h +++ b/engines/titanic/game/doorbot_elevator_handler.h @@ -32,10 +32,7 @@ private: static int _v1; int _value; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CDoorbotElevatorHandler"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/doorbot_home_handler.h b/engines/titanic/game/doorbot_home_handler.h index 1557dbf91d..1e5d128a7d 100644 --- a/engines/titanic/game/doorbot_home_handler.h +++ b/engines/titanic/game/doorbot_home_handler.h @@ -29,14 +29,10 @@ namespace Titanic { class CDoorbotHomeHandler : public CGameObject { public: + CLASSDEF CDoorbotHomeHandler(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CDoorbotHomeHandler"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/ear_sweet_bowl.h b/engines/titanic/game/ear_sweet_bowl.h index 3e27516a60..aa276f82a7 100644 --- a/engines/titanic/game/ear_sweet_bowl.h +++ b/engines/titanic/game/ear_sweet_bowl.h @@ -29,10 +29,7 @@ namespace Titanic { class CEarSweetBowl : public CSweetBowl { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEarSweetBowl"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/eject_phonograph_button.h b/engines/titanic/game/eject_phonograph_button.h index e37a061bd4..d3e8a50618 100644 --- a/engines/titanic/game/eject_phonograph_button.h +++ b/engines/titanic/game/eject_phonograph_button.h @@ -34,14 +34,10 @@ public: CString _string3; CString _string4; public: + CLASSDEF CEjectPhonographButton() : CBackground(), _fieldE0(0), _fieldE4(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEjectPhonographButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/elevator_action_area.h b/engines/titanic/game/elevator_action_area.h index 07c4f13990..570ee808ed 100644 --- a/engines/titanic/game/elevator_action_area.h +++ b/engines/titanic/game/elevator_action_area.h @@ -31,14 +31,10 @@ class CElevatorActionArea : public CGameObject { public: int _value; public: + CLASSDEF CElevatorActionArea() : CGameObject(), _value(4) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CElevatorActionArea"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/emma_control.h b/engines/titanic/game/emma_control.h index 590c6f7fcf..ea30c52279 100644 --- a/engines/titanic/game/emma_control.h +++ b/engines/titanic/game/emma_control.h @@ -33,14 +33,10 @@ private: CString _wavFile1, _wavFile2; public: + CLASSDEF CEmmaControl() : CBackground(), _wavFile1("b#39.wav"), _wavFile2("b#38.wav") {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEmmaControl"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/empty_nut_bowl.h b/engines/titanic/game/empty_nut_bowl.h index 57668ca49d..9645284e1b 100644 --- a/engines/titanic/game/empty_nut_bowl.h +++ b/engines/titanic/game/empty_nut_bowl.h @@ -31,14 +31,10 @@ class CEmptyNutBowl : public CGameObject { public: int _value; public: + CLASSDEF CEmptyNutBowl() : CGameObject(), _value(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEmptyNutBowl"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/end_credit_text.h b/engines/titanic/game/end_credit_text.h index de0e54d7e0..0003a8b4e3 100644 --- a/engines/titanic/game/end_credit_text.h +++ b/engines/titanic/game/end_credit_text.h @@ -31,14 +31,10 @@ class CEndCreditText : public CGameObject { private: int _value; public: + CLASSDEF CEndCreditText() : CGameObject(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEndCreditText"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/end_credits.h b/engines/titanic/game/end_credits.h index cf5c45ae45..a259a215a4 100644 --- a/engines/titanic/game/end_credits.h +++ b/engines/titanic/game/end_credits.h @@ -31,14 +31,10 @@ class CEndCredits : public CGameObject { public: int _value; public: + CLASSDEF CEndCredits() : CGameObject(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEndCredits"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/end_explode_ship.h b/engines/titanic/game/end_explode_ship.h index df2e0b1b8c..a6b053fe55 100644 --- a/engines/titanic/game/end_explode_ship.h +++ b/engines/titanic/game/end_explode_ship.h @@ -31,14 +31,10 @@ class CEndExplodeShip : public CGameObject { public: int _value1, _value2; public: + CLASSDEF CEndExplodeShip() : CGameObject(), _value1(0), _value2(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEndExplodeShip"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/end_game_credits.h b/engines/titanic/game/end_game_credits.h index f8ec6b00a7..68e86c6220 100644 --- a/engines/titanic/game/end_game_credits.h +++ b/engines/titanic/game/end_game_credits.h @@ -32,14 +32,10 @@ private: int _fieldBC; Common::Point _pos1; public: + CLASSDEF CEndGameCredits(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEndGameCredits"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/end_sequence_control.h b/engines/titanic/game/end_sequence_control.h index dc849295ec..5e2ba30611 100644 --- a/engines/titanic/game/end_sequence_control.h +++ b/engines/titanic/game/end_sequence_control.h @@ -29,10 +29,7 @@ namespace Titanic { class CEndSequenceControl : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEndSequenceControl"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/fan.h b/engines/titanic/game/fan.h index 75bdea5b6c..6f234074f5 100644 --- a/engines/titanic/game/fan.h +++ b/engines/titanic/game/fan.h @@ -31,14 +31,10 @@ class CFan : public CGameObject { public: int _value1, _value2; public: + CLASSDEF CFan() : CGameObject(), _value1(0), _value2(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CFan"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/fan_control.h b/engines/titanic/game/fan_control.h index dfb1ccc6a4..54ebbe27f3 100644 --- a/engines/titanic/game/fan_control.h +++ b/engines/titanic/game/fan_control.h @@ -35,14 +35,10 @@ public: int _fieldC8; int _fieldCC; public: + CLASSDEF CFanControl(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CFanControl"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/fan_decrease.h b/engines/titanic/game/fan_decrease.h index 9831873829..bac102823d 100644 --- a/engines/titanic/game/fan_decrease.h +++ b/engines/titanic/game/fan_decrease.h @@ -29,10 +29,7 @@ namespace Titanic { class CFanDecrease : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CFanDecrease"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/fan_increase.h b/engines/titanic/game/fan_increase.h index 1b9a0fd191..62561f1c54 100644 --- a/engines/titanic/game/fan_increase.h +++ b/engines/titanic/game/fan_increase.h @@ -29,10 +29,7 @@ namespace Titanic { class CFanIncrease : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CFanIncrease"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/fan_noises.h b/engines/titanic/game/fan_noises.h index 5e817a3a5b..ba35edcf76 100644 --- a/engines/titanic/game/fan_noises.h +++ b/engines/titanic/game/fan_noises.h @@ -37,14 +37,10 @@ public: int _fieldD0; int _fieldD4; public: + CLASSDEF CFanNoises(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CFanNoises"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/floor_indicator.h b/engines/titanic/game/floor_indicator.h index 86a7125aa2..a3511fb622 100644 --- a/engines/titanic/game/floor_indicator.h +++ b/engines/titanic/game/floor_indicator.h @@ -29,10 +29,7 @@ namespace Titanic { class CFloorIndicator : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CFloorIndicator"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/games_console.h b/engines/titanic/game/games_console.h index 4caeda8715..67634d8d41 100644 --- a/engines/titanic/game/games_console.h +++ b/engines/titanic/game/games_console.h @@ -31,14 +31,10 @@ class CGamesConsole : public CBackground { public: int _fieldE0; public: + CLASSDEF CGamesConsole() : CBackground(), _fieldE0(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGamesConsole"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/get_lift_eye2.h b/engines/titanic/game/get_lift_eye2.h index e8149cacae..6782a56f11 100644 --- a/engines/titanic/game/get_lift_eye2.h +++ b/engines/titanic/game/get_lift_eye2.h @@ -31,15 +31,11 @@ class CGetLiftEye2 : public CGameObject { private: static CString *_v1; public: + CLASSDEF static void init(); static void deinit(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGetLiftEye2"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/glass_smasher.h b/engines/titanic/game/glass_smasher.h index c2b7ee6c5b..9c25065ecf 100644 --- a/engines/titanic/game/glass_smasher.h +++ b/engines/titanic/game/glass_smasher.h @@ -29,10 +29,7 @@ namespace Titanic { class CGlassSmasher : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGlassSmasher"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/gondolier/gondolier_base.h b/engines/titanic/game/gondolier/gondolier_base.h index 3f0cede70d..c45e3e2283 100644 --- a/engines/titanic/game/gondolier/gondolier_base.h +++ b/engines/titanic/game/gondolier/gondolier_base.h @@ -40,10 +40,7 @@ private: static int _v9; static int _v10; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGondolierBase"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/gondolier/gondolier_chest.h b/engines/titanic/game/gondolier/gondolier_chest.h index 277faf994f..d2c13812f4 100644 --- a/engines/titanic/game/gondolier/gondolier_chest.h +++ b/engines/titanic/game/gondolier/gondolier_chest.h @@ -29,10 +29,7 @@ namespace Titanic { class CGondolierChest : public CGondolierBase { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGondolierChest"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/gondolier/gondolier_face.h b/engines/titanic/game/gondolier/gondolier_face.h index 5007431337..334cab143f 100644 --- a/engines/titanic/game/gondolier/gondolier_face.h +++ b/engines/titanic/game/gondolier/gondolier_face.h @@ -31,14 +31,10 @@ class CGondolierFace : public CGondolierBase { private: int _fieldBC; public: + CLASSDEF CGondolierFace() : CGondolierBase(), _fieldBC(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGondolierMixer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/gondolier/gondolier_mixer.h b/engines/titanic/game/gondolier/gondolier_mixer.h index 5b92bc2fb8..173bcd8ac2 100644 --- a/engines/titanic/game/gondolier/gondolier_mixer.h +++ b/engines/titanic/game/gondolier/gondolier_mixer.h @@ -37,14 +37,10 @@ private: CString _string2; int _fieldE4; public: + CLASSDEF CGondolierMixer(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGondolierMixer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/gondolier/gondolier_slider.h b/engines/titanic/game/gondolier/gondolier_slider.h index 9522483dc0..eef4a58089 100644 --- a/engines/titanic/game/gondolier/gondolier_slider.h +++ b/engines/titanic/game/gondolier/gondolier_slider.h @@ -48,14 +48,10 @@ private: CString _string3; int _field118; public: + CLASSDEF CGondolierSlider(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGondolierSlider"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/hammer_clip.h b/engines/titanic/game/hammer_clip.h index 70abae5d7e..d1891d8c09 100644 --- a/engines/titanic/game/hammer_clip.h +++ b/engines/titanic/game/hammer_clip.h @@ -31,14 +31,10 @@ class CHammerClip : public CGameObject { public: int _value; public: + CLASSDEF CHammerClip() : CGameObject(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHammerClip"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/hammer_dispensor.h b/engines/titanic/game/hammer_dispensor.h index 60b70546fd..b99045dcb5 100644 --- a/engines/titanic/game/hammer_dispensor.h +++ b/engines/titanic/game/hammer_dispensor.h @@ -33,14 +33,10 @@ private: int _fieldE4; int _fieldE8; public: + CLASSDEF CHammerDispensor(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHammerDispensor"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/hammer_dispensor_button.h b/engines/titanic/game/hammer_dispensor_button.h index 978c1d3c9f..3f28360a8f 100644 --- a/engines/titanic/game/hammer_dispensor_button.h +++ b/engines/titanic/game/hammer_dispensor_button.h @@ -37,14 +37,10 @@ private: int _field10C; int _field110; public: + CLASSDEF CHammerDispensorButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHammerDispensorButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/head_slot.h b/engines/titanic/game/head_slot.h index 210546a2d4..3ba94a6669 100644 --- a/engines/titanic/game/head_slot.h +++ b/engines/titanic/game/head_slot.h @@ -41,14 +41,10 @@ public: int _fieldE8; int _fieldEC; public: + CLASSDEF CHeadSlot(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHeadSlot"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/head_smash_event.h b/engines/titanic/game/head_smash_event.h index 4032098817..847e86eeba 100644 --- a/engines/titanic/game/head_smash_event.h +++ b/engines/titanic/game/head_smash_event.h @@ -29,10 +29,7 @@ namespace Titanic { class CHeadSmashEvent : public CBackground { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHeadSmashEvent"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/head_smash_lever.h b/engines/titanic/game/head_smash_lever.h index 7268cb8a4a..8a67f56c67 100644 --- a/engines/titanic/game/head_smash_lever.h +++ b/engines/titanic/game/head_smash_lever.h @@ -33,14 +33,10 @@ public: int _fieldE4; int _fieldE8; public: + CLASSDEF CHeadSmashLever(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHeadSmashLever"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/head_spinner.h b/engines/titanic/game/head_spinner.h index 8d3de61f07..3ed3e1f01a 100644 --- a/engines/titanic/game/head_spinner.h +++ b/engines/titanic/game/head_spinner.h @@ -32,11 +32,7 @@ public: int _value1, _value2; public: CHeadSpinner() : CGameObject(), _value1(0), _value2(0) {} - - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHeadSpinner"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/idle_summoner.h b/engines/titanic/game/idle_summoner.h index 8f251b842b..a983684a15 100644 --- a/engines/titanic/game/idle_summoner.h +++ b/engines/titanic/game/idle_summoner.h @@ -40,11 +40,7 @@ public: int _fieldDC; public: CIdleSummoner(); - - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CIdleSummoner"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/leave_sec_class_state.h b/engines/titanic/game/leave_sec_class_state.h index 3bcfe812df..34ba31b6c0 100644 --- a/engines/titanic/game/leave_sec_class_state.h +++ b/engines/titanic/game/leave_sec_class_state.h @@ -29,10 +29,7 @@ namespace Titanic { class CLeaveSecClassState : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CLeaveSecClassState"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/lemon_dispensor.h b/engines/titanic/game/lemon_dispensor.h index c2c76eac6a..091c6d7b27 100644 --- a/engines/titanic/game/lemon_dispensor.h +++ b/engines/titanic/game/lemon_dispensor.h @@ -38,14 +38,10 @@ private: int _fieldE8; int _fieldEC; public: + CLASSDEF CLemonDispensor(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CLemonDispensor"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/light.h b/engines/titanic/game/light.h index 482d1be65b..ea6073d038 100644 --- a/engines/titanic/game/light.h +++ b/engines/titanic/game/light.h @@ -38,14 +38,10 @@ private: int _fieldF8; int _fieldFC; public: + CLASSDEF CLight(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CLight"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/light_switch.h b/engines/titanic/game/light_switch.h index 0228b1009b..334cba75a6 100644 --- a/engines/titanic/game/light_switch.h +++ b/engines/titanic/game/light_switch.h @@ -35,14 +35,10 @@ private: int _fieldE4; int _fieldE8; public: + CLASSDEF CLightSwitch(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CLightSwitch"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/little_lift_button.h b/engines/titanic/game/little_lift_button.h index 475b8435d5..92f084aba1 100644 --- a/engines/titanic/game/little_lift_button.h +++ b/engines/titanic/game/little_lift_button.h @@ -31,14 +31,10 @@ class CLittleLiftButton : public CBackground { private: int _value; public: + CLASSDEF CLittleLiftButton() : CBackground(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CLittleLiftButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/long_stick_dispenser.h b/engines/titanic/game/long_stick_dispenser.h index 4912ea384b..30e3541087 100644 --- a/engines/titanic/game/long_stick_dispenser.h +++ b/engines/titanic/game/long_stick_dispenser.h @@ -33,15 +33,11 @@ public: int _fieldC0; int _fieldC4; public: + CLASSDEF CLongStickDispenser() : CGameObject(), _fieldBC(0), _fieldC0(0), _fieldC4(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CLongStickDispenser"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/mail_man.h b/engines/titanic/game/mail_man.h index 29ca165935..a75d75a865 100644 --- a/engines/titanic/game/mail_man.h +++ b/engines/titanic/game/mail_man.h @@ -31,14 +31,10 @@ class CMailMan : public CGameObject { public: int _value; public: + CLASSDEF CMailMan() : CGameObject(), _value(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMailMan"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/maitred/maitred_arm_holder.h b/engines/titanic/game/maitred/maitred_arm_holder.h index b838109fa3..e329157837 100644 --- a/engines/titanic/game/maitred/maitred_arm_holder.h +++ b/engines/titanic/game/maitred/maitred_arm_holder.h @@ -29,10 +29,7 @@ namespace Titanic { class CMaitreDArmHolder : public CDropTarget { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMaitreDArmHolder"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/maitred/maitred_body.h b/engines/titanic/game/maitred/maitred_body.h index 29e528b1f6..9dcc2af4ea 100644 --- a/engines/titanic/game/maitred/maitred_body.h +++ b/engines/titanic/game/maitred/maitred_body.h @@ -31,14 +31,10 @@ class CMaitreDBody : public CMaitreDProdReceptor { private: int _fieldC8; public: + CLASSDEF CMaitreDBody() : CMaitreDProdReceptor(), _fieldC8(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMaitreDBody"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/maitred/maitred_legs.h b/engines/titanic/game/maitred/maitred_legs.h index e3ac93c870..0dc1b34143 100644 --- a/engines/titanic/game/maitred/maitred_legs.h +++ b/engines/titanic/game/maitred/maitred_legs.h @@ -31,14 +31,10 @@ class CMaitreDLegs : public CMaitreDProdReceptor { private: int _fieldC8; public: + CLASSDEF CMaitreDLegs() : CMaitreDProdReceptor(), _fieldC8(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMaitreDLegs"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/maitred/maitred_prod_receptor.h b/engines/titanic/game/maitred/maitred_prod_receptor.h index 130bc547b2..b82c95b9b5 100644 --- a/engines/titanic/game/maitred/maitred_prod_receptor.h +++ b/engines/titanic/game/maitred/maitred_prod_receptor.h @@ -33,15 +33,11 @@ protected: int _fieldC0; int _fieldC4; public: + CLASSDEF CMaitreDProdReceptor() : CGameObject(), _fieldBC(0), _fieldC0(0), _fieldC4(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMaitreDProdReceptor"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/missiveomat.h b/engines/titanic/game/missiveomat.h index 77ba4cb574..a58c928497 100644 --- a/engines/titanic/game/missiveomat.h +++ b/engines/titanic/game/missiveomat.h @@ -36,14 +36,10 @@ public: CString _string2; int _fieldE0; public: + CLASSDEF CMissiveOMat(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMissiveOMat"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/missiveomat_button.h b/engines/titanic/game/missiveomat_button.h index f383e88798..603d2f5955 100644 --- a/engines/titanic/game/missiveomat_button.h +++ b/engines/titanic/game/missiveomat_button.h @@ -31,14 +31,10 @@ class CMissiveOMatButton : public CEditControl { public: int _fieldFC; public: + CLASSDEF CMissiveOMatButton() : CEditControl(), _fieldFC(2) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMissiveOMatButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/movie_tester.h b/engines/titanic/game/movie_tester.h index b5e4032be9..2fffd5d2c0 100644 --- a/engines/titanic/game/movie_tester.h +++ b/engines/titanic/game/movie_tester.h @@ -31,14 +31,10 @@ class CMovieTester : public CGameObject { public: int _value1, _value2; public: + CLASSDEF CMovieTester() : CGameObject(), _value1(0), _value2(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMovieTester"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/music_console_button.h b/engines/titanic/game/music_console_button.h index 84a7452b28..f6c33a91c5 100644 --- a/engines/titanic/game/music_console_button.h +++ b/engines/titanic/game/music_console_button.h @@ -29,10 +29,7 @@ namespace Titanic { class CMusicConsoleButton : public CMusicPlayer { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicConsoleButton"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/music_room_phonograph.h b/engines/titanic/game/music_room_phonograph.h index 2d34b160c9..6660503616 100644 --- a/engines/titanic/game/music_room_phonograph.h +++ b/engines/titanic/game/music_room_phonograph.h @@ -31,14 +31,10 @@ class CMusicRoomPhonograph : public CRestaurantPhonograph { private: int _field118; public: + CLASSDEF CMusicRoomPhonograph() : CRestaurantPhonograph(), _field118(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicRoomPhonograph"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/music_room_stop_phonograph_button.h b/engines/titanic/game/music_room_stop_phonograph_button.h index 4fd4aa6535..c37065fde4 100644 --- a/engines/titanic/game/music_room_stop_phonograph_button.h +++ b/engines/titanic/game/music_room_stop_phonograph_button.h @@ -31,14 +31,10 @@ class CMusicRoomStopPhonographButton : public CEjectPhonographButton { private: int _field100; public: + CLASSDEF CMusicRoomStopPhonographButton() : CEjectPhonographButton(), _field100(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicRoomStopPhonographButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/music_system_lock.h b/engines/titanic/game/music_system_lock.h index 98dc68b0dd..b5f4da55d6 100644 --- a/engines/titanic/game/music_system_lock.h +++ b/engines/titanic/game/music_system_lock.h @@ -31,14 +31,10 @@ class CMusicSystemLock : public CDropTarget { private: int _value; public: + CLASSDEF CMusicSystemLock() : CDropTarget(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicSystemLock"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/musical_instrument.h b/engines/titanic/game/musical_instrument.h index 8eafca5e3b..b4abe4fdb2 100644 --- a/engines/titanic/game/musical_instrument.h +++ b/engines/titanic/game/musical_instrument.h @@ -29,10 +29,7 @@ namespace Titanic { class CMusicalInstrument : public CBackground { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicalInstrument"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/nav_helmet.h b/engines/titanic/game/nav_helmet.h index 31eee9977a..ff39280e5b 100644 --- a/engines/titanic/game/nav_helmet.h +++ b/engines/titanic/game/nav_helmet.h @@ -31,14 +31,10 @@ class CNavHelmet : public CGameObject { private: int _value; public: + CLASSDEF CNavHelmet() : CGameObject(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNavHelmet"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/navigation_computer.h b/engines/titanic/game/navigation_computer.h index 49e382a14c..a7077f7dcd 100644 --- a/engines/titanic/game/navigation_computer.h +++ b/engines/titanic/game/navigation_computer.h @@ -29,10 +29,7 @@ namespace Titanic { class CNavigationComputer : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNavigationComputer"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/no_nut_bowl.h b/engines/titanic/game/no_nut_bowl.h index 40e8fd15f1..7557491b68 100644 --- a/engines/titanic/game/no_nut_bowl.h +++ b/engines/titanic/game/no_nut_bowl.h @@ -29,10 +29,7 @@ namespace Titanic { class CNoNutBowl : public CBackground { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNoNutBowl"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/nose_holder.h b/engines/titanic/game/nose_holder.h index 3512e62bb4..e26c70fa1d 100644 --- a/engines/titanic/game/nose_holder.h +++ b/engines/titanic/game/nose_holder.h @@ -32,14 +32,10 @@ private: int _field118; int _field11C; public: + CLASSDEF CNoseHolder(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNoseHolder"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/null_port_hole.h b/engines/titanic/game/null_port_hole.h index 2caff276d5..fb07462ea8 100644 --- a/engines/titanic/game/null_port_hole.h +++ b/engines/titanic/game/null_port_hole.h @@ -29,14 +29,10 @@ namespace Titanic { class CNullPortHole : public CClickResponder { public: + CLASSDEF CNullPortHole(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNullPortHole"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/nut_replacer.h b/engines/titanic/game/nut_replacer.h index ef800c71a6..0917b40bd2 100644 --- a/engines/titanic/game/nut_replacer.h +++ b/engines/titanic/game/nut_replacer.h @@ -29,10 +29,7 @@ namespace Titanic { class CNutReplacer : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNutReplacer"; } + CLASSDEF /** * Save the data for the class to file 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 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 diff --git a/engines/titanic/game/pet_disabler.h b/engines/titanic/game/pet_disabler.h index 3e8c799bad..5db5d7b533 100644 --- a/engines/titanic/game/pet_disabler.h +++ b/engines/titanic/game/pet_disabler.h @@ -31,14 +31,10 @@ class CPetDisabler : public CGameObject { public: CString _value; public: + CLASSDEF CPetDisabler() : CGameObject() {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPetDisabler"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/phonograph.h b/engines/titanic/game/phonograph.h index e7fcddf0ae..14712e5c1b 100644 --- a/engines/titanic/game/phonograph.h +++ b/engines/titanic/game/phonograph.h @@ -37,14 +37,10 @@ protected: int _fieldF0; int _fieldF4; public: + CLASSDEF CPhonograph(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPhonograph"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/phonograph_lid.h b/engines/titanic/game/phonograph_lid.h index 2252551ad7..38c8924885 100644 --- a/engines/titanic/game/phonograph_lid.h +++ b/engines/titanic/game/phonograph_lid.h @@ -31,14 +31,10 @@ class CPhonographLid : public CGameObject { private: int _value; public: + CLASSDEF CPhonographLid() : CGameObject(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPhonographLid"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/pickup/pick_up.h b/engines/titanic/game/pickup/pick_up.h index e1783ef322..d5a858017d 100644 --- a/engines/titanic/game/pickup/pick_up.h +++ b/engines/titanic/game/pickup/pick_up.h @@ -31,14 +31,10 @@ class CPickUp : public CGameObject { private: int _fieldBC; public: + CLASSDEF CPickUp() : CGameObject(), _fieldBC(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CAnnoyBarbot"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/pickup/pick_up_bar_glass.h b/engines/titanic/game/pickup/pick_up_bar_glass.h index 9bec56cdd5..f1c75555ad 100644 --- a/engines/titanic/game/pickup/pick_up_bar_glass.h +++ b/engines/titanic/game/pickup/pick_up_bar_glass.h @@ -29,10 +29,7 @@ namespace Titanic { class CPickUpBarGlass : public CPickUp { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPickUpBarGlass"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/pickup/pick_up_hose.h b/engines/titanic/game/pickup/pick_up_hose.h index 13d5810177..9014934ba1 100644 --- a/engines/titanic/game/pickup/pick_up_hose.h +++ b/engines/titanic/game/pickup/pick_up_hose.h @@ -33,10 +33,7 @@ private: CString _string1; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPickUpHose"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/pickup/pick_up_lemon.h b/engines/titanic/game/pickup/pick_up_lemon.h index fee2485c1e..dc2942f366 100644 --- a/engines/titanic/game/pickup/pick_up_lemon.h +++ b/engines/titanic/game/pickup/pick_up_lemon.h @@ -29,10 +29,7 @@ namespace Titanic { class CPickUpLemon : public CPickUp { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPickUpLemon"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/pickup/pick_up_speech_centre.h b/engines/titanic/game/pickup/pick_up_speech_centre.h index b68761b83c..5d7d133ccc 100644 --- a/engines/titanic/game/pickup/pick_up_speech_centre.h +++ b/engines/titanic/game/pickup/pick_up_speech_centre.h @@ -29,10 +29,7 @@ namespace Titanic { class CPickUpSpeechCentre : public CPickUp { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPickUpSpeechCentre"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/pickup/pick_up_vis_centre.h b/engines/titanic/game/pickup/pick_up_vis_centre.h index 16db8f2b73..4345fceda9 100644 --- a/engines/titanic/game/pickup/pick_up_vis_centre.h +++ b/engines/titanic/game/pickup/pick_up_vis_centre.h @@ -29,10 +29,7 @@ namespace Titanic { class CPickUpVisCentre : public CPickUp { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPickUpVisCentre"; } + CLASSDEF /** * Save the data for the class to file 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 diff --git a/engines/titanic/game/play_music_button.h b/engines/titanic/game/play_music_button.h index 29a13a688a..9e0bb464b3 100644 --- a/engines/titanic/game/play_music_button.h +++ b/engines/titanic/game/play_music_button.h @@ -32,14 +32,10 @@ public: int _fieldE0; int _fieldE4; public: + CLASSDEF CPlayMusicButton() : CBackground(), _fieldE0(0), _fieldE4(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPlayMusicButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/play_on_act.h b/engines/titanic/game/play_on_act.h index b8fdb2ac15..22bb54de6a 100644 --- a/engines/titanic/game/play_on_act.h +++ b/engines/titanic/game/play_on_act.h @@ -29,10 +29,7 @@ namespace Titanic { class CPlayOnAct : public CBackground { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPlayOnAct"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/port_hole.h b/engines/titanic/game/port_hole.h index 60aab51bb6..2672614d68 100644 --- a/engines/titanic/game/port_hole.h +++ b/engines/titanic/game/port_hole.h @@ -32,14 +32,10 @@ private: int _fieldBC; CString _string1, _string2; public: + CLASSDEF CPortHole(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPortHole"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/record_phonograph_button.h b/engines/titanic/game/record_phonograph_button.h index 4b2c6c885e..3ae7fb1dea 100644 --- a/engines/titanic/game/record_phonograph_button.h +++ b/engines/titanic/game/record_phonograph_button.h @@ -31,14 +31,10 @@ class CRecordPhonographButton : public CBackground { public: int _value; public: + CLASSDEF CRecordPhonographButton() : CBackground(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CRecordPhonographButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/replacement_ear.h b/engines/titanic/game/replacement_ear.h index 9c4a8e1398..0cff55d684 100644 --- a/engines/titanic/game/replacement_ear.h +++ b/engines/titanic/game/replacement_ear.h @@ -29,10 +29,7 @@ namespace Titanic { class CReplacementEar : public CBackground { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNoNutBowl"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/reserved_table.h b/engines/titanic/game/reserved_table.h index abf3a657be..49cd5e8e39 100644 --- a/engines/titanic/game/reserved_table.h +++ b/engines/titanic/game/reserved_table.h @@ -31,14 +31,10 @@ class CReservedTable : public CGameObject { public: int _value1, _value2; public: + CLASSDEF CReservedTable() : CGameObject(), _value1(0), _value2(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CReservedTable"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/restaurant_cylinder_holder.h b/engines/titanic/game/restaurant_cylinder_holder.h index 29e2958f98..9f3911d850 100644 --- a/engines/titanic/game/restaurant_cylinder_holder.h +++ b/engines/titanic/game/restaurant_cylinder_holder.h @@ -37,14 +37,10 @@ private: CString _string6; int _field140; public: + CLASSDEF CRestaurantCylinderHolder(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CRestaurantCylinderHolder"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/restaurant_phonograph.h b/engines/titanic/game/restaurant_phonograph.h index 777ec34358..40116f5d07 100644 --- a/engines/titanic/game/restaurant_phonograph.h +++ b/engines/titanic/game/restaurant_phonograph.h @@ -34,14 +34,10 @@ private: CString _string3; int _field114; public: + CLASSDEF CRestaurantPhonograph(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CRestaurantPhonograph"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/room_item.h b/engines/titanic/game/room_item.h index c213d38caa..7441ed01bc 100644 --- a/engines/titanic/game/room_item.h +++ b/engines/titanic/game/room_item.h @@ -42,14 +42,10 @@ private: void loading(); public: + CLASSDEF CRoomItem(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CRoomItem"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/sauce_dispensor.h b/engines/titanic/game/sauce_dispensor.h index fd9afd979c..6969adb326 100644 --- a/engines/titanic/game/sauce_dispensor.h +++ b/engines/titanic/game/sauce_dispensor.h @@ -37,14 +37,10 @@ public: int _field104; int _field108; public: + CLASSDEF CSauceDispensor(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSauceDispensor"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/search_point.h b/engines/titanic/game/search_point.h index 3908d87ee6..7bd05d8d1e 100644 --- a/engines/titanic/game/search_point.h +++ b/engines/titanic/game/search_point.h @@ -31,14 +31,10 @@ class CSearchPoint : public CGameObject { public: int _value; public: + CLASSDEF CSearchPoint() : CGameObject(), _value(2) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSearchPoint"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/season_background.h b/engines/titanic/game/season_background.h index 28998538da..709f1002c3 100644 --- a/engines/titanic/game/season_background.h +++ b/engines/titanic/game/season_background.h @@ -34,14 +34,10 @@ public: int _fieldE8; int _fieldEC; public: + CLASSDEF CSeasonBackground(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSeasonBackground"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/season_barrel.h b/engines/titanic/game/season_barrel.h index af22c14f73..d3f7b1a91e 100644 --- a/engines/titanic/game/season_barrel.h +++ b/engines/titanic/game/season_barrel.h @@ -32,14 +32,10 @@ public: int _fieldE0; int _fieldE4; public: + CLASSDEF CSeasonBarrel() : CBackground(), _fieldE0(0), _fieldE4(7) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSeasonBarrel"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/seasonal_adjustment.h b/engines/titanic/game/seasonal_adjustment.h index 2db94033db..4bfec1a47a 100644 --- a/engines/titanic/game/seasonal_adjustment.h +++ b/engines/titanic/game/seasonal_adjustment.h @@ -32,14 +32,10 @@ public: int _fieldE0; int _fieldE4; public: + CLASSDEF CSeasonalAdjustment() : CBackground(), _fieldE0(0), _fieldE4(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSeasonalAdjustment"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/service_elevator_window.h b/engines/titanic/game/service_elevator_window.h index 493776c7af..70c38753b2 100644 --- a/engines/titanic/game/service_elevator_window.h +++ b/engines/titanic/game/service_elevator_window.h @@ -34,14 +34,10 @@ public: int _fieldE8; int _fieldEC; public: + CLASSDEF CServiceElevatorWindow(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CServiceElevatorWindow"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; 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 diff --git a/engines/titanic/game/ship_setting.h b/engines/titanic/game/ship_setting.h index 8e57e53125..a3b5d5f511 100644 --- a/engines/titanic/game/ship_setting.h +++ b/engines/titanic/game/ship_setting.h @@ -34,14 +34,10 @@ public: CString _string4; CString _string5; public: + CLASSDEF CShipSetting(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CShipSetting"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/ship_setting_button.h b/engines/titanic/game/ship_setting_button.h index fb8d533a7f..e6a6822854 100644 --- a/engines/titanic/game/ship_setting_button.h +++ b/engines/titanic/game/ship_setting_button.h @@ -33,14 +33,10 @@ private: int _fieldC8; int _fieldCC; public: + CLASSDEF CShipSettingButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CShipSettingButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/show_cell_points.h b/engines/titanic/game/show_cell_points.h index c807cd5ed6..a3d7ba2e5a 100644 --- a/engines/titanic/game/show_cell_points.h +++ b/engines/titanic/game/show_cell_points.h @@ -32,14 +32,10 @@ public: CString _strValue; int _numValue; public: + CLASSDEF CShowCellpoints() : CGameObject(), _numValue(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CShowCellpoints"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/speech_dispensor.h b/engines/titanic/game/speech_dispensor.h index 19f31fcf68..440746e5c2 100644 --- a/engines/titanic/game/speech_dispensor.h +++ b/engines/titanic/game/speech_dispensor.h @@ -38,10 +38,7 @@ private: int _fieldF8; int _fieldFC; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSpeechDispensor"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/splash_animation.h b/engines/titanic/game/splash_animation.h index 8ac59d9d1c..2f4056231b 100644 --- a/engines/titanic/game/splash_animation.h +++ b/engines/titanic/game/splash_animation.h @@ -29,10 +29,7 @@ namespace Titanic { class CSplashAnimation : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSplashAnimation"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/starling_puret.h b/engines/titanic/game/starling_puret.h index 5bfdd660f9..7299c68449 100644 --- a/engines/titanic/game/starling_puret.h +++ b/engines/titanic/game/starling_puret.h @@ -31,14 +31,10 @@ class CStarlingPuret : public CGameObject { private: int _value; public: + CLASSDEF CStarlingPuret() : CGameObject(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CStarlingPuret"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/start_action.h b/engines/titanic/game/start_action.h index 3725dbc4a0..fc7a2ea514 100644 --- a/engines/titanic/game/start_action.h +++ b/engines/titanic/game/start_action.h @@ -32,14 +32,10 @@ protected: CString _string3; CString _string4; public: + CLASSDEF CStartAction(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CStartAction"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/stop_phonograph_button.h b/engines/titanic/game/stop_phonograph_button.h index 945345cd61..b1accfe1e1 100644 --- a/engines/titanic/game/stop_phonograph_button.h +++ b/engines/titanic/game/stop_phonograph_button.h @@ -29,10 +29,7 @@ namespace Titanic { class CStopPhonographButton : public CBackground { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CStopPhonographButton"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/sub_glass.h b/engines/titanic/game/sub_glass.h index 00ff26fbeb..b7ba51379e 100644 --- a/engines/titanic/game/sub_glass.h +++ b/engines/titanic/game/sub_glass.h @@ -36,14 +36,10 @@ private: int _fieldCC; CString _string; public: + CLASSDEF CSUBGlass(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSUBGlass"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/sub_wrapper.h b/engines/titanic/game/sub_wrapper.h index b67d4e506f..6b724f8000 100644 --- a/engines/titanic/game/sub_wrapper.h +++ b/engines/titanic/game/sub_wrapper.h @@ -31,14 +31,10 @@ class CSUBWrapper : public CGameObject { public: int _value; public: + CLASSDEF CSUBWrapper() : CGameObject(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSUBWrapper"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/sweet_bowl.h b/engines/titanic/game/sweet_bowl.h index 8fb20e4041..fa607bb67b 100644 --- a/engines/titanic/game/sweet_bowl.h +++ b/engines/titanic/game/sweet_bowl.h @@ -29,10 +29,7 @@ namespace Titanic { class CSweetBowl : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSweetBowl"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/television.h b/engines/titanic/game/television.h index 4f39d60b9f..d64c253d90 100644 --- a/engines/titanic/game/television.h +++ b/engines/titanic/game/television.h @@ -42,14 +42,10 @@ private: int _fieldEC; int _fieldF0; public: + CLASSDEF CTelevision(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTelevision"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/third_class_canal.h b/engines/titanic/game/third_class_canal.h index 4465cba07b..7a2c3d4f77 100644 --- a/engines/titanic/game/third_class_canal.h +++ b/engines/titanic/game/third_class_canal.h @@ -29,10 +29,7 @@ namespace Titanic { class CThirdClassCanal : public CBackground { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CThirdClassCanal"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/throw_tv_down_well.h b/engines/titanic/game/throw_tv_down_well.h index 0f8f731be3..dee145014b 100644 --- a/engines/titanic/game/throw_tv_down_well.h +++ b/engines/titanic/game/throw_tv_down_well.h @@ -32,14 +32,10 @@ public: CString _strValue; int _numValue; public: + CLASSDEF CThrowTVDownWell() : CGameObject(), _numValue(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CThrowTVDownWell"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/titania_still_control.h b/engines/titanic/game/titania_still_control.h index 141f0c5cf9..a0f739db01 100644 --- a/engines/titanic/game/titania_still_control.h +++ b/engines/titanic/game/titania_still_control.h @@ -29,10 +29,7 @@ namespace Titanic { class CTitaniaStillControl : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTitaniaStillControl"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/tow_parrot_nav.h b/engines/titanic/game/tow_parrot_nav.h index 6233728198..420c29bfab 100644 --- a/engines/titanic/game/tow_parrot_nav.h +++ b/engines/titanic/game/tow_parrot_nav.h @@ -29,10 +29,7 @@ namespace Titanic { class CTOWParrotNav : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTOWParrotNav"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/transport/exit_pellerator.h b/engines/titanic/game/transport/exit_pellerator.h index d327ea6ba6..e72cbb4b9d 100644 --- a/engines/titanic/game/transport/exit_pellerator.h +++ b/engines/titanic/game/transport/exit_pellerator.h @@ -32,10 +32,7 @@ private: static int _v1; static int _v2; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPellerator"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/transport/gondolier.h b/engines/titanic/game/transport/gondolier.h index 1d874beb3a..bdfb3e7156 100644 --- a/engines/titanic/game/transport/gondolier.h +++ b/engines/titanic/game/transport/gondolier.h @@ -29,10 +29,7 @@ namespace Titanic { class CGondolier : public CTransport { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGondolier"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/transport/lift.h b/engines/titanic/game/transport/lift.h index acb5fde45b..b1cd48960e 100644 --- a/engines/titanic/game/transport/lift.h +++ b/engines/titanic/game/transport/lift.h @@ -38,14 +38,10 @@ private: int _fieldF8; public: + CLASSDEF CLift() : CTransport(), _fieldF8(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CLift"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/transport/lift_indicator.h b/engines/titanic/game/transport/lift_indicator.h index bbd6cb2867..2fe6e1a61e 100644 --- a/engines/titanic/game/transport/lift_indicator.h +++ b/engines/titanic/game/transport/lift_indicator.h @@ -34,14 +34,10 @@ private: int _field108; int _field10C; public: + CLASSDEF CLiftindicator(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CLiftindicator"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/transport/pellerator.h b/engines/titanic/game/transport/pellerator.h index d327ea6ba6..e72cbb4b9d 100644 --- a/engines/titanic/game/transport/pellerator.h +++ b/engines/titanic/game/transport/pellerator.h @@ -32,10 +32,7 @@ private: static int _v1; static int _v2; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPellerator"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/transport/service_elevator.h b/engines/titanic/game/transport/service_elevator.h index f97e3bcd5e..9edc1f9100 100644 --- a/engines/titanic/game/transport/service_elevator.h +++ b/engines/titanic/game/transport/service_elevator.h @@ -38,14 +38,10 @@ private: int _field100; int _field104; public: + CLASSDEF CServiceElevator(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CServiceElevator"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/transport/transport.h b/engines/titanic/game/transport/transport.h index 6e3f1a2d1d..faa00b4dd9 100644 --- a/engines/titanic/game/transport/transport.h +++ b/engines/titanic/game/transport/transport.h @@ -32,14 +32,10 @@ public: CString _string1; CString _string2; public: + CLASSDEF CTransport(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTransport"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/up_lighter.h b/engines/titanic/game/up_lighter.h index e7c6cdf38e..e24e712c1c 100644 --- a/engines/titanic/game/up_lighter.h +++ b/engines/titanic/game/up_lighter.h @@ -34,14 +34,10 @@ private: int _field120; int _field124; public: + CLASSDEF CUpLighter(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CUpLighter"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/useless_lever.h b/engines/titanic/game/useless_lever.h index 444df0c69f..f582bdee63 100644 --- a/engines/titanic/game/useless_lever.h +++ b/engines/titanic/game/useless_lever.h @@ -29,10 +29,7 @@ namespace Titanic { class CUselessLever : public CToggleButton { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CUselessLever"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/wheel_button.h b/engines/titanic/game/wheel_button.h index b1721ebbdd..75e1268585 100644 --- a/engines/titanic/game/wheel_button.h +++ b/engines/titanic/game/wheel_button.h @@ -33,14 +33,10 @@ public: int _fieldE4; int _fieldE8; public: + CLASSDEF CWheelButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CWheelButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/wheel_hotspot.h b/engines/titanic/game/wheel_hotspot.h index 6887407a1e..7164b88b71 100644 --- a/engines/titanic/game/wheel_hotspot.h +++ b/engines/titanic/game/wheel_hotspot.h @@ -32,14 +32,10 @@ public: int _fieldE0; int _fieldE4; public: + CLASSDEF CWheelHotSpot() : CBackground(), _fieldE0(0), _fieldE4(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CWheelHotSpot"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/wheel_spin.h b/engines/titanic/game/wheel_spin.h index 64006afa0f..2e21da4984 100644 --- a/engines/titanic/game/wheel_spin.h +++ b/engines/titanic/game/wheel_spin.h @@ -31,14 +31,10 @@ class CWheelSpin : public CBackground { public: int _value; public: + CLASSDEF CWheelSpin() : CBackground(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CWheelSpin"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/wheel_spin_horn.h b/engines/titanic/game/wheel_spin_horn.h index b96b20b6c4..e4c0bd738c 100644 --- a/engines/titanic/game/wheel_spin_horn.h +++ b/engines/titanic/game/wheel_spin_horn.h @@ -32,10 +32,7 @@ public: CString _string1; CString _string2; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CWheelSpinHorn"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/act_button.h b/engines/titanic/gfx/act_button.h index 0ae2d4d92e..b8f8f21173 100644 --- a/engines/titanic/gfx/act_button.h +++ b/engines/titanic/gfx/act_button.h @@ -29,14 +29,10 @@ namespace Titanic { class CActButton : public CSTButton { public: + CLASSDEF CActButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CActButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/changes_season_button.h b/engines/titanic/gfx/changes_season_button.h index 8a756341fd..f39cfdc647 100644 --- a/engines/titanic/gfx/changes_season_button.h +++ b/engines/titanic/gfx/changes_season_button.h @@ -29,14 +29,10 @@ namespace Titanic { class CChangesSeasonButton : public CSTButton { public: + CLASSDEF CChangesSeasonButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CChangesSeasonButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/chev_left_off.h b/engines/titanic/gfx/chev_left_off.h index c3ea05dabc..753aba3be0 100644 --- a/engines/titanic/gfx/chev_left_off.h +++ b/engines/titanic/gfx/chev_left_off.h @@ -29,14 +29,10 @@ namespace Titanic { class CChevLeftOff : public CToggleSwitch { public: + CLASSDEF CChevLeftOff(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CChevLeftOff"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/chev_left_on.h b/engines/titanic/gfx/chev_left_on.h index c2f23c30c7..99126d792c 100644 --- a/engines/titanic/gfx/chev_left_on.h +++ b/engines/titanic/gfx/chev_left_on.h @@ -29,14 +29,10 @@ namespace Titanic { class CChevLeftOn : public CToggleSwitch { public: + CLASSDEF CChevLeftOn(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CChevLeftOn"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/chev_right_off.h b/engines/titanic/gfx/chev_right_off.h index da28759abf..1a31007f19 100644 --- a/engines/titanic/gfx/chev_right_off.h +++ b/engines/titanic/gfx/chev_right_off.h @@ -29,14 +29,10 @@ namespace Titanic { class CChevRightOff : public CToggleSwitch { public: + CLASSDEF CChevRightOff(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CChevRightOff"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/chev_right_on.h b/engines/titanic/gfx/chev_right_on.h index eb307c16f7..084b02ea08 100644 --- a/engines/titanic/gfx/chev_right_on.h +++ b/engines/titanic/gfx/chev_right_on.h @@ -29,14 +29,10 @@ namespace Titanic { class CChevRightOn : public CToggleSwitch { public: + CLASSDEF CChevRightOn(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CChevRightOn"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/chev_send_rec_switch.h b/engines/titanic/gfx/chev_send_rec_switch.h index 8cd06e6ab0..29d6e7ab82 100644 --- a/engines/titanic/gfx/chev_send_rec_switch.h +++ b/engines/titanic/gfx/chev_send_rec_switch.h @@ -29,14 +29,10 @@ namespace Titanic { class CChevSendRecSwitch : public CToggleSwitch { public: + CLASSDEF CChevSendRecSwitch(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSendRecSwitch"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/chev_switch.h b/engines/titanic/gfx/chev_switch.h index e7b43c3805..6c0314be4c 100644 --- a/engines/titanic/gfx/chev_switch.h +++ b/engines/titanic/gfx/chev_switch.h @@ -29,14 +29,10 @@ namespace Titanic { class CChevSwitch : public CToggleSwitch { public: + CLASSDEF CChevSwitch(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CChevSwitch"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/edit_control.h b/engines/titanic/gfx/edit_control.h index 79b20f7108..d782b72669 100644 --- a/engines/titanic/gfx/edit_control.h +++ b/engines/titanic/gfx/edit_control.h @@ -43,14 +43,10 @@ protected: int _fieldF0; int _fieldF4; public: + CLASSDEF CEditControl(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEditControl"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/elevator_button.h b/engines/titanic/gfx/elevator_button.h index 1090ea800a..dddb7077b3 100644 --- a/engines/titanic/gfx/elevator_button.h +++ b/engines/titanic/gfx/elevator_button.h @@ -29,14 +29,10 @@ namespace Titanic { class CElevatorButton : public CSTButton { public: + CLASSDEF CElevatorButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CElevatorButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/get_from_succ.h b/engines/titanic/gfx/get_from_succ.h index 810eb3117c..f0b028afa0 100644 --- a/engines/titanic/gfx/get_from_succ.h +++ b/engines/titanic/gfx/get_from_succ.h @@ -29,14 +29,10 @@ namespace Titanic { class CGetFromSucc : public CToggleSwitch { public: + CLASSDEF CGetFromSucc(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGetFromSucc"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/helmet_on_off.h b/engines/titanic/gfx/helmet_on_off.h index 839c2a533f..41621f340e 100644 --- a/engines/titanic/gfx/helmet_on_off.h +++ b/engines/titanic/gfx/helmet_on_off.h @@ -29,14 +29,10 @@ namespace Titanic { class CHelmetOnOff : public CToggleSwitch { public: + CLASSDEF CHelmetOnOff(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHelmetOnOff"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/home_photo.h b/engines/titanic/gfx/home_photo.h index f8ad297534..6e6f4976a2 100644 --- a/engines/titanic/gfx/home_photo.h +++ b/engines/titanic/gfx/home_photo.h @@ -29,14 +29,10 @@ namespace Titanic { class CHomePhoto : public CToggleSwitch { public: + CLASSDEF CHomePhoto(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHomePhoto"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/icon_nav_action.h b/engines/titanic/gfx/icon_nav_action.h index 812930bfdb..cb8fae932a 100644 --- a/engines/titanic/gfx/icon_nav_action.h +++ b/engines/titanic/gfx/icon_nav_action.h @@ -29,14 +29,10 @@ namespace Titanic { class CIconNavAction : public CToggleSwitch { public: + CLASSDEF CIconNavAction(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CIconNavAction"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/icon_nav_butt.h b/engines/titanic/gfx/icon_nav_butt.h index 018904eb73..36d3eb0890 100644 --- a/engines/titanic/gfx/icon_nav_butt.h +++ b/engines/titanic/gfx/icon_nav_butt.h @@ -29,10 +29,7 @@ namespace Titanic { class CIconNavButt : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CIconNavButt"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/icon_nav_down.h b/engines/titanic/gfx/icon_nav_down.h index c6acfa04a3..b7759e059d 100644 --- a/engines/titanic/gfx/icon_nav_down.h +++ b/engines/titanic/gfx/icon_nav_down.h @@ -29,14 +29,10 @@ namespace Titanic { class CIconNavDown : public CToggleSwitch { public: + CLASSDEF CIconNavDown(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CIconNavDown"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/icon_nav_image.h b/engines/titanic/gfx/icon_nav_image.h index 403936d06e..61febfd2a4 100644 --- a/engines/titanic/gfx/icon_nav_image.h +++ b/engines/titanic/gfx/icon_nav_image.h @@ -29,10 +29,7 @@ namespace Titanic { class CIconNavImage : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CIconNavImage"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/icon_nav_left.h b/engines/titanic/gfx/icon_nav_left.h index 006056babd..e507d2c2dd 100644 --- a/engines/titanic/gfx/icon_nav_left.h +++ b/engines/titanic/gfx/icon_nav_left.h @@ -29,14 +29,10 @@ namespace Titanic { class CIconNavLeft : public CToggleSwitch { public: + CLASSDEF CIconNavLeft(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CIconNavLeft"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/icon_nav_receive.h b/engines/titanic/gfx/icon_nav_receive.h index b158fdaf87..cce1df2279 100644 --- a/engines/titanic/gfx/icon_nav_receive.h +++ b/engines/titanic/gfx/icon_nav_receive.h @@ -29,10 +29,7 @@ namespace Titanic { class CIconNavReceive : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CIconNavReceive"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/icon_nav_right.h b/engines/titanic/gfx/icon_nav_right.h index 9f319d1065..db3bab4bb8 100644 --- a/engines/titanic/gfx/icon_nav_right.h +++ b/engines/titanic/gfx/icon_nav_right.h @@ -29,14 +29,10 @@ namespace Titanic { class CIconNavRight : public CToggleSwitch { public: + CLASSDEF CIconNavRight(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CIconNavRight"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/icon_nav_send.h b/engines/titanic/gfx/icon_nav_send.h index 59cb670687..1ffb8e9e15 100644 --- a/engines/titanic/gfx/icon_nav_send.h +++ b/engines/titanic/gfx/icon_nav_send.h @@ -29,10 +29,7 @@ namespace Titanic { class CIconNavSend : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CIconNavSend"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/icon_nav_up.h b/engines/titanic/gfx/icon_nav_up.h index 010b6093a3..7eeeb773b1 100644 --- a/engines/titanic/gfx/icon_nav_up.h +++ b/engines/titanic/gfx/icon_nav_up.h @@ -29,14 +29,10 @@ namespace Titanic { class CIconNavUp : public CToggleSwitch { public: + CLASSDEF CIconNavUp(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CIconNavUp"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/keybrd_butt.h b/engines/titanic/gfx/keybrd_butt.h index 52fff7700f..a4f233b209 100644 --- a/engines/titanic/gfx/keybrd_butt.h +++ b/engines/titanic/gfx/keybrd_butt.h @@ -29,14 +29,10 @@ namespace Titanic { class CKeybrdButt : public CToggleSwitch { public: + CLASSDEF CKeybrdButt(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CKeybrdButt"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/move_object_button.h b/engines/titanic/gfx/move_object_button.h index b00ba7b00f..70df8f6a7f 100644 --- a/engines/titanic/gfx/move_object_button.h +++ b/engines/titanic/gfx/move_object_button.h @@ -32,14 +32,10 @@ private: Common::Point _pos1; int _field11C; public: + CLASSDEF CMoveObjectButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMoveObjectButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/music_control.h b/engines/titanic/gfx/music_control.h index a6063f4f9e..97a0077c18 100644 --- a/engines/titanic/gfx/music_control.h +++ b/engines/titanic/gfx/music_control.h @@ -34,14 +34,10 @@ public: int _fieldE8; int _fieldEC; public: + CLASSDEF CMusicControl(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicControl"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/music_slider.h b/engines/titanic/gfx/music_slider.h index 911698656d..3fd0ab341e 100644 --- a/engines/titanic/gfx/music_slider.h +++ b/engines/titanic/gfx/music_slider.h @@ -29,10 +29,7 @@ namespace Titanic { class CMusicSlider : public CMusicControl { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicSlider"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/music_slider_pitch.h b/engines/titanic/gfx/music_slider_pitch.h index ba2514bf28..f50958bdcd 100644 --- a/engines/titanic/gfx/music_slider_pitch.h +++ b/engines/titanic/gfx/music_slider_pitch.h @@ -29,10 +29,7 @@ namespace Titanic { class CMusicSliderPitch : public CMusicSlider { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicSliderPitch"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/music_slider_speed.h b/engines/titanic/gfx/music_slider_speed.h index fb3e7e1d41..8ed18625ff 100644 --- a/engines/titanic/gfx/music_slider_speed.h +++ b/engines/titanic/gfx/music_slider_speed.h @@ -29,10 +29,7 @@ namespace Titanic { class CMusicSliderSpeed : public CMusicSlider { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicSliderSpeed"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/music_switch.h b/engines/titanic/gfx/music_switch.h index 0f277c5905..534eb251de 100644 --- a/engines/titanic/gfx/music_switch.h +++ b/engines/titanic/gfx/music_switch.h @@ -29,10 +29,7 @@ namespace Titanic { class CMusicSwitch : public CMusicControl { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicSwitch"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/music_switch_inversion.h b/engines/titanic/gfx/music_switch_inversion.h index 23562482e0..6aea692f61 100644 --- a/engines/titanic/gfx/music_switch_inversion.h +++ b/engines/titanic/gfx/music_switch_inversion.h @@ -29,10 +29,7 @@ namespace Titanic { class CMusicSwitchInversion : public CMusicSwitch { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicSwitchInversion"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/music_switch_reverse.h b/engines/titanic/gfx/music_switch_reverse.h index 5467ededb7..99460f1845 100644 --- a/engines/titanic/gfx/music_switch_reverse.h +++ b/engines/titanic/gfx/music_switch_reverse.h @@ -29,10 +29,7 @@ namespace Titanic { class CMusicSwitchReverse : public CMusicSwitch { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicSwitchReverse"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/music_voice_mute.h b/engines/titanic/gfx/music_voice_mute.h index 2a2acdedaa..2198b96e42 100644 --- a/engines/titanic/gfx/music_voice_mute.h +++ b/engines/titanic/gfx/music_voice_mute.h @@ -29,10 +29,7 @@ namespace Titanic { class CMusicVoiceMute : public CMusicControl { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicVoiceMute"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/pet_drag_chev.h b/engines/titanic/gfx/pet_drag_chev.h index 72f83dddf8..e82afd0a1b 100644 --- a/engines/titanic/gfx/pet_drag_chev.h +++ b/engines/titanic/gfx/pet_drag_chev.h @@ -29,10 +29,7 @@ namespace Titanic { class CPetDragChev : public CPetGraphic2 { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPetDragChev"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/pet_graphic.h b/engines/titanic/gfx/pet_graphic.h index 28b5d9aeca..112d75a870 100644 --- a/engines/titanic/gfx/pet_graphic.h +++ b/engines/titanic/gfx/pet_graphic.h @@ -29,10 +29,7 @@ namespace Titanic { class CPetGraphic : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPetGraphic"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/pet_graphic2.h b/engines/titanic/gfx/pet_graphic2.h index aabf058cf6..d9bb514915 100644 --- a/engines/titanic/gfx/pet_graphic2.h +++ b/engines/titanic/gfx/pet_graphic2.h @@ -29,10 +29,7 @@ namespace Titanic { class CPetGraphic2 : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNutReplacer"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/pet_leaf.h b/engines/titanic/gfx/pet_leaf.h index 95fe1e6062..073374970c 100644 --- a/engines/titanic/gfx/pet_leaf.h +++ b/engines/titanic/gfx/pet_leaf.h @@ -29,10 +29,7 @@ namespace Titanic { class PETLeaf : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "PETLeaf"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/pet_mode_off.h b/engines/titanic/gfx/pet_mode_off.h index 45b1010e45..ea88255b93 100644 --- a/engines/titanic/gfx/pet_mode_off.h +++ b/engines/titanic/gfx/pet_mode_off.h @@ -29,14 +29,10 @@ namespace Titanic { class CPetModeOff : public CToggleSwitch { public: + CLASSDEF CPetModeOff(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPetModeOff"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/pet_mode_on.h b/engines/titanic/gfx/pet_mode_on.h index 8ebfd8de3e..1434fb20db 100644 --- a/engines/titanic/gfx/pet_mode_on.h +++ b/engines/titanic/gfx/pet_mode_on.h @@ -29,14 +29,10 @@ namespace Titanic { class CPetModeOn : public CToggleSwitch { public: + CLASSDEF CPetModeOn(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPetModeOn"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/pet_mode_panel.h b/engines/titanic/gfx/pet_mode_panel.h index 3a394dfe05..ef68ca8b06 100644 --- a/engines/titanic/gfx/pet_mode_panel.h +++ b/engines/titanic/gfx/pet_mode_panel.h @@ -29,14 +29,10 @@ namespace Titanic { class CPetModePanel : public CToggleSwitch { public: + CLASSDEF CPetModePanel(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPetModePanel"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/pet_pannel1.h b/engines/titanic/gfx/pet_pannel1.h index 3d9b4068db..9261af9077 100644 --- a/engines/titanic/gfx/pet_pannel1.h +++ b/engines/titanic/gfx/pet_pannel1.h @@ -29,10 +29,7 @@ namespace Titanic { class CPetPannel1 : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPetPannel1"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/pet_pannel2.h b/engines/titanic/gfx/pet_pannel2.h index 6fdad872ba..561c0d74a2 100644 --- a/engines/titanic/gfx/pet_pannel2.h +++ b/engines/titanic/gfx/pet_pannel2.h @@ -29,10 +29,7 @@ namespace Titanic { class CPetPannel2 : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPetPannel2"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/pet_pannel3.h b/engines/titanic/gfx/pet_pannel3.h index 521d5179c2..590818406a 100644 --- a/engines/titanic/gfx/pet_pannel3.h +++ b/engines/titanic/gfx/pet_pannel3.h @@ -29,10 +29,7 @@ namespace Titanic { class CPetPannel3 : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPetPannel3"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/send_to_succ.h b/engines/titanic/gfx/send_to_succ.h index 971c2e7f3f..fb237f206d 100644 --- a/engines/titanic/gfx/send_to_succ.h +++ b/engines/titanic/gfx/send_to_succ.h @@ -29,13 +29,9 @@ namespace Titanic { class CSendToSucc : public CToggleSwitch { public: + CLASSDEF CSendToSucc(); - - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSendToSucc"; } - + /** * Save the data for the class to file */ diff --git a/engines/titanic/gfx/sgt_selector.h b/engines/titanic/gfx/sgt_selector.h index 92832889d4..678ee77b06 100644 --- a/engines/titanic/gfx/sgt_selector.h +++ b/engines/titanic/gfx/sgt_selector.h @@ -29,10 +29,7 @@ namespace Titanic { class CSGTSelector : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSGTSelector"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/slider_button.h b/engines/titanic/gfx/slider_button.h index e39a5f8c41..afb96dbd70 100644 --- a/engines/titanic/gfx/slider_button.h +++ b/engines/titanic/gfx/slider_button.h @@ -34,14 +34,10 @@ private: int _field11C; Common::Point _pos1; public: + CLASSDEF CSliderButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSliderButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/small_chev_left_off.h b/engines/titanic/gfx/small_chev_left_off.h index bf73c7425b..fc500cee69 100644 --- a/engines/titanic/gfx/small_chev_left_off.h +++ b/engines/titanic/gfx/small_chev_left_off.h @@ -29,14 +29,10 @@ namespace Titanic { class CSmallChevLeftOff : public CToggleSwitch { public: + CLASSDEF CSmallChevLeftOff(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSmallChevLeftOff"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/small_chev_left_on.h b/engines/titanic/gfx/small_chev_left_on.h index c98108bec1..8ab9417468 100644 --- a/engines/titanic/gfx/small_chev_left_on.h +++ b/engines/titanic/gfx/small_chev_left_on.h @@ -29,14 +29,10 @@ namespace Titanic { class CSmallChevLeftOn : public CToggleSwitch { public: + CLASSDEF CSmallChevLeftOn(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSmallChevLeftOn"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/small_chev_right_off.h b/engines/titanic/gfx/small_chev_right_off.h index 5a6f3cc3ce..fae9c3c674 100644 --- a/engines/titanic/gfx/small_chev_right_off.h +++ b/engines/titanic/gfx/small_chev_right_off.h @@ -29,14 +29,10 @@ namespace Titanic { class CSmallChevRightOff : public CToggleSwitch { public: + CLASSDEF CSmallChevRightOff(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSmallChevRightOff"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/small_chev_right_on.h b/engines/titanic/gfx/small_chev_right_on.h index f0100109f2..c5cb4d792d 100644 --- a/engines/titanic/gfx/small_chev_right_on.h +++ b/engines/titanic/gfx/small_chev_right_on.h @@ -29,14 +29,10 @@ namespace Titanic { class CSmallChevRightOn : public CToggleSwitch { public: + CLASSDEF CSmallChevRightOn(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSmallChevRightOn"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/st_button.h b/engines/titanic/gfx/st_button.h index 39b3765848..e63d1c831c 100644 --- a/engines/titanic/gfx/st_button.h +++ b/engines/titanic/gfx/st_button.h @@ -37,14 +37,10 @@ private: CString _string5; int _field110; public: + CLASSDEF CSTButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSTButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/status_change_button.h b/engines/titanic/gfx/status_change_button.h index b3b41254b3..be0d9985b2 100644 --- a/engines/titanic/gfx/status_change_button.h +++ b/engines/titanic/gfx/status_change_button.h @@ -29,14 +29,10 @@ namespace Titanic { class CStatusChangeButton : public CSTButton { public: + CLASSDEF CStatusChangeButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CStatusChangeButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/text_down.h b/engines/titanic/gfx/text_down.h index 8fc16d8aee..6fc55bb647 100644 --- a/engines/titanic/gfx/text_down.h +++ b/engines/titanic/gfx/text_down.h @@ -29,10 +29,7 @@ namespace Titanic { class CTextDown : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTextDown"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/text_skrew.h b/engines/titanic/gfx/text_skrew.h index 88a6a9ab81..6d7e714963 100644 --- a/engines/titanic/gfx/text_skrew.h +++ b/engines/titanic/gfx/text_skrew.h @@ -29,10 +29,7 @@ namespace Titanic { class CTextSkrew : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTextSkrew"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/text_up.h b/engines/titanic/gfx/text_up.h index cce4c6c6b4..328aeee0ee 100644 --- a/engines/titanic/gfx/text_up.h +++ b/engines/titanic/gfx/text_up.h @@ -29,10 +29,7 @@ namespace Titanic { class CTextUp : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTextUp"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/toggle_button.h b/engines/titanic/gfx/toggle_button.h index b5113d7f95..a98a94df9e 100644 --- a/engines/titanic/gfx/toggle_button.h +++ b/engines/titanic/gfx/toggle_button.h @@ -31,14 +31,10 @@ class CToggleButton : public CBackground { private: int _fieldE0; public: + CLASSDEF CToggleButton() : CBackground(), _fieldE0(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CToggleButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/toggle_switch.h b/engines/titanic/gfx/toggle_switch.h index 977661df53..9b4fc4219b 100644 --- a/engines/titanic/gfx/toggle_switch.h +++ b/engines/titanic/gfx/toggle_switch.h @@ -32,14 +32,10 @@ private: int _fieldBC; Common::Point _pos1; public: + CLASSDEF CToggleSwitch(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CToggleSwitch"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/volume_control.h b/engines/titanic/gfx/volume_control.h index 5ff5c732b1..7778bb8c52 100644 --- a/engines/titanic/gfx/volume_control.h +++ b/engines/titanic/gfx/volume_control.h @@ -33,14 +33,10 @@ private: CString _string1; int _fieldCC; public: + CLASSDEF CVolumeControl(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CVolumeControl"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/messages/auto_sound_event.h b/engines/titanic/messages/auto_sound_event.h index cb5bfee788..03baba354f 100644 --- a/engines/titanic/messages/auto_sound_event.h +++ b/engines/titanic/messages/auto_sound_event.h @@ -32,14 +32,10 @@ public: int _value1; int _value2; public: + CLASSDEF CAutoSoundEvent(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CAutoSoundEvent"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/messages/bilge_auto_sound_event.h b/engines/titanic/messages/bilge_auto_sound_event.h index 94f38d3e65..e51f74bfa5 100644 --- a/engines/titanic/messages/bilge_auto_sound_event.h +++ b/engines/titanic/messages/bilge_auto_sound_event.h @@ -29,10 +29,7 @@ namespace Titanic { class CBilgeAutoSoundEvent : public CAutoSoundEvent { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBilgeAutoSoundEvent"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/messages/bilge_dispensor_event.h b/engines/titanic/messages/bilge_dispensor_event.h index 8308d474b2..fb88a6bd32 100644 --- a/engines/titanic/messages/bilge_dispensor_event.h +++ b/engines/titanic/messages/bilge_dispensor_event.h @@ -29,10 +29,7 @@ namespace Titanic { class CBilgeDispensorEvent : public CAutoSoundEvent { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBilgeDispensorEvent"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/messages/door_auto_sound_event.h b/engines/titanic/messages/door_auto_sound_event.h index 7eb1d04bf4..cccc3fff9d 100644 --- a/engines/titanic/messages/door_auto_sound_event.h +++ b/engines/titanic/messages/door_auto_sound_event.h @@ -34,16 +34,12 @@ public: int _fieldDC; int _fieldE0; public: + CLASSDEF CDoorAutoSoundEvent() : CAutoSoundEvent(), _string1("z#44.wav"), _string2("z#43.wav"), _fieldDC(25), _fieldE0(25) { } /** - * Return the class name - */ - virtual const char *getClassName() const { return "CDoorAutoSoundEvent"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/messages/messages.h b/engines/titanic/messages/messages.h index 6b6695d28c..c11d688985 100644 --- a/engines/titanic/messages/messages.h +++ b/engines/titanic/messages/messages.h @@ -30,14 +30,10 @@ namespace Titanic { class CMessage : public CSaveableObject { public: + CLASSDEF CMessage(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMessage"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; @@ -57,13 +53,9 @@ private: int _field1C; int _field20; public: + CLASSDEF CEditControlMsg() : _field4(0), _field8(0), _field18(0), _field1C(0), _field20(0) {} - - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEditControlMsg"; } }; class CLightsMsg : public CMessage { @@ -73,13 +65,9 @@ public: int _fieldC; int _field10; public: + CLASSDEF CLightsMsg() : CMessage(), _field4(0), _field8(0), _fieldC(0), _field10(0) {} - - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CLightsMsg"; } }; class CIsHookedOnMsg : public CMessage { @@ -91,27 +79,18 @@ private: int _field1C; int _field20; public: + CLASSDEF CIsHookedOnMsg() : CMessage(), _field4(0), _field8(0), _field18(0), _field1C(0), _field20(0) {} - - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CIsHookedOnMsg"; } }; - class CSubAcceptCCarryMsg : public CMessage { public: CString _string1; int _value1, _value2, _value3; public: + CLASSDEF CSubAcceptCCarryMsg() : _value1(0), _value2(0), _value3(0) {} - - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSubAcceptCCarryMsg"; } }; class CTransportMsg : public CMessage { @@ -119,216 +98,187 @@ public: CString _string; int _value1, _value2; public: + CLASSDEF CTransportMsg() : _value1(0), _value2(0) {} - - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTransportMsg"; } }; -#define RAW_MESSAGE(NAME) class NAME: public CMessage { \ - virtual const char *getClassName() const { return #NAME; } \ - } -#define STR_MESSAGE(NAME, FIELD) class NAME: public CMessage { \ - public: CString FIELD; \ - virtual const char *getClassName() const { return #NAME; } \ - } -#define STR2_MESSAGE(NAME, FIELD1, FIELD2) class NAME: public CMessage { \ - public: CString FIELD1, FIELD2; \ - virtual const char *getClassName() const { return #NAME; } \ - } -#define STR_MESSAGE_VAL(NAME, FIELD, VAL) class NAME: public CMessage { \ - public: CString FIELD; \ - NAME(): FIELD(VAL) {} \ - virtual const char *getClassName() const { return #NAME; } \ - } -#define NUM_MESSAGE(NAME, FIELD) class NAME: public CMessage { \ - public: int FIELD; \ - NAME(): FIELD(0) {} \ - virtual const char *getClassName() const { return #NAME; } \ - } -#define NUM_MESSAGE_VAL(NAME, FIELD, VAL) class NAME: public CMessage { \ - public: int FIELD; \ - NAME(): CMessage(), FIELD(VAL) {} \ - virtual const char *getClassName() const { return #NAME; } \ - } -#define NUM2_MESSAGE(NAME, FIELD1, FIELD2) class NAME: public CMessage { \ - public: int FIELD1, FIELD2; \ - NAME(): CMessage(), FIELD1(0), FIELD2(0) {} \ - virtual const char *getClassName() const { return #NAME; } \ - } -#define NUM3_MESSAGE(NAME, FIELD1, FIELD2, FIELD3) class NAME: public CMessage { \ - public: int FIELD1, FIELD2, FIELD3; \ - NAME(): CMessage(), FIELD1(0), FIELD2(0), FIELD3(0) {} \ - virtual const char *getClassName() const { return #NAME; } \ +#define MESSAGE0(NAME) \ + class NAME: public CMessage { \ + public: NAME() : CMessage() {} \ + CLASSDEF \ } -#define NUM4_MESSAGE(NAME, FIELD1, FIELD2, FIELD3, FIELD4) \ +#define MESSAGE1(NAME, F1, N1, V1) \ class NAME: public CMessage { \ - public: int FIELD1, FIELD2, FIELD3, FIELD4; \ - NAME(): CMessage(), FIELD1(0), FIELD2(0), FIELD3(0), FIELD4(0) {} \ - virtual const char *getClassName() const { return #NAME; } \ + public: F1 _N1; \ + NAME() : CMessage(), _N1(V1) {} \ + NAME(F1 N1) : CMessage(), _N1(N1) {} \ + CLASSDEF \ } -#define NUM2_MESSAGE_VAL(NAME, FIELD1, FIELD2, VAL1, VAL2) \ +#define MESSAGE2(NAME, F1, N1, V1, F2, N2, V2) \ class NAME: public CMessage { \ - public: int FIELD1, FIELD2; \ - NAME(): CMessage(), FIELD1(VAL1), FIELD2(VAL2) {} \ - virtual const char *getClassName() const { return #NAME; } \ + public: F1 _N1; F2 _N2; \ + NAME() : CMessage(), _N1(V1), _N2(V2) {} \ + NAME(F1 N1, F2 N2) : CMessage(), _N1(N1), _N2(N2) {} \ + CLASSDEF \ } -#define SNUM_MESSAGE(NAME, SFIELD, NFIELD) class NAME: public CMessage { \ - public: CString SFIELD; CString NFIELD; \ - virtual const char *getClassName() const { return #NAME; } \ +#define MESSAGE3(NAME, F1, N1, V1, F2, N2, V2, F3, N3, V3) \ + class NAME: public CMessage { \ + public: F1 _N1; F2 _N2; F3 _N3; \ + NAME() : CMessage(), _N1(V1), _N2(V2), _N3(V3) {} \ + NAME(F1 N1, F2 N2, F3 N3) : CMessage(), _N1(N1), _N2(N2), _N3(N3) {} \ + CLASSDEF \ } -#define SNUM_MESSAGE_VAL(NAME, SFIELD, NFIELD, SVAL, NVAL) \ +#define MESSAGE4(NAME, F1, N1, V1, F2, N2, V2, F3, N3, V3, F4, N4, V4) \ class NAME: public CMessage { \ - public: CString SFIELD; CString NFIELD; \ - NAME(): CMessage(), SFIELD(SVAL), NFIELD(NVAL) {} \ - virtual const char *getClassName() const { return #NAME; } \ + public: F1 _N1; F2 _N2; F3 _N3; F4 _N4; \ + NAME() : CMessage(), _N1(V1), _N2(V2), _N3(V3), _N4(V4) {} \ + NAME(F1 N1, F2 N2, F3 N3, F4 N4) : CMessage(), _N1(N1), _N2(N2), _N3(N3), _N4(N4) {} \ + CLASSDEF \ } -STR_MESSAGE(CActMsg, _value); -STR_MESSAGE(CActivationmsg, _value); -STR_MESSAGE_VAL(CAddHeadPieceMsg, _value, "NULL"); -NUM_MESSAGE(CAnimateMaitreDMsg, _value); -NUM_MESSAGE(CArboretumGateMsg, _value); -RAW_MESSAGE(CArmPickedUpFromTableMsg); -RAW_MESSAGE(CBodyInBilgeRoomMsg); -NUM_MESSAGE(CBowlStateChange, _value); -SNUM_MESSAGE(CCarryObjectArrivedMsg, _strValue, _numValue); -STR_MESSAGE_VAL(CChangeSeasonMsg, _season, "Summer"); -RAW_MESSAGE(CCheckAllPossibleCodes); -NUM2_MESSAGE(CCheckChevCode, _value1, _value2); -NUM_MESSAGE(CChildDragEndMsg, _value); -NUM2_MESSAGE(CChildDragMoveMsg, _value1, _value2); -NUM2_MESSAGE(CChildDragStartMsg, _value1, _value2); -RAW_MESSAGE(CClearChevPanelBits); -RAW_MESSAGE(CCorrectMusicPlayedMsg); -RAW_MESSAGE(CCreateMusicPlayerMsg); -RAW_MESSAGE(CCylinderHolderReadyMsg); -RAW_MESSAGE(CDeactivationMsg); -STR_MESSAGE(CDeliverCCarryMsg, _value); -RAW_MESSAGE(CDisableMaitreDProdReceptor); -RAW_MESSAGE(CDismissBotMsg); -RAW_MESSAGE(CDoffNavHelmet); -RAW_MESSAGE(CDonNavHelmet); -NUM_MESSAGE(CDoorbotNeededInElevatorMsg, _value); -RAW_MESSAGE(CDoorbotNeededInHomeMsg); -NUM_MESSAGE(CDropobjectMsg, _value); -NUM_MESSAGE(CDropZoneGotObjectMsg, _value); -NUM_MESSAGE(CDropZoneLostObjectMsg, _value); -NUM_MESSAGE(CEjectCylinderMsg, _value); -RAW_MESSAGE(CErasePhonographCylinderMsg); -NUM2_MESSAGE(CFreshenCookieMsg, _value1, _value2); -NUM_MESSAGE(CGetChevClassBits, _value); -NUM_MESSAGE(CGetChevClassNum, _value); -SNUM_MESSAGE(CGetChevCodeFromRoomNameMsg, _strValue, _numValue); -NUM_MESSAGE(CGetChevFloorBits, _value); -NUM_MESSAGE(CGetChevFloorNum, _value); -NUM_MESSAGE(CGetChevLiftBits, _value); -NUM_MESSAGE(CGetChevLiftNum, _value); -NUM_MESSAGE(CGetChevRoomBits, _value); -NUM_MESSAGE(CGetChevRoomNum, _value); -NUM2_MESSAGE_VAL(CHoseConnectedMsg, _value1, _value2, 1, 0); -RAW_MESSAGE(CInitializeAnimMsg); -NUM_MESSAGE(CIsEarBowlPuzzleDone, _value); -NUM_MESSAGE(CIsParrotPresentMsg, _value); -NUM_MESSAGE_VAL(CKeyCharMsg, _value, 32); -NUM2_MESSAGE(CLemonFallsFromTreeMsg, _value1, _value2); -NUM_MESSAGE(CLockPhonographMsg, _value); -RAW_MESSAGE(CMaitreDDefeatedMsg); -RAW_MESSAGE(CMaitreDHappyMsg); -NUM_MESSAGE(CMissiveOMatActionMsg, _value); -RAW_MESSAGE(CMoveToStartPosMsg); -NUM2_MESSAGE(CMovieEndMsg, _value1, _value2); -NUM2_MESSAGE(CMovieFrameMsg, _value1, _value2); -RAW_MESSAGE(CMusicHasStartedMsg); -RAW_MESSAGE(CMusicHasStoppedMsg); -RAW_MESSAGE(CMusicSettingChangedMsg); -NUM2_MESSAGE(CNPCPlayAnimationMsg, _value1, _value2); -NUM_MESSAGE(CNPCPlayIdleAnimationMsg, _value); -NUM3_MESSAGE(CNPCPlayTalkingAnimationMsg, _value1, _value2, _value3); -RAW_MESSAGE(CNPCQueueIdleAnimMsg); -STR_MESSAGE(CNutPuzzleMsg, _value); -NUM_MESSAGE(COnSummonBotMsg, _value); -RAW_MESSAGE(COpeningCreditsMsg); -NUM_MESSAGE(CPanningAwayFromParrotMsg, _value); -STR2_MESSAGE(CParrotSpeakMsg, _value1, _value2); -NUM2_MESSAGE(CParrotTriesChickenMsg, _value1, _value2); -NUM4_MESSAGE(CPassOnDragStartMsg, _value1, _value2, _value3, _value4); -NUM_MESSAGE(CPhonographPlayMsg, _value); -RAW_MESSAGE(CPhonographReadyToPlayMsg); -NUM_MESSAGE(CPhonographRecordMsg, _value); -NUM3_MESSAGE(CPhonographStopMsg, _value1, _value2, _value3); -NUM2_MESSAGE(CPlayRangeMsg, _value1, _value2); -NUM2_MESSAGE(CPlayerTriesRestaurantTableMsg, _value1, _value2); -NUM_MESSAGE(CPreSaveMsg, _value); -NUM_MESSAGE(CProdMaitreDMsg, _value); -NUM2_MESSAGE(CPumpingMsg, _value1, _value2); -NUM_MESSAGE(CPutBotBackInHisBoxMsg, _value); -NUM_MESSAGE(CPutParrotBackMsg, _value); -RAW_MESSAGE(CPuzzleSolvedMsg); -NUM3_MESSAGE(CQueryCylinderHolderMsg, _value1, _value2, _value3); -NUM3_MESSAGE(CQueryCylinderMsg, _value1, _value2, _value3); -NUM3_MESSAGE(CQueryCylinderNameMsg, _value1, _value2, _value3); -NUM3_MESSAGE(CQueryCylinderTypeMsg, _value1, _value2, _value3); -NUM_MESSAGE(CQueryMusicControlSettingMsg, _value); -NUM_MESSAGE(CQueryPhonographState, _value); -RAW_MESSAGE(CRecordOntoCylinderMsg); -RAW_MESSAGE(CRemoveFromGameMsg); -RAW_MESSAGE(CReplaceBowlAndNutsMsg); -STR_MESSAGE(CRestaurantMusicChanged, _value); -SNUM_MESSAGE(CSendCCarryMsg, _strValue, _numValue); -STR_MESSAGE_VAL(CSenseWorkingMsg, _value, "Not Working"); -NUM2_MESSAGE(CServiceElevatorFloorChangeMsg, _value1, _value2); -RAW_MESSAGE(CServiceElevatorFloorRequestMsg); -NUM_MESSAGE_VAL(CServiceElevatorMsg, _value, 4); -NUM2_MESSAGE(CSetChevButtonImageMsg, _value1, _value2); -NUM_MESSAGE(CSetChevClassBits, _value); -NUM_MESSAGE(CSetChevFloorBits, _value); -NUM_MESSAGE(CSetChevLiftBits, _value); -NUM2_MESSAGE(CSetChevPanelBitMsg, _value1, _value2); -NUM_MESSAGE(CSetChevPanelButtonsMsg, _value); -NUM_MESSAGE(CSetChevRoomBits, _value); -RAW_MESSAGE(CSetMusicControlsMsg); -SNUM_MESSAGE(CSetVarMsg, _varName, _value); -NUM2_MESSAGE_VAL(CSetVolumeMsg, _value1, _value2, 70, 0); -SNUM_MESSAGE(CShipSettingMsg, _strValue, _numValue); -STR_MESSAGE_VAL(CShowTextMsg, _value, "NO TEXT INCLUDED!!!"); -SNUM_MESSAGE(CSignalObject, _strValue, _numValue); -NUM2_MESSAGE(CSpeechFallsFromTreeMsg, _value1, _value2); -NUM_MESSAGE(CStartMusicMsg, _value); -NUM3_MESSAGE(CStatusChangeMsg, _value1, _value2, _value3); -NUM_MESSAGE(CStopMusicMsg, _value); -RAW_MESSAGE(CSubDeliverCCarryMsg); -RAW_MESSAGE(CSubSendCCarryMsg); -RAW_MESSAGE(CSUBTransition); -RAW_MESSAGE(CSubTurnOffMsg); -RAW_MESSAGE(CSubTurnOnMsg); -SNUM_MESSAGE(CSummonBotMsg, _strValue, _numValue); -STR_MESSAGE(CSummonBotQuerryMsg, _value); -STR_MESSAGE(CTakeHeadPieceMsg, _value); -STR2_MESSAGE(CTextInputMsg, _value1, _value2); -NUM_MESSAGE(CTimeDilationMsg, _value); -NUM_MESSAGE(CTimeMsg, _value); -RAW_MESSAGE(CTitleSequenceEndedMsg); -RAW_MESSAGE(CTransitMsg); -NUM_MESSAGE(CTriggerAutoMusicPlayerMsg, _value); -NUM_MESSAGE(CTriggerNPCEvent, _value); -NUM4_MESSAGE(CTrueTalkGetAnimSetMsg, _value1, _value2, _value3, _value4); -SNUM_MESSAGE(CTrueTalkGetAssetDetailsMsg, _strValue, _numValue); -NUM2_MESSAGE_VAL(CTrueTalkGetStateValueMsg, _value1, _value2, 0, -1000); -NUM2_MESSAGE(CTrueTalkNotifySpeechEndedMsg, _value1, _value2); -NUM3_MESSAGE(CTrueTalkNotifySpeechStartedMsg, _value1, _value2, _value); -NUM_MESSAGE(CTrueTalkQueueUpAnimSetMsg, _value); -RAW_MESSAGE(CTrueTalkSelfQueueAnimSetMsg); -NUM3_MESSAGE(CTrueTalkTriggerActionMsg, _value1, _value2, _value3); -RAW_MESSAGE(CTurnOff); -RAW_MESSAGE(CTurnOn); -NUM_MESSAGE(CUse, _value); -NUM_MESSAGE(CUseWithCharMsg, _value); -NUM_MESSAGE(CUseWithOtherMsg, _value); -NUM_MESSAGE(CVirtualKeyCharMsg, _value); -NUM2_MESSAGE_VAL(CVisibleMsg, _value1, _value2, 1, 0); +MESSAGE1(CActMsg, CString, value, nullptr); +MESSAGE1(CActivationmsg, CString, value, nullptr); +MESSAGE1(CAddHeadPieceMsg, CString, value, "NULL"); +MESSAGE1(CAnimateMaitreDMsg, int, value, 0); +MESSAGE1(CArboretumGateMsg, int, value, 0); +MESSAGE0(CArmPickedUpFromTableMsg); +MESSAGE0(CBodyInBilgeRoomMsg); +MESSAGE1(CBowlStateChange, int, value, 0); +MESSAGE2(CCarryObjectArrivedMsg, CString, strValue, nullptr, int, numValue, 0); +MESSAGE1(CChangeSeasonMsg, CString, season, "Summer"); +MESSAGE0(CCheckAllPossibleCodes); +MESSAGE2(CCheckChevCode, int, value1, 0, int, value2, 0); +MESSAGE1(CChildDragEndMsg, int, value, 0); +MESSAGE2(CChildDragMoveMsg, int, value1, 0, int, value2, 0); +MESSAGE2(CChildDragStartMsg, int, value1, 0, int, value2, 0); +MESSAGE0(CClearChevPanelBits); +MESSAGE0(CCorrectMusicPlayedMsg); +MESSAGE0(CCreateMusicPlayerMsg); +MESSAGE0(CCylinderHolderReadyMsg); +MESSAGE0(CDeactivationMsg); +MESSAGE1(CDeliverCCarryMsg, CString, value, nullptr); +MESSAGE0(CDisableMaitreDProdReceptor); +MESSAGE0(CDismissBotMsg); +MESSAGE0(CDoffNavHelmet); +MESSAGE0(CDonNavHelmet); +MESSAGE1(CDoorbotNeededInElevatorMsg, int, value, 0); +MESSAGE0(CDoorbotNeededInHomeMsg); +MESSAGE1(CDropobjectMsg, int, value, 0); +MESSAGE1(CDropZoneGotObjectMsg, int, value, 0); +MESSAGE1(CDropZoneLostObjectMsg, int, value, 0); +MESSAGE1(CEjectCylinderMsg, int, value, 0); +MESSAGE0(CErasePhonographCylinderMsg); +MESSAGE2(CFreshenCookieMsg, int, value1, 0, int, value2, 0); +MESSAGE1(CGetChevClassBits, int, value, 0); +MESSAGE1(CGetChevClassNum, int, value, 0); +MESSAGE2(CGetChevCodeFromRoomNameMsg, CString, strValue, nullptr, int, numValue, 0); +MESSAGE1(CGetChevFloorBits, int, value, 0); +MESSAGE1(CGetChevFloorNum, int, value, 0); +MESSAGE1(CGetChevLiftBits, int, value, 0); +MESSAGE1(CGetChevLiftNum, int, value, 0); +MESSAGE1(CGetChevRoomBits, int, value, 0); +MESSAGE1(CGetChevRoomNum, int, value, 0); +MESSAGE2(CHoseConnectedMsg, int, value1, 1, int, value2, 0); +MESSAGE0(CInitializeAnimMsg); +MESSAGE1(CIsEarBowlPuzzleDone, int, value, 0); +MESSAGE1(CIsParrotPresentMsg, int, value, 0); +MESSAGE1(CKeyCharMsg, int, value, 32); +MESSAGE2(CLemonFallsFromTreeMsg, int, value1, 0, int, value2, 0); +MESSAGE1(CLockPhonographMsg, int, value, 0); +MESSAGE0(CMaitreDDefeatedMsg); +MESSAGE0(CMaitreDHappyMsg); +MESSAGE1(CMissiveOMatActionMsg, int, value, 0); +MESSAGE0(CMoveToStartPosMsg); +MESSAGE2(CMovieEndMsg, int, value1, 0, int, value2, 0); +MESSAGE2(CMovieFrameMsg, int, value1, 0, int, value2, 0); +MESSAGE0(CMusicHasStartedMsg); +MESSAGE0(CMusicHasStoppedMsg); +MESSAGE0(CMusicSettingChangedMsg); +MESSAGE2(CNPCPlayAnimationMsg, int, value1, 0, int, value2, 0); +MESSAGE1(CNPCPlayIdleAnimationMsg, int, value, 0); +MESSAGE3(CNPCPlayTalkingAnimationMsg, int, value1, 0, int, value2, 0, int, value3, 0); +MESSAGE0(CNPCQueueIdleAnimMsg); +MESSAGE1(CNutPuzzleMsg, CString, value, nullptr); +MESSAGE1(COnSummonBotMsg, int, value, 0); +MESSAGE0(COpeningCreditsMsg); +MESSAGE1(CPanningAwayFromParrotMsg, int, value, 0); +MESSAGE2(CParrotSpeakMsg, CString, value1, nullptr, CString, value2, nullptr); +MESSAGE2(CParrotTriesChickenMsg, int, value1, 0, int, value2, 0); +MESSAGE4(CPassOnDragStartMsg, int, value1, 0, int, value2, 0, int, value3, 0, int, value4, 0); +MESSAGE1(CPhonographPlayMsg, int, value, 0); +MESSAGE0(CPhonographReadyToPlayMsg); +MESSAGE1(CPhonographRecordMsg, int, value, 0); +MESSAGE3(CPhonographStopMsg, int, value1, 0, int, value2, 0, int, value3, 0); +MESSAGE2(CPlayRangeMsg, int, value1, 0, int, value2, 0); +MESSAGE2(CPlayerTriesRestaurantTableMsg, int, value1, 0, int, value2, 0); +MESSAGE1(CPreSaveMsg, int, value, 0); +MESSAGE1(CProdMaitreDMsg, int, value, 0); +MESSAGE2(CPumpingMsg, int, value1, 0, int, value2, 0); +MESSAGE1(CPutBotBackInHisBoxMsg, int, value, 0); +MESSAGE1(CPutParrotBackMsg, int, value, 0); +MESSAGE0(CPuzzleSolvedMsg); +MESSAGE3(CQueryCylinderHolderMsg, int, value1, 0, int, value2, 0, int, value3, 0); +MESSAGE3(CQueryCylinderMsg, int, value1, 0, int, value2, 0, int, value3, 0); +MESSAGE3(CQueryCylinderNameMsg, int, value1, 0, int, value2, 0, int, value3, 0); +MESSAGE3(CQueryCylinderTypeMsg, int, value1, 0, int, value2, 0, int, value3, 0); +MESSAGE1(CQueryMusicControlSettingMsg, int, value, 0); +MESSAGE1(CQueryPhonographState, int, value, 0); +MESSAGE0(CRecordOntoCylinderMsg); +MESSAGE0(CRemoveFromGameMsg); +MESSAGE0(CReplaceBowlAndNutsMsg); +MESSAGE1(CRestaurantMusicChanged, CString, value, nullptr); +MESSAGE2(CSendCCarryMsg, CString, strValue, nullptr, int, numValue, 0); +MESSAGE1(CSenseWorkingMsg, CString, value, "Not Working"); +MESSAGE2(CServiceElevatorFloorChangeMsg, int, value1, 0, int, value2, 0); +MESSAGE0(CServiceElevatorFloorRequestMsg); +MESSAGE1(CServiceElevatorMsg, int, value, 4); +MESSAGE2(CSetChevButtonImageMsg, int, value1, 0, int, value2, 0); +MESSAGE1(CSetChevClassBits, int, value, 0); +MESSAGE1(CSetChevFloorBits, int, value, 0); +MESSAGE1(CSetChevLiftBits, int, value, 0); +MESSAGE2(CSetChevPanelBitMsg, int, value1, 0, int, value2, 0); +MESSAGE1(CSetChevPanelButtonsMsg, int, value, 0); +MESSAGE1(CSetChevRoomBits, int, value, 0); +MESSAGE0(CSetMusicControlsMsg); +MESSAGE2(CSetVarMsg, CString, varName, nullptr, int, value, 0); +MESSAGE2(CSetVolumeMsg, int, value1, 70, int, value2, 0); +MESSAGE2(CShipSettingMsg, CString, strValue, nullptr, int, numValue, 0); +MESSAGE1(CShowTextMsg, CString, value, "NO TEXT INCLUDED!!!"); +MESSAGE2(CSignalObject, CString, strValue, nullptr, int, numValue, 0); +MESSAGE2(CSpeechFallsFromTreeMsg, int, value1, 0, int, value2, 0); +MESSAGE1(CStartMusicMsg, int, value, 0); +MESSAGE3(CStatusChangeMsg, int, value1, 0, int, value2, 0, int, value3, 0); +MESSAGE1(CStopMusicMsg, int, value, 0); +MESSAGE0(CSubDeliverCCarryMsg); +MESSAGE0(CSubSendCCarryMsg); +MESSAGE0(CSUBTransition); +MESSAGE0(CSubTurnOffMsg); +MESSAGE0(CSubTurnOnMsg); +MESSAGE2(CSummonBotMsg, CString, strValue, nullptr, int, numValue, 0); +MESSAGE1(CSummonBotQuerryMsg, CString, value, nullptr); +MESSAGE1(CTakeHeadPieceMsg, CString, value, nullptr); +MESSAGE2(CTextInputMsg, CString, value1, nullptr, CString, value2, nullptr); +MESSAGE1(CTimeDilationMsg, int, value, 0); +MESSAGE1(CTimeMsg, int, value, 0); +MESSAGE0(CTitleSequenceEndedMsg); +MESSAGE0(CTransitMsg); +MESSAGE1(CTriggerAutoMusicPlayerMsg, int, value, 0); +MESSAGE1(CTriggerNPCEvent, int, value, 0); +MESSAGE4(CTrueTalkGetAnimSetMsg, int, value1, 0, int, value2, 0, int, value3, 0, int, value4, 0); +MESSAGE2(CTrueTalkGetAssetDetailsMsg, CString, strValue, nullptr, int, numValue, 0); +MESSAGE2(CTrueTalkGetStateValueMsg, int, value1, 0, int, value2, -1000); +MESSAGE2(CTrueTalkNotifySpeechEndedMsg, int, value1, 0, int, value2, 0); +MESSAGE3(CTrueTalkNotifySpeechStartedMsg, int, value1, 0, int, value2, 0, int, value, 0); +MESSAGE1(CTrueTalkQueueUpAnimSetMsg, int, value, 0); +MESSAGE0(CTrueTalkSelfQueueAnimSetMsg); +MESSAGE3(CTrueTalkTriggerActionMsg, int, value1, 0, int, value2, 0, int, value3, 0); +MESSAGE0(CTurnOff); +MESSAGE0(CTurnOn); +MESSAGE1(CUse, int, value, 0); +MESSAGE1(CUseWithCharMsg, int, value, 0); +MESSAGE1(CUseWithOtherMsg, int, value, 0); +MESSAGE1(CVirtualKeyCharMsg, int, value, 0); +MESSAGE2(CVisibleMsg, int, value1, 1, int, value2, 0); } // End of namespace Titanic diff --git a/engines/titanic/messages/mouse_messages.h b/engines/titanic/messages/mouse_messages.h index 6b466038db..d3a0566f3d 100644 --- a/engines/titanic/messages/mouse_messages.h +++ b/engines/titanic/messages/mouse_messages.h @@ -32,46 +32,46 @@ public: int _buttons; Common::Point _mousePos; public: + CLASSDEF CMouseMsg() : _buttons(0) {} - virtual const char *getClassName() const { return "CMouseMsg"; } }; class CMouseMoveMsg : public CMouseMsg { public: - virtual const char *getClassName() const { return "CMouseMoveMsg"; } + CLASSDEF }; class CMouseButtonMsg : public CMouseMsg { public: int _field10; public: + CLASSDEF CMouseButtonMsg() : CMouseMsg(), _field10(0) {} - virtual const char *getClassName() const { return "CMouseButtonMsg"; } }; class CMouseButtonDownMsg : public CMouseButtonMsg { public: - virtual const char *getClassName() const { return "CMouseButtonDownMsg"; } + CLASSDEF }; class CMouseButtonUpMsg : public CMouseButtonMsg { public: - virtual const char *getClassName() const { return "CMouseButtonUpMsg"; } + CLASSDEF }; class CMouseButtonDoubleClickMsg : public CMouseButtonMsg { public: - virtual const char *getClassName() const { return "CMouseButtonDoubleClickMsg"; } + CLASSDEF }; class CMouseDragMsg : public CMouseMsg { public: - virtual const char *getClassName() const { return "CMouseDragMsg"; } + CLASSDEF }; class CMouseDragMoveMsg : public CMouseDragMsg { public: - virtual const char *getClassName() const { return "CMouseDragMoveMsg"; } + CLASSDEF }; class CMouseDragStartMsg : public CMouseDragMsg { @@ -79,16 +79,16 @@ public: int _field10; int _field14; public: + CLASSDEF CMouseDragStartMsg() : CMouseDragMsg(), _field10(0), _field14(0) {} - virtual const char *getClassName() const { return "CMouseDragStartMsg"; } }; class CMouseDragEndMsg : public CMouseDragMsg { public: int _field10; public: + CLASSDEF CMouseDragEndMsg() : CMouseDragMsg(), _field10(0) {} - virtual const char *getClassName() const { return "CMouseDragEndMsg"; } }; } // End of namespace Titanic diff --git a/engines/titanic/messages/pet_messages.h b/engines/titanic/messages/pet_messages.h index 96e52eb61c..195bf8a0d2 100644 --- a/engines/titanic/messages/pet_messages.h +++ b/engines/titanic/messages/pet_messages.h @@ -27,20 +27,20 @@ namespace Titanic { -RAW_MESSAGE(CPETDeliverMsg); -RAW_MESSAGE(CPETGainedObjectMsg); -RAW_MESSAGE(CPETHelmetOnOffMsg); -RAW_MESSAGE(CPETKeyboardOnOffMsg); -RAW_MESSAGE(CPETLostObjectMsg); -RAW_MESSAGE(CPETObjectSelectedMsg); -NUM_MESSAGE(CPETObjectStateMsg, _value); -RAW_MESSAGE(CPETPhotoOnOffMsg); -NUM_MESSAGE(CPETPlaySoundMsg, _value); -RAW_MESSAGE(CPETReceiveMsg); -RAW_MESSAGE(CPETSetStarDestinationMsg); -NUM_MESSAGE(CPETStarFieldLockMsg, _value); -RAW_MESSAGE(CPETStereoFieldOnOffMsg); -SNUM_MESSAGE_VAL(CPETTargetMsg, _strValue, _numValue, (const char *)nullptr, -1); +MESSAGE0(CPETDeliverMsg); +MESSAGE0(CPETGainedObjectMsg); +MESSAGE0(CPETHelmetOnOffMsg); +MESSAGE0(CPETKeyboardOnOffMsg); +MESSAGE0(CPETLostObjectMsg); +MESSAGE0(CPETObjectSelectedMsg); +MESSAGE1(CPETObjectStateMsg, int, value, 0); +MESSAGE0(CPETPhotoOnOffMsg); +MESSAGE1(CPETPlaySoundMsg, int, value, 0); +MESSAGE0(CPETReceiveMsg); +MESSAGE0(CPETSetStarDestinationMsg); +MESSAGE1(CPETStarFieldLockMsg, int, value, 0); +MESSAGE0(CPETStereoFieldOnOffMsg); +MESSAGE2(CPETTargetMsg, CString, strValue, nullptr, int, numValue, -1); } // End of namespace Titanic diff --git a/engines/titanic/messages/service_elevator_door.h b/engines/titanic/messages/service_elevator_door.h index a3a8388405..ac5cf5148d 100644 --- a/engines/titanic/messages/service_elevator_door.h +++ b/engines/titanic/messages/service_elevator_door.h @@ -29,14 +29,10 @@ namespace Titanic { class CServiceElevatorDoor : public CDoorAutoSoundEvent { public: + CLASSDEF CServiceElevatorDoor(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CServiceElevatorDoor"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk index b9f5b641ed..f1d39ec870 100644 --- a/engines/titanic/module.mk +++ b/engines/titanic/module.mk @@ -115,6 +115,7 @@ MODULE_OBJS := \ game/credits_button.o \ game/dead_area.o \ game/desk_click_responder.o \ + game/dome_from_top_of_well.o \ game/doorbot_elevator_handler.o \ game/doorbot_home_handler.o \ game/ear_sweet_bowl.o \ diff --git a/engines/titanic/moves/enter_bomb_room.h b/engines/titanic/moves/enter_bomb_room.h index fc4d1360ec..dabde2e308 100644 --- a/engines/titanic/moves/enter_bomb_room.h +++ b/engines/titanic/moves/enter_bomb_room.h @@ -31,14 +31,10 @@ class CEnterBombRoom : public CMovePlayerTo { protected: int _fieldC8; public: + CLASSDEF CEnterBombRoom(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEnterBombRoom"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/enter_bridge.h b/engines/titanic/moves/enter_bridge.h index bbc4cc96d0..6a6e7161dd 100644 --- a/engines/titanic/moves/enter_bridge.h +++ b/engines/titanic/moves/enter_bridge.h @@ -31,14 +31,10 @@ class CEnterBridge : public CGameObject { public: int _value; public: + CLASSDEF CEnterBridge() : CGameObject(), _value(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEnterBridge"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/enter_exit_first_class_state.h b/engines/titanic/moves/enter_exit_first_class_state.h index f7bc4c69f7..728395d20c 100644 --- a/engines/titanic/moves/enter_exit_first_class_state.h +++ b/engines/titanic/moves/enter_exit_first_class_state.h @@ -41,10 +41,7 @@ public: */ static void deinit(); public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBowlUnlocker"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/moves/enter_exit_mini_lift.h b/engines/titanic/moves/enter_exit_mini_lift.h index 417e25d13f..5a91d397f9 100644 --- a/engines/titanic/moves/enter_exit_mini_lift.h +++ b/engines/titanic/moves/enter_exit_mini_lift.h @@ -32,14 +32,10 @@ private: int _fieldBC; int _fieldC0; public: + CLASSDEF CEnterExitMiniLift() : CSGTNavigation(), _fieldBC(0), _fieldC0(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEnterExitMiniLift"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/enter_exit_sec_class_mini_lift.h b/engines/titanic/moves/enter_exit_sec_class_mini_lift.h index 364b2e3dc6..a1081c2836 100644 --- a/engines/titanic/moves/enter_exit_sec_class_mini_lift.h +++ b/engines/titanic/moves/enter_exit_sec_class_mini_lift.h @@ -39,14 +39,11 @@ private: static CEnterExitSecClassMiniLiftStatics *_statics; int _value; public: + CLASSDEF CEnterExitSecClassMiniLift() : CGameObject(), _value(0) {} static void init(); static void deinit(); - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEnterExitSecClassMiniLift"; } - + /** * Save the data for the class to file */ diff --git a/engines/titanic/moves/enter_exit_view.h b/engines/titanic/moves/enter_exit_view.h index 05ed63da5c..e967723558 100644 --- a/engines/titanic/moves/enter_exit_view.h +++ b/engines/titanic/moves/enter_exit_view.h @@ -35,14 +35,10 @@ public: int _fieldC8; int _fieldCC; public: + CLASSDEF CEnterExitView(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEnterExitView"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/enter_sec_class_state.h b/engines/titanic/moves/enter_sec_class_state.h index 5da623dc08..2e80939976 100644 --- a/engines/titanic/moves/enter_sec_class_state.h +++ b/engines/titanic/moves/enter_sec_class_state.h @@ -31,14 +31,10 @@ class CEnterSecClassState : public CGameObject { public: int _value1, _value2; public: + CLASSDEF CEnterSecClassState() : CGameObject(), _value1(0), _value2(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEnterSecClassState"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/exit_arboretum.h b/engines/titanic/moves/exit_arboretum.h index 4e5815d284..0da67dd5a0 100644 --- a/engines/titanic/moves/exit_arboretum.h +++ b/engines/titanic/moves/exit_arboretum.h @@ -33,14 +33,10 @@ protected: int _fieldCC; int _fieldD0; public: + CLASSDEF CExitArboretum(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CExitArboretum"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/exit_bridge.h b/engines/titanic/moves/exit_bridge.h index c85c1bcab7..9231728e12 100644 --- a/engines/titanic/moves/exit_bridge.h +++ b/engines/titanic/moves/exit_bridge.h @@ -31,14 +31,10 @@ class CExitBridge : public CMovePlayerTo { private: CString _string1; public: + CLASSDEF CExitBridge(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CExitBridge"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/exit_lift.h b/engines/titanic/moves/exit_lift.h index 534de1b8ec..e97f041804 100644 --- a/engines/titanic/moves/exit_lift.h +++ b/engines/titanic/moves/exit_lift.h @@ -31,10 +31,7 @@ class CExitLift : public CGameObject { public: CString _value; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CExitLift"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/moves/exit_pellerator.h b/engines/titanic/moves/exit_pellerator.h index 7df5657691..3ae70dbed8 100644 --- a/engines/titanic/moves/exit_pellerator.h +++ b/engines/titanic/moves/exit_pellerator.h @@ -37,15 +37,11 @@ class CExitPellerator : public CGameObject { private: static CExitPelleratorStatics *_statics; public: + CLASSDEF static void init(); static void deinit(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CExitPellerator"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/exit_state_room.h b/engines/titanic/moves/exit_state_room.h index ecef4f1dc3..ccf52ce3f3 100644 --- a/engines/titanic/moves/exit_state_room.h +++ b/engines/titanic/moves/exit_state_room.h @@ -31,14 +31,10 @@ class CExitStateRoom : public CMovePlayerTo { protected: int _fieldC8; public: + CLASSDEF CExitStateRoom(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CExitStateRoom"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/exit_tiania.h b/engines/titanic/moves/exit_tiania.h index 63e120fcf3..3af5aadc2e 100644 --- a/engines/titanic/moves/exit_tiania.h +++ b/engines/titanic/moves/exit_tiania.h @@ -34,14 +34,10 @@ private: CString _string2; CString _string3; public: + CLASSDEF CExitTiania(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CExitTiania"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/move_player_in_parrot_room.h b/engines/titanic/moves/move_player_in_parrot_room.h index 91f8b993a6..5339a60a9c 100644 --- a/engines/titanic/moves/move_player_in_parrot_room.h +++ b/engines/titanic/moves/move_player_in_parrot_room.h @@ -29,14 +29,10 @@ namespace Titanic { class CMovePlayerInParrotRoom : public CMovePlayerTo { public: + CLASSDEF CMovePlayerInParrotRoom(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMovePlayerInParrotRoom"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/move_player_to.h b/engines/titanic/moves/move_player_to.h index aa785b9167..2617b46097 100644 --- a/engines/titanic/moves/move_player_to.h +++ b/engines/titanic/moves/move_player_to.h @@ -31,14 +31,10 @@ class CMovePlayerTo : public CGameObject { protected: CString _destination; public: + CLASSDEF CMovePlayerTo(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMovePlayerTo"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/move_player_to_from.h b/engines/titanic/moves/move_player_to_from.h index 82fe5db2ec..bc1878af38 100644 --- a/engines/titanic/moves/move_player_to_from.h +++ b/engines/titanic/moves/move_player_to_from.h @@ -31,14 +31,10 @@ class CMovePlayerToFrom : public CGameObject { private: CString _string2; public: + CLASSDEF CMovePlayerToFrom(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMovePlayerToFrom"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/multi_move.h b/engines/titanic/moves/multi_move.h index 102b4b7473..a06632df52 100644 --- a/engines/titanic/moves/multi_move.h +++ b/engines/titanic/moves/multi_move.h @@ -35,14 +35,10 @@ private: CString _string4; CString _string5; public: + CLASSDEF CMultiMove(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMultiMove"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/pan_from_pel.h b/engines/titanic/moves/pan_from_pel.h index 41f3fdb339..b94f5166d7 100644 --- a/engines/titanic/moves/pan_from_pel.h +++ b/engines/titanic/moves/pan_from_pel.h @@ -32,14 +32,10 @@ protected: int _fieldC8; CString _string1; public: + CLASSDEF CPanFromPel(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPanFromPel"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/restaurant_pan_handler.h b/engines/titanic/moves/restaurant_pan_handler.h index d2db5843a8..29f7832b74 100644 --- a/engines/titanic/moves/restaurant_pan_handler.h +++ b/engines/titanic/moves/restaurant_pan_handler.h @@ -34,10 +34,7 @@ protected: CString _string1; CString _string2; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CRestaurantPanHandler"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/moves/restricted_move.h b/engines/titanic/moves/restricted_move.h index 48ddefe9b8..ef95e0f5b5 100644 --- a/engines/titanic/moves/restricted_move.h +++ b/engines/titanic/moves/restricted_move.h @@ -31,14 +31,10 @@ class CRestrictedMove : public CMovePlayerTo { protected: int _fieldC8; public: + CLASSDEF CRestrictedMove(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CRestrictedMove"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/scraliontis_table.h b/engines/titanic/moves/scraliontis_table.h index d7c2ad69ab..53b000646b 100644 --- a/engines/titanic/moves/scraliontis_table.h +++ b/engines/titanic/moves/scraliontis_table.h @@ -34,14 +34,10 @@ private: int _fieldE8; int _fieldEC; public: + CLASSDEF CScraliontisTable(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CScraliontisTable"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/trip_down_canal.h b/engines/titanic/moves/trip_down_canal.h index 0a5f918fb2..80d5dcf706 100644 --- a/engines/titanic/moves/trip_down_canal.h +++ b/engines/titanic/moves/trip_down_canal.h @@ -29,14 +29,10 @@ namespace Titanic { class CTripDownCanal : public CMovePlayerTo { public: + CLASSDEF CTripDownCanal(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTripDownCanal"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; 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; diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h index 087ecd1d8f..0eb2034675 100644 --- a/engines/titanic/pet_control/pet_control.h +++ b/engines/titanic/pet_control/pet_control.h @@ -64,10 +64,7 @@ private: void saveSubObjects(SimpleFile *file, int indent) const; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPetControl"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/sound/auto_music_player.h b/engines/titanic/sound/auto_music_player.h index 11e46b0478..cec8117dd9 100644 --- a/engines/titanic/sound/auto_music_player.h +++ b/engines/titanic/sound/auto_music_player.h @@ -31,14 +31,10 @@ class CAutoMusicPlayer : public CAutoMusicPlayerBase { private: CString _string2; public: + CLASSDEF CAutoMusicPlayer(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CAutoMusicPlayer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/auto_music_player_base.h b/engines/titanic/sound/auto_music_player_base.h index 66ffabb61c..e762ef40b9 100644 --- a/engines/titanic/sound/auto_music_player_base.h +++ b/engines/titanic/sound/auto_music_player_base.h @@ -35,14 +35,10 @@ protected: int _fieldD0; int _fieldD4; public: + CLASSDEF CAutoMusicPlayerBase(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CAutoMusicPlayerBase"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/auto_sound_player.h b/engines/titanic/sound/auto_sound_player.h index bc849341df..15f1325e06 100644 --- a/engines/titanic/sound/auto_sound_player.h +++ b/engines/titanic/sound/auto_sound_player.h @@ -40,14 +40,10 @@ public: int _fieldE4; int _fieldE8; public: + CLASSDEF CAutoSoundPlayer(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CAutoSoundPlayer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/auto_sound_player_adsr.h b/engines/titanic/sound/auto_sound_player_adsr.h index 9c2a082ba5..c88a861f9b 100644 --- a/engines/titanic/sound/auto_sound_player_adsr.h +++ b/engines/titanic/sound/auto_sound_player_adsr.h @@ -33,10 +33,7 @@ private: CString _string3; CString _string4; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CAutoSoundPlayerADSR"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/sound/background_sound_maker.h b/engines/titanic/sound/background_sound_maker.h index 5a234ae048..68c1d7d1a9 100644 --- a/engines/titanic/sound/background_sound_maker.h +++ b/engines/titanic/sound/background_sound_maker.h @@ -31,14 +31,10 @@ class CBackgroundSoundMaker : public CGameObject { public: int _value; public: + CLASSDEF CBackgroundSoundMaker() : CGameObject(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBackgroundSoundMaker"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/bird_song.h b/engines/titanic/sound/bird_song.h index 50c1f2b722..d932cfde7d 100644 --- a/engines/titanic/sound/bird_song.h +++ b/engines/titanic/sound/bird_song.h @@ -31,14 +31,10 @@ class CBirdSong : public CRoomAutoSoundPlayer { public: int _value; public: + CLASSDEF CBirdSong() : CRoomAutoSoundPlayer(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBirdSong"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/dome_from_top_of_well.h b/engines/titanic/sound/dome_from_top_of_well.h index faea805b1a..bb8ab6372a 100644 --- a/engines/titanic/sound/dome_from_top_of_well.h +++ b/engines/titanic/sound/dome_from_top_of_well.h @@ -29,10 +29,7 @@ namespace Titanic { class CDomeFromTopOfWell : public CViewAutoSoundPlayer { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CDomeFromTopOfWell"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/sound/enter_view_toggles_other_music.h b/engines/titanic/sound/enter_view_toggles_other_music.h index 3e7976e877..991a6ad2bc 100644 --- a/engines/titanic/sound/enter_view_toggles_other_music.h +++ b/engines/titanic/sound/enter_view_toggles_other_music.h @@ -31,14 +31,10 @@ class CEnterViewTogglesOtherMusic : public CTriggerAutoMusicPlayer { protected: int _fieldC8; public: + CLASSDEF CEnterViewTogglesOtherMusic(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEnterViewTogglesOtherMusic"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/gondolier_song.h b/engines/titanic/sound/gondolier_song.h index 38f7e867f8..6377279c04 100644 --- a/engines/titanic/sound/gondolier_song.h +++ b/engines/titanic/sound/gondolier_song.h @@ -31,14 +31,10 @@ class CGondolierSong : public CRoomAutoSoundPlayer { public: int _value; public: + CLASSDEF CGondolierSong() : CRoomAutoSoundPlayer(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGondolierSong"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/music_player.h b/engines/titanic/sound/music_player.h index 19539c89f7..0a750cc538 100644 --- a/engines/titanic/sound/music_player.h +++ b/engines/titanic/sound/music_player.h @@ -34,15 +34,11 @@ public: int _fieldCC; int _fieldD0; public: + CLASSDEF CMusicPlayer() : CGameObject(), _fieldBC(0), _fieldCC(0), _fieldD0(100) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicPlayer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/node_auto_sound_player.h b/engines/titanic/sound/node_auto_sound_player.h index 5f4b70b93d..6fc56098f8 100644 --- a/engines/titanic/sound/node_auto_sound_player.h +++ b/engines/titanic/sound/node_auto_sound_player.h @@ -31,14 +31,10 @@ class CNodeAutoSoundPlayer : public CAutoSoundPlayer { private: int _fieldEC; public: + CLASSDEF CNodeAutoSoundPlayer() : CAutoSoundPlayer(), _fieldEC(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CViewAutoSoundPlayer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/restricted_auto_music_player.h b/engines/titanic/sound/restricted_auto_music_player.h index ab8e26e9da..cb6220cbc7 100644 --- a/engines/titanic/sound/restricted_auto_music_player.h +++ b/engines/titanic/sound/restricted_auto_music_player.h @@ -34,10 +34,7 @@ private: CString _string5; CString _string6; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CRestrictedAutoMusicPlayer"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/sound/room_auto_sound_player.h b/engines/titanic/sound/room_auto_sound_player.h index 719eddcb84..ebee0165f6 100644 --- a/engines/titanic/sound/room_auto_sound_player.h +++ b/engines/titanic/sound/room_auto_sound_player.h @@ -29,10 +29,7 @@ namespace Titanic { class CRoomAutoSoundPlayer : public CAutoSoundPlayer { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CRoomAutoSoundPlayer"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/sound/season_noises.h b/engines/titanic/sound/season_noises.h index def709c536..7746c164e8 100644 --- a/engines/titanic/sound/season_noises.h +++ b/engines/titanic/sound/season_noises.h @@ -35,14 +35,10 @@ private: CString _string4; CString _string5; public: + CLASSDEF CSeasonNoises(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSeasonNoises"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/seasonal_music_player.h b/engines/titanic/sound/seasonal_music_player.h index fe3a60be9d..da19e1f0b0 100644 --- a/engines/titanic/sound/seasonal_music_player.h +++ b/engines/titanic/sound/seasonal_music_player.h @@ -38,14 +38,10 @@ private: int _fieldF0; int _fieldF4; public: + CLASSDEF CSeasonalMusicPlayer(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSeasonalMusicPlayer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/titania_speech.h b/engines/titanic/sound/titania_speech.h index a81544a903..fc55c20af5 100644 --- a/engines/titanic/sound/titania_speech.h +++ b/engines/titanic/sound/titania_speech.h @@ -31,14 +31,10 @@ class CTitaniaSpeech : public CGameObject { public: int _value1, _value2; public: + CLASSDEF CTitaniaSpeech() : CGameObject(), _value1(1), _value2(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTitaniaSpeech"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/trigger_auto_music_player.h b/engines/titanic/sound/trigger_auto_music_player.h index 8f7a42c5c2..6387236181 100644 --- a/engines/titanic/sound/trigger_auto_music_player.h +++ b/engines/titanic/sound/trigger_auto_music_player.h @@ -31,10 +31,7 @@ class CTriggerAutoMusicPlayer : public CGameObject { protected: CString _fieldBC; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTriggerAutoMusicPlayer"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/sound/view_auto_sound_player.h b/engines/titanic/sound/view_auto_sound_player.h index 9e87d74d8d..60de391ecb 100644 --- a/engines/titanic/sound/view_auto_sound_player.h +++ b/engines/titanic/sound/view_auto_sound_player.h @@ -31,14 +31,10 @@ class CViewAutoSoundPlayer : public CAutoSoundPlayer { private: int _fieldEC; public: + CLASSDEF CViewAutoSoundPlayer() : CAutoSoundPlayer(), _fieldEC(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CViewAutoSoundPlayer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/view_toggles_other_music.h b/engines/titanic/sound/view_toggles_other_music.h index e0da2437cc..68fa47b2be 100644 --- a/engines/titanic/sound/view_toggles_other_music.h +++ b/engines/titanic/sound/view_toggles_other_music.h @@ -31,14 +31,10 @@ class CViewTogglesOtherMusic : public CEnterViewTogglesOtherMusic { private: int _fieldCC; public: + CLASSDEF CViewTogglesOtherMusic(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CViewTogglesOtherMusic"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/water_lapping_sounds.h b/engines/titanic/sound/water_lapping_sounds.h index 3dd72b5250..0d885bedd4 100644 --- a/engines/titanic/sound/water_lapping_sounds.h +++ b/engines/titanic/sound/water_lapping_sounds.h @@ -31,14 +31,10 @@ class CWaterLappingSounds : public CRoomAutoSoundPlayer { public: int _value; public: + CLASSDEF CWaterLappingSounds() : CRoomAutoSoundPlayer(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CWaterLappingSounds"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/star_control/star_control.h b/engines/titanic/star_control/star_control.h index 2a24e517fc..9462cee559 100644 --- a/engines/titanic/star_control/star_control.h +++ b/engines/titanic/star_control/star_control.h @@ -40,14 +40,10 @@ private: int _field80AC; int _field80B0; public: + CLASSDEF CStarControl(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CStarControl"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; |