diff options
Diffstat (limited to 'engines/titanic/carry')
39 files changed, 39 insertions, 189 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 |