diff options
| author | Paul Gilbert | 2016-07-24 20:30:56 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-24 20:30:56 -0400 |
| commit | 4d79ee16c07e2398e9058fe93947b4704cd6048a (patch) | |
| tree | 50c5234e21822d777e9a989c9af918feb6654a22 /engines/titanic | |
| parent | eb98b984fb5a630422013ab5f030d49b0aa39552 (diff) | |
| download | scummvm-rg350-4d79ee16c07e2398e9058fe93947b4704cd6048a.tar.gz scummvm-rg350-4d79ee16c07e2398e9058fe93947b4704cd6048a.tar.bz2 scummvm-rg350-4d79ee16c07e2398e9058fe93947b4704cd6048a.zip | |
TITANIC: Add semicolon after CLASSDEF macro usage
Diffstat (limited to 'engines/titanic')
385 files changed, 404 insertions, 404 deletions
diff --git a/engines/titanic/carry/arm.h b/engines/titanic/carry/arm.h index afef22ba49..48201ed90a 100644 --- a/engines/titanic/carry/arm.h +++ b/engines/titanic/carry/arm.h @@ -49,7 +49,7 @@ private: int _field16C; int _field170; public: - CLASSDEF + CLASSDEF; CArm(); /** diff --git a/engines/titanic/carry/auditory_centre.h b/engines/titanic/carry/auditory_centre.h index d4b9beedc7..743f8f2498 100644 --- a/engines/titanic/carry/auditory_centre.h +++ b/engines/titanic/carry/auditory_centre.h @@ -29,7 +29,7 @@ namespace Titanic { class CAuditoryCentre : public CBrain { public: - CLASSDEF + 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 39d5dc9ff8..4f2fbea478 100644 --- a/engines/titanic/carry/bowl_ear.h +++ b/engines/titanic/carry/bowl_ear.h @@ -29,7 +29,7 @@ namespace Titanic { class CBowlEar : public CEar { public: - CLASSDEF + CLASSDEF; /** * Save the data for the class to file diff --git a/engines/titanic/carry/brain.h b/engines/titanic/carry/brain.h index fd70a7e0c9..5f76e7deff 100644 --- a/engines/titanic/carry/brain.h +++ b/engines/titanic/carry/brain.h @@ -42,7 +42,7 @@ private: int _field134; int _field138; public: - CLASSDEF + CLASSDEF; CBrain(); /** diff --git a/engines/titanic/carry/bridge_piece.h b/engines/titanic/carry/bridge_piece.h index 04bc7b9181..01c44c0b97 100644 --- a/engines/titanic/carry/bridge_piece.h +++ b/engines/titanic/carry/bridge_piece.h @@ -36,7 +36,7 @@ private: Point _pos3; int _field140; public: - CLASSDEF + CLASSDEF; CBridgePiece(); /** diff --git a/engines/titanic/carry/carry.h b/engines/titanic/carry/carry.h index 36589635f7..f4ea648b80 100644 --- a/engines/titanic/carry/carry.h +++ b/engines/titanic/carry/carry.h @@ -62,7 +62,7 @@ protected: bool _enterFrameSet; int _visibleFrame; public: - CLASSDEF + CLASSDEF; CCarry(); /** diff --git a/engines/titanic/carry/carry_parrot.h b/engines/titanic/carry/carry_parrot.h index 84c656ce8e..70caee85d3 100644 --- a/engines/titanic/carry/carry_parrot.h +++ b/engines/titanic/carry/carry_parrot.h @@ -51,7 +51,7 @@ private: int _field14C; int _field150; public: - CLASSDEF + CLASSDEF; CCarryParrot(); /** diff --git a/engines/titanic/carry/central_core.h b/engines/titanic/carry/central_core.h index 852d2b63e1..9d7bef2c13 100644 --- a/engines/titanic/carry/central_core.h +++ b/engines/titanic/carry/central_core.h @@ -29,7 +29,7 @@ namespace Titanic { class CCentralCore : public CBrain { public: - CLASSDEF + CLASSDEF; /** * Save the data for the class to file diff --git a/engines/titanic/carry/chicken.h b/engines/titanic/carry/chicken.h index e9e8f00000..c78d4a023b 100644 --- a/engines/titanic/carry/chicken.h +++ b/engines/titanic/carry/chicken.h @@ -49,7 +49,7 @@ public: int _field13C; int _timerId; public: - CLASSDEF + CLASSDEF; CChicken(); /** diff --git a/engines/titanic/carry/crushed_tv.h b/engines/titanic/carry/crushed_tv.h index d141589ec8..ba6b52cd2e 100644 --- a/engines/titanic/carry/crushed_tv.h +++ b/engines/titanic/carry/crushed_tv.h @@ -35,7 +35,7 @@ class CCrushedTV : public CCarry { bool UseWithCharMsg(CUseWithCharMsg *msg); bool MouseDragStartMsg(CMouseDragStartMsg *msg); public: - CLASSDEF + CLASSDEF; CCrushedTV(); /** diff --git a/engines/titanic/carry/ear.h b/engines/titanic/carry/ear.h index bdffdc2678..edef873d35 100644 --- a/engines/titanic/carry/ear.h +++ b/engines/titanic/carry/ear.h @@ -29,7 +29,7 @@ namespace Titanic { class CEar : public CHeadPiece { public: - CLASSDEF + CLASSDEF; CEar(); /** diff --git a/engines/titanic/carry/eye.h b/engines/titanic/carry/eye.h index 2531666037..066a85609b 100644 --- a/engines/titanic/carry/eye.h +++ b/engines/titanic/carry/eye.h @@ -31,7 +31,7 @@ class CEye : public CHeadPiece { private: int _eyeNum; public: - CLASSDEF + CLASSDEF; CEye(); /** diff --git a/engines/titanic/carry/feathers.h b/engines/titanic/carry/feathers.h index e2c8ab77db..4d193afc3f 100644 --- a/engines/titanic/carry/feathers.h +++ b/engines/titanic/carry/feathers.h @@ -30,7 +30,7 @@ namespace Titanic { class CFeathers : public CCarry { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CFeathers(); /** diff --git a/engines/titanic/carry/fruit.h b/engines/titanic/carry/fruit.h index 595f27d56c..93fe920740 100644 --- a/engines/titanic/carry/fruit.h +++ b/engines/titanic/carry/fruit.h @@ -34,7 +34,7 @@ private: int _field134; int _field138; public: - CLASSDEF + CLASSDEF; CFruit(); /** diff --git a/engines/titanic/carry/glass.h b/engines/titanic/carry/glass.h index 4e540152fa..9f4056b1be 100644 --- a/engines/titanic/carry/glass.h +++ b/engines/titanic/carry/glass.h @@ -31,7 +31,7 @@ class CGlass : public CCarry { private: CString _string6; public: - CLASSDEF + CLASSDEF; CGlass(); /** diff --git a/engines/titanic/carry/hammer.h b/engines/titanic/carry/hammer.h index e35fdd1d85..a455d71434 100644 --- a/engines/titanic/carry/hammer.h +++ b/engines/titanic/carry/hammer.h @@ -29,7 +29,7 @@ namespace Titanic { class CHammer : public CCarry { public: - CLASSDEF + CLASSDEF; CHammer(); /** diff --git a/engines/titanic/carry/head_piece.h b/engines/titanic/carry/head_piece.h index 1989b0ef2d..05ac772853 100644 --- a/engines/titanic/carry/head_piece.h +++ b/engines/titanic/carry/head_piece.h @@ -33,7 +33,7 @@ private: CString _string6; int _field13C; public: - CLASSDEF + CLASSDEF; CHeadPiece(); /** diff --git a/engines/titanic/carry/hose.h b/engines/titanic/carry/hose.h index d45fc08bc4..ebd45860e8 100644 --- a/engines/titanic/carry/hose.h +++ b/engines/titanic/carry/hose.h @@ -38,7 +38,7 @@ protected: CString _string6; public: - CLASSDEF + CLASSDEF; CHose(); static void init(); static void deinit(); diff --git a/engines/titanic/carry/hose_end.h b/engines/titanic/carry/hose_end.h index 8a82ec5363..6996d6367a 100644 --- a/engines/titanic/carry/hose_end.h +++ b/engines/titanic/carry/hose_end.h @@ -30,7 +30,7 @@ namespace Titanic { class CHoseEnd : public CHose { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CHoseEnd(); /** diff --git a/engines/titanic/carry/key.h b/engines/titanic/carry/key.h index 6b7a134991..8f1600f2b3 100644 --- a/engines/titanic/carry/key.h +++ b/engines/titanic/carry/key.h @@ -29,7 +29,7 @@ namespace Titanic { class CKey : public CCarry { public: - CLASSDEF + CLASSDEF; CKey(); /** diff --git a/engines/titanic/carry/liftbot_head.h b/engines/titanic/carry/liftbot_head.h index 9dc625014b..2fcd6a71f9 100644 --- a/engines/titanic/carry/liftbot_head.h +++ b/engines/titanic/carry/liftbot_head.h @@ -31,7 +31,7 @@ class CLiftbotHead : public CCarry { private: int _field12C; public: - CLASSDEF + CLASSDEF; CLiftbotHead(); /** diff --git a/engines/titanic/carry/long_stick.h b/engines/titanic/carry/long_stick.h index 60bff0d6f7..2ff5b7228e 100644 --- a/engines/titanic/carry/long_stick.h +++ b/engines/titanic/carry/long_stick.h @@ -29,7 +29,7 @@ namespace Titanic { class CLongStick : public CCarry { public: - CLASSDEF + CLASSDEF; CLongStick(); /** diff --git a/engines/titanic/carry/magazine.h b/engines/titanic/carry/magazine.h index afe9598d3b..69b9937b85 100644 --- a/engines/titanic/carry/magazine.h +++ b/engines/titanic/carry/magazine.h @@ -39,7 +39,7 @@ private: int _field12C; int _field130; public: - CLASSDEF + CLASSDEF; CMagazine(); /** diff --git a/engines/titanic/carry/maitred_left_arm.h b/engines/titanic/carry/maitred_left_arm.h index e59d84e2b7..8f5090b073 100644 --- a/engines/titanic/carry/maitred_left_arm.h +++ b/engines/titanic/carry/maitred_left_arm.h @@ -31,7 +31,7 @@ class CMaitreDLeftArm : public CArm { private: int _field174; public: - CLASSDEF + CLASSDEF; CMaitreDLeftArm() : CArm(), _field174(0) {} /** diff --git a/engines/titanic/carry/maitred_right_arm.h b/engines/titanic/carry/maitred_right_arm.h index f8a7861640..ce07ed7af4 100644 --- a/engines/titanic/carry/maitred_right_arm.h +++ b/engines/titanic/carry/maitred_right_arm.h @@ -29,7 +29,7 @@ namespace Titanic { class CMaitreDRightArm : public CArm { public: - CLASSDEF + CLASSDEF; /** * Save the data for the class to file diff --git a/engines/titanic/carry/mouth.h b/engines/titanic/carry/mouth.h index 0efaf73bbb..e394330494 100644 --- a/engines/titanic/carry/mouth.h +++ b/engines/titanic/carry/mouth.h @@ -29,7 +29,7 @@ namespace Titanic { class CMouth : public CHeadPiece { public: - CLASSDEF + CLASSDEF; CMouth(); /** diff --git a/engines/titanic/carry/napkin.h b/engines/titanic/carry/napkin.h index b94a61837d..cec7a6b7fc 100644 --- a/engines/titanic/carry/napkin.h +++ b/engines/titanic/carry/napkin.h @@ -32,7 +32,7 @@ class CNapkin : public CCarry { DECLARE_MESSAGE_MAP bool UseWithOtherMsg(CUseWithOtherMsg *msg); public: - CLASSDEF + CLASSDEF; CNapkin(); /** diff --git a/engines/titanic/carry/nose.h b/engines/titanic/carry/nose.h index 337617c1c7..b688da231a 100644 --- a/engines/titanic/carry/nose.h +++ b/engines/titanic/carry/nose.h @@ -29,7 +29,7 @@ namespace Titanic { class CNose : public CHeadPiece { public: - CLASSDEF + CLASSDEF; CNose(); /** diff --git a/engines/titanic/carry/note.h b/engines/titanic/carry/note.h index f0563f57da..4edb2024c5 100644 --- a/engines/titanic/carry/note.h +++ b/engines/titanic/carry/note.h @@ -35,7 +35,7 @@ private: CString _string6; int _field138; public: - CLASSDEF + CLASSDEF; CNote(); /** diff --git a/engines/titanic/carry/parcel.h b/engines/titanic/carry/parcel.h index 7209bd31cd..88282a6c14 100644 --- a/engines/titanic/carry/parcel.h +++ b/engines/titanic/carry/parcel.h @@ -30,7 +30,7 @@ namespace Titanic { class CParcel : public CCarry { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CParcel(); /** diff --git a/engines/titanic/carry/perch.h b/engines/titanic/carry/perch.h index ef04d1130f..d23868d909 100644 --- a/engines/titanic/carry/perch.h +++ b/engines/titanic/carry/perch.h @@ -29,7 +29,7 @@ namespace Titanic { class CPerch : public CCentralCore { public: - CLASSDEF + 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 2f950d175c..ba56bb3ca2 100644 --- a/engines/titanic/carry/phonograph_cylinder.h +++ b/engines/titanic/carry/phonograph_cylinder.h @@ -57,7 +57,7 @@ private: bool _bassInversionControl; bool _bassDirectionControl; public: - CLASSDEF + CLASSDEF; CPhonographCylinder(); /** diff --git a/engines/titanic/carry/phonograph_ear.h b/engines/titanic/carry/phonograph_ear.h index d450f2868e..582db9f7ef 100644 --- a/engines/titanic/carry/phonograph_ear.h +++ b/engines/titanic/carry/phonograph_ear.h @@ -31,7 +31,7 @@ class CPhonographEar : public CEar { private: int _field140; public: - CLASSDEF + CLASSDEF; CPhonographEar() : CEar(), _field140(1) {} /** diff --git a/engines/titanic/carry/photograph.h b/engines/titanic/carry/photograph.h index 3161e4861e..fcae07be07 100644 --- a/engines/titanic/carry/photograph.h +++ b/engines/titanic/carry/photograph.h @@ -42,7 +42,7 @@ private: int _field12C; int _field130; public: - CLASSDEF + CLASSDEF; CPhotograph(); /** diff --git a/engines/titanic/carry/plug_in.h b/engines/titanic/carry/plug_in.h index e788d15869..9601dc161c 100644 --- a/engines/titanic/carry/plug_in.h +++ b/engines/titanic/carry/plug_in.h @@ -33,7 +33,7 @@ class CPlugIn : public CCarry { private: int _field12C; public: - CLASSDEF + CLASSDEF; CPlugIn(); /** diff --git a/engines/titanic/carry/speech_centre.h b/engines/titanic/carry/speech_centre.h index e16556e60f..50f47e9c8a 100644 --- a/engines/titanic/carry/speech_centre.h +++ b/engines/titanic/carry/speech_centre.h @@ -33,7 +33,7 @@ private: CString _string1; int _field14C; public: - CLASSDEF + CLASSDEF; CSpeechCentre() : CBrain(), _string1("Summer"), _field13C(1), _field14C(0) {} diff --git a/engines/titanic/carry/sweets.h b/engines/titanic/carry/sweets.h index 8eb0a1623a..ed598767fc 100644 --- a/engines/titanic/carry/sweets.h +++ b/engines/titanic/carry/sweets.h @@ -32,7 +32,7 @@ class CSweets : public CCarry { DECLARE_MESSAGE_MAP bool MouseButtonUpMsg(CMouseButtonUpMsg *msg); public: - CLASSDEF + CLASSDEF; CSweets(); /** diff --git a/engines/titanic/carry/test_carry.h b/engines/titanic/carry/test_carry.h index b9591a7842..75e8bb9bf0 100644 --- a/engines/titanic/carry/test_carry.h +++ b/engines/titanic/carry/test_carry.h @@ -31,7 +31,7 @@ class CTestArray : public CGameObject { public: int _value1, _value2; public: - CLASSDEF + CLASSDEF; CTestArray() : CGameObject(), _value1(0), _value2(0) {} /** diff --git a/engines/titanic/carry/vision_centre.h b/engines/titanic/carry/vision_centre.h index 6cf2d9d49e..6cf8e2c653 100644 --- a/engines/titanic/carry/vision_centre.h +++ b/engines/titanic/carry/vision_centre.h @@ -29,7 +29,7 @@ namespace Titanic { class CVisionCentre : public CBrain { public: - CLASSDEF + CLASSDEF; /** * Save the data for the class to file diff --git a/engines/titanic/core/background.h b/engines/titanic/core/background.h index ef9a6c3e7b..004ab4d0cf 100644 --- a/engines/titanic/core/background.h +++ b/engines/titanic/core/background.h @@ -40,7 +40,7 @@ protected: CString _string2; int _fieldDC; public: - CLASSDEF + CLASSDEF; CBackground(); /** diff --git a/engines/titanic/core/click_responder.h b/engines/titanic/core/click_responder.h index c682530f76..78381b9948 100644 --- a/engines/titanic/core/click_responder.h +++ b/engines/titanic/core/click_responder.h @@ -31,7 +31,7 @@ class CClickResponder : public CGameObject { protected: CString _string1, _string2; public: - CLASSDEF + 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 242e37372a..92425ae009 100644 --- a/engines/titanic/core/dont_save_file_item.h +++ b/engines/titanic/core/dont_save_file_item.h @@ -30,7 +30,7 @@ namespace Titanic { class CDontSaveFileItem : public CFileItem { DECLARE_MESSAGE_MAP public: - CLASSDEF + 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 99734d71f4..4bd0ae448c 100644 --- a/engines/titanic/core/drop_target.h +++ b/engines/titanic/core/drop_target.h @@ -44,7 +44,7 @@ private: int _field110; int _field114; public: - CLASSDEF + CLASSDEF; CDropTarget(); /** diff --git a/engines/titanic/core/file_item.h b/engines/titanic/core/file_item.h index 4210251af0..4b7c341fdb 100644 --- a/engines/titanic/core/file_item.h +++ b/engines/titanic/core/file_item.h @@ -34,7 +34,7 @@ class CFileItem: public CTreeItem { private: CString _filename; public: - CLASSDEF + 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 bde5e25c58..746ef45db4 100644 --- a/engines/titanic/core/game_object.h +++ b/engines/titanic/core/game_object.h @@ -504,7 +504,7 @@ public: */ static void deinit(); public: - CLASSDEF + CLASSDEF; CGameObject(); ~CGameObject(); diff --git a/engines/titanic/core/game_object_desc_item.h b/engines/titanic/core/game_object_desc_item.h index df9ef7bdd1..7bfecaf5a2 100644 --- a/engines/titanic/core/game_object_desc_item.h +++ b/engines/titanic/core/game_object_desc_item.h @@ -37,7 +37,7 @@ protected: List<ListItem> _list2; CMovieClipList _clipList; public: - CLASSDEF + CLASSDEF; CGameObjectDescItem(); /** diff --git a/engines/titanic/core/link_item.h b/engines/titanic/core/link_item.h index f194bc1361..4b316809fb 100644 --- a/engines/titanic/core/link_item.h +++ b/engines/titanic/core/link_item.h @@ -50,7 +50,7 @@ public: Rect _bounds; CursorId _cursorId; public: - CLASSDEF + CLASSDEF; CLinkItem(); /** diff --git a/engines/titanic/core/list.h b/engines/titanic/core/list.h index eb87d7fe1c..91a74adbdc 100644 --- a/engines/titanic/core/list.h +++ b/engines/titanic/core/list.h @@ -35,7 +35,7 @@ namespace Titanic { */ class ListItem: public CSaveableObject { public: - CLASSDEF + CLASSDEF; /** * Save the data for the class to file diff --git a/engines/titanic/core/mail_man.h b/engines/titanic/core/mail_man.h index 27a6cd11c0..4c63cdfa13 100644 --- a/engines/titanic/core/mail_man.h +++ b/engines/titanic/core/mail_man.h @@ -31,7 +31,7 @@ class CMailMan : public CGameObject { public: int _value; public: - CLASSDEF + CLASSDEF; CMailMan() : CGameObject(), _value(1) {} /** diff --git a/engines/titanic/core/message_target.h b/engines/titanic/core/message_target.h index cfd7ac14e7..05ceaad26a 100644 --- a/engines/titanic/core/message_target.h +++ b/engines/titanic/core/message_target.h @@ -86,7 +86,7 @@ protected: \ class CMessageTarget: public CSaveableObject { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; /** * Save the data for the class to file diff --git a/engines/titanic/core/multi_drop_target.h b/engines/titanic/core/multi_drop_target.h index 22cc0941a3..c004b9bece 100644 --- a/engines/titanic/core/multi_drop_target.h +++ b/engines/titanic/core/multi_drop_target.h @@ -32,7 +32,7 @@ public: CString _string5; CString _string6; public: - CLASSDEF + CLASSDEF; CMultiDropTarget() : CDropTarget(), _string5("1,2") {} /** diff --git a/engines/titanic/core/named_item.h b/engines/titanic/core/named_item.h index 889a847e9d..2ff34c7421 100644 --- a/engines/titanic/core/named_item.h +++ b/engines/titanic/core/named_item.h @@ -36,7 +36,7 @@ class CNamedItem: public CTreeItem { public: CString _name; public: - CLASSDEF + CLASSDEF; /** * Dump the item diff --git a/engines/titanic/core/node_item.h b/engines/titanic/core/node_item.h index ff57448c7f..f54e882085 100644 --- a/engines/titanic/core/node_item.h +++ b/engines/titanic/core/node_item.h @@ -33,7 +33,7 @@ public: int _nodeNumber; Point _nodePos; public: - CLASSDEF + CLASSDEF; CNodeItem(); /** diff --git a/engines/titanic/core/project_item.h b/engines/titanic/core/project_item.h index 9270bdf6d1..00c13e52a2 100644 --- a/engines/titanic/core/project_item.h +++ b/engines/titanic/core/project_item.h @@ -56,7 +56,7 @@ class CFileListItem : public ListItem { public: CString _name; public: - CLASSDEF + CLASSDEF; /** * Save the data for the class to file @@ -150,7 +150,7 @@ public: */ static bool readSavegameHeader(SimpleFile *file, TitanicSavegameHeader &header); public: - CLASSDEF + CLASSDEF; CProjectItem(); /** diff --git a/engines/titanic/core/resource_key.h b/engines/titanic/core/resource_key.h index eb08334de7..27b23ed1e7 100644 --- a/engines/titanic/core/resource_key.h +++ b/engines/titanic/core/resource_key.h @@ -35,7 +35,7 @@ private: void setValue(const CString &name); public: - CLASSDEF + CLASSDEF; CResourceKey() {} CResourceKey(const CString &name) { setValue(name); } diff --git a/engines/titanic/core/room_item.h b/engines/titanic/core/room_item.h index bcdc95ebe0..22d6e8b40a 100644 --- a/engines/titanic/core/room_item.h +++ b/engines/titanic/core/room_item.h @@ -46,7 +46,7 @@ public: CResourceKey _exitMovieKey; double _roomDimensionX, _roomDimensionY; public: - CLASSDEF + CLASSDEF; CRoomItem(); /** diff --git a/engines/titanic/core/static_image.h b/engines/titanic/core/static_image.h index 27f861ef55..16cae82ff7 100644 --- a/engines/titanic/core/static_image.h +++ b/engines/titanic/core/static_image.h @@ -30,7 +30,7 @@ namespace Titanic { class CStaticImage : public CGameObject { DECLARE_MESSAGE_MAP public: - CLASSDEF + 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 3754bd413e..85d0215e9b 100644 --- a/engines/titanic/core/tree_item.h +++ b/engines/titanic/core/tree_item.h @@ -45,7 +45,7 @@ private: CTreeItem *_firstChild; int _field14; public: - CLASSDEF + CLASSDEF; CTreeItem(); diff --git a/engines/titanic/core/turn_on_object.h b/engines/titanic/core/turn_on_object.h index 7150069909..67cef9c1ab 100644 --- a/engines/titanic/core/turn_on_object.h +++ b/engines/titanic/core/turn_on_object.h @@ -34,7 +34,7 @@ class CTurnOnObject : public CBackground { protected: CString _msgName; public: - CLASSDEF + CLASSDEF; CTurnOnObject(); /** diff --git a/engines/titanic/core/turn_on_play_sound.h b/engines/titanic/core/turn_on_play_sound.h index 58d33ab78b..1164135071 100644 --- a/engines/titanic/core/turn_on_play_sound.h +++ b/engines/titanic/core/turn_on_play_sound.h @@ -33,7 +33,7 @@ private: int _fieldF8; int _fieldFC; public: - CLASSDEF + CLASSDEF; CTurnOnPlaySound(); /** diff --git a/engines/titanic/core/turn_on_turn_off.h b/engines/titanic/core/turn_on_turn_off.h index 2df8830b0f..adca6876ff 100644 --- a/engines/titanic/core/turn_on_turn_off.h +++ b/engines/titanic/core/turn_on_turn_off.h @@ -35,7 +35,7 @@ private: int _fieldEC; int _fieldF0; public: - CLASSDEF + CLASSDEF; CTurnOnTurnOff(); /** diff --git a/engines/titanic/core/view_item.h b/engines/titanic/core/view_item.h index 4e25c007d9..227319fac6 100644 --- a/engines/titanic/core/view_item.h +++ b/engines/titanic/core/view_item.h @@ -59,7 +59,7 @@ protected: public: int _viewNumber; public: - CLASSDEF + CLASSDEF; CViewItem(); /** diff --git a/engines/titanic/game/announce.h b/engines/titanic/game/announce.h index 3845d96deb..f960241c36 100644 --- a/engines/titanic/game/announce.h +++ b/engines/titanic/game/announce.h @@ -34,7 +34,7 @@ private: int _fieldC4; int _fieldC8; public: - CLASSDEF + CLASSDEF; CAnnounce(); /** diff --git a/engines/titanic/game/annoy_barbot.h b/engines/titanic/game/annoy_barbot.h index e29c0c4ca0..955a82bdf8 100644 --- a/engines/titanic/game/annoy_barbot.h +++ b/engines/titanic/game/annoy_barbot.h @@ -31,7 +31,7 @@ class CAnnoyBarbot : public CGameObject { private: static int _v1; public: - CLASSDEF + 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 42276678e7..b80c988d23 100644 --- a/engines/titanic/game/arb_background.h +++ b/engines/titanic/game/arb_background.h @@ -35,7 +35,7 @@ public: int _fieldE8; int _fieldEC; public: - CLASSDEF + CLASSDEF; CArbBackground(); /** diff --git a/engines/titanic/game/arboretum_gate.h b/engines/titanic/game/arboretum_gate.h index bd41dd13f0..7e07261fbd 100644 --- a/engines/titanic/game/arboretum_gate.h +++ b/engines/titanic/game/arboretum_gate.h @@ -74,7 +74,7 @@ private: int _field150; CString _string2; public: - CLASSDEF + CLASSDEF; CArboretumGate(); /** diff --git a/engines/titanic/game/auto_animate.h b/engines/titanic/game/auto_animate.h index fe704004bb..7bca808bfb 100644 --- a/engines/titanic/game/auto_animate.h +++ b/engines/titanic/game/auto_animate.h @@ -35,7 +35,7 @@ private: int _fieldE4; int _fieldE8; public: - CLASSDEF + CLASSDEF; CAutoAnimate() : CBackground(), _fieldE0(1), _fieldE4(1), _fieldE8(0) {} /** diff --git a/engines/titanic/game/bar_bell.h b/engines/titanic/game/bar_bell.h index 9010012887..5d1d2c54e0 100644 --- a/engines/titanic/game/bar_bell.h +++ b/engines/titanic/game/bar_bell.h @@ -37,7 +37,7 @@ public: int _fieldC8; int _fieldCC; public: - CLASSDEF + CLASSDEF; CBarBell(); /** diff --git a/engines/titanic/game/bar_menu.h b/engines/titanic/game/bar_menu.h index db3c93799b..84c0219084 100644 --- a/engines/titanic/game/bar_menu.h +++ b/engines/titanic/game/bar_menu.h @@ -33,7 +33,7 @@ public: int _fieldC0; int _fieldC4; public: - CLASSDEF + CLASSDEF; CBarMenu(); /** diff --git a/engines/titanic/game/bar_menu_button.h b/engines/titanic/game/bar_menu_button.h index fe7d7d913f..c666df413b 100644 --- a/engines/titanic/game/bar_menu_button.h +++ b/engines/titanic/game/bar_menu_button.h @@ -31,7 +31,7 @@ class CBarMenuButton : public CGameObject { public: int _value; public: - CLASSDEF + CLASSDEF; CBarMenuButton() : CGameObject(), _value(1) {} /** diff --git a/engines/titanic/game/belbot_get_light.h b/engines/titanic/game/belbot_get_light.h index dd6f361384..a3aa0f737e 100644 --- a/engines/titanic/game/belbot_get_light.h +++ b/engines/titanic/game/belbot_get_light.h @@ -31,7 +31,7 @@ class CBelbotGetLight : public CGameObject { private: CString _value; public: - CLASSDEF + 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 9546d00847..4b2a626dc2 100644 --- a/engines/titanic/game/bilge_succubus.h +++ b/engines/titanic/game/bilge_succubus.h @@ -34,7 +34,7 @@ public: int _field1E4; int _field1E8; public: - CLASSDEF + CLASSDEF; CBilgeSuccUBus(); /** diff --git a/engines/titanic/game/bomb.h b/engines/titanic/game/bomb.h index 59351db27c..ab4df16db0 100644 --- a/engines/titanic/game/bomb.h +++ b/engines/titanic/game/bomb.h @@ -42,7 +42,7 @@ private: int _startingTicks; int _field104; public: - CLASSDEF + CLASSDEF; CBomb(); /** diff --git a/engines/titanic/game/bottom_of_well_monitor.h b/engines/titanic/game/bottom_of_well_monitor.h index cae02b9cb8..65424aad70 100644 --- a/engines/titanic/game/bottom_of_well_monitor.h +++ b/engines/titanic/game/bottom_of_well_monitor.h @@ -32,7 +32,7 @@ public: static int _v1, _v2; int _value; public: - CLASSDEF + CLASSDEF; CBottomOfWellMonitor() : _value(1) {} /** diff --git a/engines/titanic/game/bowl_unlocker.h b/engines/titanic/game/bowl_unlocker.h index 9ab9e63048..2559ac2c52 100644 --- a/engines/titanic/game/bowl_unlocker.h +++ b/engines/titanic/game/bowl_unlocker.h @@ -31,7 +31,7 @@ class CBowlUnlocker : public CGameObject { public: int _value; public: - CLASSDEF + CLASSDEF; CBowlUnlocker() : CGameObject(), _value(0) {} /** diff --git a/engines/titanic/game/brain_slot.h b/engines/titanic/game/brain_slot.h index f94ffc7eca..94b6d7f227 100644 --- a/engines/titanic/game/brain_slot.h +++ b/engines/titanic/game/brain_slot.h @@ -34,7 +34,7 @@ public: int _value1; CString _value2; public: - CLASSDEF + CLASSDEF; CBrainSlot() : CGameObject(), _value1(0) {} /** diff --git a/engines/titanic/game/bridge_door.h b/engines/titanic/game/bridge_door.h index f14d6010a4..c1872a29be 100644 --- a/engines/titanic/game/bridge_door.h +++ b/engines/titanic/game/bridge_door.h @@ -29,7 +29,7 @@ namespace Titanic { class CBridgeDoor : public CGameObject { public: - CLASSDEF + 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 be349f3a15..d7c7c35aa9 100644 --- a/engines/titanic/game/bridge_view.h +++ b/engines/titanic/game/bridge_view.h @@ -31,7 +31,7 @@ class CBridgeView : public CBackground { public: int _fieldE0; public: - CLASSDEF + CLASSDEF; CBridgeView() : CBackground(), _fieldE0(0) {} /** diff --git a/engines/titanic/game/broken_pell_base.h b/engines/titanic/game/broken_pell_base.h index d3157fdcff..f62f04d8f8 100644 --- a/engines/titanic/game/broken_pell_base.h +++ b/engines/titanic/game/broken_pell_base.h @@ -35,7 +35,7 @@ private: int _fieldE0; public: - CLASSDEF + CLASSDEF; CBrokenPellBase() : CBackground(), _fieldE0(0) {} /** diff --git a/engines/titanic/game/broken_pellerator.h b/engines/titanic/game/broken_pellerator.h index ebb31d58e1..6fbde91053 100644 --- a/engines/titanic/game/broken_pellerator.h +++ b/engines/titanic/game/broken_pellerator.h @@ -34,7 +34,7 @@ private: CString _string4; CString _string5; public: - CLASSDEF + 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 cc2ed317a4..1df6d2d0b2 100644 --- a/engines/titanic/game/broken_pellerator_froz.h +++ b/engines/titanic/game/broken_pellerator_froz.h @@ -34,7 +34,7 @@ private: CString _string4; CString _string5; public: - CLASSDEF + CLASSDEF; /** * Save the data for the class to file diff --git a/engines/titanic/game/cage.h b/engines/titanic/game/cage.h index 72de9fba7b..bbce978489 100644 --- a/engines/titanic/game/cage.h +++ b/engines/titanic/game/cage.h @@ -32,7 +32,7 @@ public: static int _v1; static int _v2; public: - CLASSDEF + 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 fc8110afdb..7da4b40794 100644 --- a/engines/titanic/game/call_pellerator.h +++ b/engines/titanic/game/call_pellerator.h @@ -29,7 +29,7 @@ namespace Titanic { class CCallPellerator : public CGameObject { public: - CLASSDEF + 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 f817ee709e..549dcbe685 100644 --- a/engines/titanic/game/captains_wheel.h +++ b/engines/titanic/game/captains_wheel.h @@ -36,7 +36,7 @@ public: int _fieldF0; int _fieldF4; public: - CLASSDEF + CLASSDEF; CCaptainsWheel(); /** diff --git a/engines/titanic/game/cdrom.h b/engines/titanic/game/cdrom.h index ece72428bc..9dcb270d74 100644 --- a/engines/titanic/game/cdrom.h +++ b/engines/titanic/game/cdrom.h @@ -38,7 +38,7 @@ class CCDROM : public CGameObject { private: Point _tempPos; public: - CLASSDEF + CLASSDEF; CCDROM(); /** diff --git a/engines/titanic/game/cdrom_computer.h b/engines/titanic/game/cdrom_computer.h index da6e0e778b..90b7b518d1 100644 --- a/engines/titanic/game/cdrom_computer.h +++ b/engines/titanic/game/cdrom_computer.h @@ -34,7 +34,7 @@ class CCDROMComputer : public CGameObject { private: Rect _clickRect; public: - CLASSDEF + CLASSDEF; CCDROMComputer(); /** diff --git a/engines/titanic/game/cdrom_tray.h b/engines/titanic/game/cdrom_tray.h index c91e0450fe..76c7a9a6ad 100644 --- a/engines/titanic/game/cdrom_tray.h +++ b/engines/titanic/game/cdrom_tray.h @@ -37,7 +37,7 @@ public: bool _isOpened; CString _insertedCD; public: - CLASSDEF + CLASSDEF; CCDROMTray(); /** diff --git a/engines/titanic/game/cell_point_button.h b/engines/titanic/game/cell_point_button.h index 0a04350838..6f1fdc3809 100644 --- a/engines/titanic/game/cell_point_button.h +++ b/engines/titanic/game/cell_point_button.h @@ -43,7 +43,7 @@ public: CString _string3; int _field118; public: - CLASSDEF + CLASSDEF; CCellPointButton(); /** diff --git a/engines/titanic/game/chev_code.h b/engines/titanic/game/chev_code.h index df7421e06f..c4552d00a2 100644 --- a/engines/titanic/game/chev_code.h +++ b/engines/titanic/game/chev_code.h @@ -31,7 +31,7 @@ class CChevCode : public CGameObject { public: int _value; public: - CLASSDEF + CLASSDEF; CChevCode() : CGameObject(), _value(0) {} /** diff --git a/engines/titanic/game/chev_panel.h b/engines/titanic/game/chev_panel.h index e53a94e69e..99b5501ac2 100644 --- a/engines/titanic/game/chev_panel.h +++ b/engines/titanic/game/chev_panel.h @@ -33,7 +33,7 @@ public: int _fieldC0; int _fieldC4; public: - CLASSDEF + CLASSDEF; CChevPanel() : _fieldBC(0), _fieldC0(0), _fieldC4(0) {} /** diff --git a/engines/titanic/game/chicken_cooler.h b/engines/titanic/game/chicken_cooler.h index b735b0f9c9..724727b905 100644 --- a/engines/titanic/game/chicken_cooler.h +++ b/engines/titanic/game/chicken_cooler.h @@ -34,7 +34,7 @@ private: int _fieldBC; int _fieldC0; public: - CLASSDEF + CLASSDEF; CChickenCooler() : CGameObject(), _fieldBC(0), _fieldC0(0) {} /** diff --git a/engines/titanic/game/chicken_dispensor.h b/engines/titanic/game/chicken_dispensor.h index 21163c681c..d86b850871 100644 --- a/engines/titanic/game/chicken_dispensor.h +++ b/engines/titanic/game/chicken_dispensor.h @@ -33,7 +33,7 @@ public: int _fieldE4; int _fieldE8; public: - CLASSDEF + CLASSDEF; CChickenDispensor(); /** diff --git a/engines/titanic/game/close_broken_pel.h b/engines/titanic/game/close_broken_pel.h index 252d0895cf..aacda6c002 100644 --- a/engines/titanic/game/close_broken_pel.h +++ b/engines/titanic/game/close_broken_pel.h @@ -31,7 +31,7 @@ class CCloseBrokenPel : public CBackground { public: CString _string3; public: - CLASSDEF + 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 1776ad6055..63af97c6fb 100644 --- a/engines/titanic/game/code_wheel.h +++ b/engines/titanic/game/code_wheel.h @@ -33,7 +33,7 @@ private: int _field10C; int _field110; public: - CLASSDEF + CLASSDEF; CodeWheel(); /** diff --git a/engines/titanic/game/computer.h b/engines/titanic/game/computer.h index e9716aa08a..f64f723733 100644 --- a/engines/titanic/game/computer.h +++ b/engines/titanic/game/computer.h @@ -36,7 +36,7 @@ public: CString _currentCD; int _state; public: - CLASSDEF + CLASSDEF; CComputer() : CBackground(), _currentCD("None"), _state(0) {} /** diff --git a/engines/titanic/game/computer_screen.h b/engines/titanic/game/computer_screen.h index 032c724ba6..1aed01c723 100644 --- a/engines/titanic/game/computer_screen.h +++ b/engines/titanic/game/computer_screen.h @@ -34,7 +34,7 @@ class CComputerScreen : public CGameObject { bool EnterViewMsg(CEnterViewMsg *msg); bool TimerMsg(CTimerMsg *msg); public: - CLASSDEF + CLASSDEF; CComputerScreen(); /** diff --git a/engines/titanic/game/cookie.h b/engines/titanic/game/cookie.h index 72b29dc078..7ae04f1144 100644 --- a/engines/titanic/game/cookie.h +++ b/engines/titanic/game/cookie.h @@ -32,7 +32,7 @@ public: int _value1; int _value2; public: - CLASSDEF + CLASSDEF; CCookie() : CGameObject(), _value1(0), _value2(0) {} /** diff --git a/engines/titanic/game/credits.h b/engines/titanic/game/credits.h index 5b3fe290d6..fa9794b6de 100644 --- a/engines/titanic/game/credits.h +++ b/engines/titanic/game/credits.h @@ -31,7 +31,7 @@ class CCredits : public CGameObject { public: int _fieldBC, _fieldC0; public: - CLASSDEF + CLASSDEF; CCredits(); /** diff --git a/engines/titanic/game/credits_button.h b/engines/titanic/game/credits_button.h index 74fcdc03b5..5e0bf96677 100644 --- a/engines/titanic/game/credits_button.h +++ b/engines/titanic/game/credits_button.h @@ -31,7 +31,7 @@ class CCreditsButton : public CBackground { public: int _fieldE0; public: - CLASSDEF + CLASSDEF; CCreditsButton(); /** diff --git a/engines/titanic/game/dead_area.h b/engines/titanic/game/dead_area.h index 8bffed75ca..05a3f4ed62 100644 --- a/engines/titanic/game/dead_area.h +++ b/engines/titanic/game/dead_area.h @@ -36,7 +36,7 @@ class CDeadArea : public CGameObject { bool MouseButtonDownMsg(CMouseButtonDownMsg *msg) { return true; } bool MouseButtonUpMsg(CMouseButtonUpMsg *msg) { return true; } public: - CLASSDEF + CLASSDEF; CDeadArea(); /** diff --git a/engines/titanic/game/desk_click_responder.h b/engines/titanic/game/desk_click_responder.h index 3967b687db..12825ba9de 100644 --- a/engines/titanic/game/desk_click_responder.h +++ b/engines/titanic/game/desk_click_responder.h @@ -32,7 +32,7 @@ protected: int _fieldD4; int _fieldD8; public: - CLASSDEF + 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 57722c5448..7b39e727e3 100644 --- a/engines/titanic/game/doorbot_elevator_handler.h +++ b/engines/titanic/game/doorbot_elevator_handler.h @@ -34,7 +34,7 @@ private: static int _v1; int _value; public: - CLASSDEF + 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 66cec70ee9..99ba6d37a9 100644 --- a/engines/titanic/game/doorbot_home_handler.h +++ b/engines/titanic/game/doorbot_home_handler.h @@ -29,7 +29,7 @@ namespace Titanic { class CDoorbotHomeHandler : public CGameObject { public: - CLASSDEF + CLASSDEF; CDoorbotHomeHandler(); /** diff --git a/engines/titanic/game/ear_sweet_bowl.h b/engines/titanic/game/ear_sweet_bowl.h index a5386d4da0..3f41950e47 100644 --- a/engines/titanic/game/ear_sweet_bowl.h +++ b/engines/titanic/game/ear_sweet_bowl.h @@ -29,7 +29,7 @@ namespace Titanic { class CEarSweetBowl : public CSweetBowl { public: - CLASSDEF + 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 670670b56f..5f5da8053e 100644 --- a/engines/titanic/game/eject_phonograph_button.h +++ b/engines/titanic/game/eject_phonograph_button.h @@ -34,7 +34,7 @@ public: CString _string3; CString _string4; public: - CLASSDEF + CLASSDEF; CEjectPhonographButton() : CBackground(), _fieldE0(0), _fieldE4(0) {} /** diff --git a/engines/titanic/game/elevator_action_area.h b/engines/titanic/game/elevator_action_area.h index 361f19afb8..6c756fb95f 100644 --- a/engines/titanic/game/elevator_action_area.h +++ b/engines/titanic/game/elevator_action_area.h @@ -31,7 +31,7 @@ class CElevatorActionArea : public CGameObject { public: int _value; public: - CLASSDEF + CLASSDEF; CElevatorActionArea() : CGameObject(), _value(4) {} /** diff --git a/engines/titanic/game/emma_control.h b/engines/titanic/game/emma_control.h index 654d3c5237..721660f61e 100644 --- a/engines/titanic/game/emma_control.h +++ b/engines/titanic/game/emma_control.h @@ -33,7 +33,7 @@ private: CString _wavFile1, _wavFile2; public: - CLASSDEF + CLASSDEF; CEmmaControl() : CBackground(), _wavFile1("b#39.wav"), _wavFile2("b#38.wav") {} /** diff --git a/engines/titanic/game/empty_nut_bowl.h b/engines/titanic/game/empty_nut_bowl.h index 31f31e2339..112e2c6075 100644 --- a/engines/titanic/game/empty_nut_bowl.h +++ b/engines/titanic/game/empty_nut_bowl.h @@ -31,7 +31,7 @@ class CEmptyNutBowl : public CGameObject { public: int _value; public: - CLASSDEF + CLASSDEF; CEmptyNutBowl() : CGameObject(), _value(1) {} /** diff --git a/engines/titanic/game/end_credit_text.h b/engines/titanic/game/end_credit_text.h index 137e51094e..54c6c7ff73 100644 --- a/engines/titanic/game/end_credit_text.h +++ b/engines/titanic/game/end_credit_text.h @@ -31,7 +31,7 @@ class CEndCreditText : public CGameObject { private: int _value; public: - CLASSDEF + CLASSDEF; CEndCreditText() : CGameObject(), _value(0) {} /** diff --git a/engines/titanic/game/end_credits.h b/engines/titanic/game/end_credits.h index 9aad29769a..d160bc94e8 100644 --- a/engines/titanic/game/end_credits.h +++ b/engines/titanic/game/end_credits.h @@ -31,7 +31,7 @@ class CEndCredits : public CGameObject { public: int _value; public: - CLASSDEF + CLASSDEF; CEndCredits() : CGameObject(), _value(0) {} /** diff --git a/engines/titanic/game/end_explode_ship.h b/engines/titanic/game/end_explode_ship.h index 48bbeca897..b8159d3ca7 100644 --- a/engines/titanic/game/end_explode_ship.h +++ b/engines/titanic/game/end_explode_ship.h @@ -31,7 +31,7 @@ class CEndExplodeShip : public CGameObject { public: int _value1, _value2; public: - CLASSDEF + CLASSDEF; CEndExplodeShip() : CGameObject(), _value1(0), _value2(0) {} /** diff --git a/engines/titanic/game/end_game_credits.h b/engines/titanic/game/end_game_credits.h index 5eee5fc7c8..5962950737 100644 --- a/engines/titanic/game/end_game_credits.h +++ b/engines/titanic/game/end_game_credits.h @@ -32,7 +32,7 @@ private: int _fieldBC; Point _pos1; public: - CLASSDEF + CLASSDEF; CEndGameCredits(); /** diff --git a/engines/titanic/game/end_sequence_control.h b/engines/titanic/game/end_sequence_control.h index 0a9d6f0717..35e9a934e1 100644 --- a/engines/titanic/game/end_sequence_control.h +++ b/engines/titanic/game/end_sequence_control.h @@ -31,7 +31,7 @@ namespace Titanic { class CEndSequenceControl : public CGameObject { bool EnterRoomMsg(CEnterRoomMsg *msg); public: - CLASSDEF + CLASSDEF; /** * Save the data for the class to file diff --git a/engines/titanic/game/fan.h b/engines/titanic/game/fan.h index d3cf527b08..2c5a2410a8 100644 --- a/engines/titanic/game/fan.h +++ b/engines/titanic/game/fan.h @@ -31,7 +31,7 @@ class CFan : public CGameObject { public: int _value1, _value2; public: - CLASSDEF + CLASSDEF; CFan() : CGameObject(), _value1(0), _value2(0) {} /** diff --git a/engines/titanic/game/fan_control.h b/engines/titanic/game/fan_control.h index 14b56db152..4d89adb311 100644 --- a/engines/titanic/game/fan_control.h +++ b/engines/titanic/game/fan_control.h @@ -35,7 +35,7 @@ public: int _fieldC8; int _fieldCC; public: - CLASSDEF + CLASSDEF; CFanControl(); /** diff --git a/engines/titanic/game/fan_decrease.h b/engines/titanic/game/fan_decrease.h index 7d0c4a3671..765c7d1560 100644 --- a/engines/titanic/game/fan_decrease.h +++ b/engines/titanic/game/fan_decrease.h @@ -29,7 +29,7 @@ namespace Titanic { class CFanDecrease : public CGameObject { public: - CLASSDEF + 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 e81ff4640f..08ec1322cd 100644 --- a/engines/titanic/game/fan_increase.h +++ b/engines/titanic/game/fan_increase.h @@ -29,7 +29,7 @@ namespace Titanic { class CFanIncrease : public CGameObject { public: - CLASSDEF + 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 f187853097..bb2c35989d 100644 --- a/engines/titanic/game/fan_noises.h +++ b/engines/titanic/game/fan_noises.h @@ -39,7 +39,7 @@ private: int _fieldD0; int _fieldD4; public: - CLASSDEF + CLASSDEF; CFanNoises(); /** diff --git a/engines/titanic/game/floor_indicator.h b/engines/titanic/game/floor_indicator.h index ccd6a8b797..066209e52e 100644 --- a/engines/titanic/game/floor_indicator.h +++ b/engines/titanic/game/floor_indicator.h @@ -29,7 +29,7 @@ namespace Titanic { class CFloorIndicator : public CGameObject { public: - CLASSDEF + 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 8d37186b6d..2b1da70e96 100644 --- a/engines/titanic/game/games_console.h +++ b/engines/titanic/game/games_console.h @@ -31,7 +31,7 @@ class CGamesConsole : public CBackground { public: int _fieldE0; public: - CLASSDEF + CLASSDEF; CGamesConsole() : CBackground(), _fieldE0(0) {} /** diff --git a/engines/titanic/game/get_lift_eye2.h b/engines/titanic/game/get_lift_eye2.h index 7a3caa1283..496784a3c1 100644 --- a/engines/titanic/game/get_lift_eye2.h +++ b/engines/titanic/game/get_lift_eye2.h @@ -32,7 +32,7 @@ class CGetLiftEye2 : public CGameObject { public: static CString *_v1; public: - CLASSDEF + CLASSDEF; static void init(); static void deinit(); diff --git a/engines/titanic/game/glass_smasher.h b/engines/titanic/game/glass_smasher.h index 1c4e703bea..7e38f4e36b 100644 --- a/engines/titanic/game/glass_smasher.h +++ b/engines/titanic/game/glass_smasher.h @@ -29,7 +29,7 @@ namespace Titanic { class CGlassSmasher : public CGameObject { public: - CLASSDEF + 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 e5efaf8a35..a7ea2d4931 100644 --- a/engines/titanic/game/gondolier/gondolier_base.h +++ b/engines/titanic/game/gondolier/gondolier_base.h @@ -40,7 +40,7 @@ private: static int _v9; static int _v10; public: - CLASSDEF + 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 55e5a2ba75..d796917371 100644 --- a/engines/titanic/game/gondolier/gondolier_chest.h +++ b/engines/titanic/game/gondolier/gondolier_chest.h @@ -29,7 +29,7 @@ namespace Titanic { class CGondolierChest : public CGondolierBase { public: - CLASSDEF + 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 03e221e030..71bdd6d444 100644 --- a/engines/titanic/game/gondolier/gondolier_face.h +++ b/engines/titanic/game/gondolier/gondolier_face.h @@ -31,7 +31,7 @@ class CGondolierFace : public CGondolierBase { private: int _fieldBC; public: - CLASSDEF + CLASSDEF; CGondolierFace() : CGondolierBase(), _fieldBC(0) {} /** diff --git a/engines/titanic/game/gondolier/gondolier_mixer.h b/engines/titanic/game/gondolier/gondolier_mixer.h index 0276de16c8..247e520ba6 100644 --- a/engines/titanic/game/gondolier/gondolier_mixer.h +++ b/engines/titanic/game/gondolier/gondolier_mixer.h @@ -39,7 +39,7 @@ private: CString _string2; int _fieldE4; public: - CLASSDEF + CLASSDEF; CGondolierMixer(); /** diff --git a/engines/titanic/game/gondolier/gondolier_slider.h b/engines/titanic/game/gondolier/gondolier_slider.h index c5fd08f8cf..0ae14a91a0 100644 --- a/engines/titanic/game/gondolier/gondolier_slider.h +++ b/engines/titanic/game/gondolier/gondolier_slider.h @@ -48,7 +48,7 @@ private: CString _string3; int _field118; public: - CLASSDEF + CLASSDEF; CGondolierSlider(); /** diff --git a/engines/titanic/game/hammer_clip.h b/engines/titanic/game/hammer_clip.h index 01f419c8e4..7f5c5ab5f8 100644 --- a/engines/titanic/game/hammer_clip.h +++ b/engines/titanic/game/hammer_clip.h @@ -31,7 +31,7 @@ class CHammerClip : public CGameObject { public: int _value; public: - CLASSDEF + CLASSDEF; CHammerClip() : CGameObject(), _value(0) {} /** diff --git a/engines/titanic/game/hammer_dispensor.h b/engines/titanic/game/hammer_dispensor.h index 9a58850e66..e1b30d9045 100644 --- a/engines/titanic/game/hammer_dispensor.h +++ b/engines/titanic/game/hammer_dispensor.h @@ -33,7 +33,7 @@ private: int _fieldE4; int _fieldE8; public: - CLASSDEF + CLASSDEF; CHammerDispensor(); /** diff --git a/engines/titanic/game/hammer_dispensor_button.h b/engines/titanic/game/hammer_dispensor_button.h index 5b91bbd974..36732adb2d 100644 --- a/engines/titanic/game/hammer_dispensor_button.h +++ b/engines/titanic/game/hammer_dispensor_button.h @@ -37,7 +37,7 @@ private: int _field10C; int _field110; public: - CLASSDEF + CLASSDEF; CHammerDispensorButton(); /** diff --git a/engines/titanic/game/head_slot.h b/engines/titanic/game/head_slot.h index b09794774e..0080411033 100644 --- a/engines/titanic/game/head_slot.h +++ b/engines/titanic/game/head_slot.h @@ -41,7 +41,7 @@ public: int _fieldE8; int _fieldEC; public: - CLASSDEF + CLASSDEF; CHeadSlot(); /** diff --git a/engines/titanic/game/head_smash_event.h b/engines/titanic/game/head_smash_event.h index 9e21080a93..912cf36bf3 100644 --- a/engines/titanic/game/head_smash_event.h +++ b/engines/titanic/game/head_smash_event.h @@ -29,7 +29,7 @@ namespace Titanic { class CHeadSmashEvent : public CBackground { public: - CLASSDEF + 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 a35a18c0a6..b8f04d39de 100644 --- a/engines/titanic/game/head_smash_lever.h +++ b/engines/titanic/game/head_smash_lever.h @@ -33,7 +33,7 @@ public: int _fieldE4; int _fieldE8; public: - CLASSDEF + CLASSDEF; CHeadSmashLever(); /** diff --git a/engines/titanic/game/head_spinner.h b/engines/titanic/game/head_spinner.h index 8f1f8c2477..4456070ee4 100644 --- a/engines/titanic/game/head_spinner.h +++ b/engines/titanic/game/head_spinner.h @@ -32,7 +32,7 @@ public: int _value1, _value2; public: CHeadSpinner() : CGameObject(), _value1(0), _value2(0) {} - CLASSDEF + 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 ccee7bc8fd..1d9fcdd176 100644 --- a/engines/titanic/game/idle_summoner.h +++ b/engines/titanic/game/idle_summoner.h @@ -40,7 +40,7 @@ public: int _fieldDC; public: CIdleSummoner(); - CLASSDEF + 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 fe55b9439a..67300b6b17 100644 --- a/engines/titanic/game/leave_sec_class_state.h +++ b/engines/titanic/game/leave_sec_class_state.h @@ -30,7 +30,7 @@ namespace Titanic { class CLeaveSecClassState : public CGameObject { DECLARE_MESSAGE_MAP public: - CLASSDEF + 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 fe5ab529af..d6315ed620 100644 --- a/engines/titanic/game/lemon_dispensor.h +++ b/engines/titanic/game/lemon_dispensor.h @@ -38,7 +38,7 @@ private: int _fieldE8; int _fieldEC; public: - CLASSDEF + CLASSDEF; CLemonDispensor(); /** diff --git a/engines/titanic/game/light.h b/engines/titanic/game/light.h index b919c5f06c..79e4bc400e 100644 --- a/engines/titanic/game/light.h +++ b/engines/titanic/game/light.h @@ -40,7 +40,7 @@ private: int _fieldF8; int _fieldFC; public: - CLASSDEF + CLASSDEF; CLight(); /** diff --git a/engines/titanic/game/light_switch.h b/engines/titanic/game/light_switch.h index c8728e06ff..ce62d7d68c 100644 --- a/engines/titanic/game/light_switch.h +++ b/engines/titanic/game/light_switch.h @@ -37,7 +37,7 @@ private: int _fieldE4; int _fieldE8; public: - CLASSDEF + CLASSDEF; CLightSwitch(); /** diff --git a/engines/titanic/game/little_lift_button.h b/engines/titanic/game/little_lift_button.h index 451c6ced95..b14651f4b8 100644 --- a/engines/titanic/game/little_lift_button.h +++ b/engines/titanic/game/little_lift_button.h @@ -31,7 +31,7 @@ class CLittleLiftButton : public CBackground { private: int _value; public: - CLASSDEF + CLASSDEF; CLittleLiftButton() : CBackground(), _value(0) {} /** diff --git a/engines/titanic/game/long_stick_dispenser.h b/engines/titanic/game/long_stick_dispenser.h index 63066866c7..2a1b86fb84 100644 --- a/engines/titanic/game/long_stick_dispenser.h +++ b/engines/titanic/game/long_stick_dispenser.h @@ -35,7 +35,7 @@ private: int _fieldC0; int _fieldC4; public: - CLASSDEF + CLASSDEF; CLongStickDispenser() : CGameObject(), _fieldBC(0), _fieldC0(0), _fieldC4(1) {} diff --git a/engines/titanic/game/maitred/maitred_arm_holder.h b/engines/titanic/game/maitred/maitred_arm_holder.h index c823bd94cf..3392d60e43 100644 --- a/engines/titanic/game/maitred/maitred_arm_holder.h +++ b/engines/titanic/game/maitred/maitred_arm_holder.h @@ -29,7 +29,7 @@ namespace Titanic { class CMaitreDArmHolder : public CDropTarget { public: - CLASSDEF + 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 52e2ac8fe6..7016c15c71 100644 --- a/engines/titanic/game/maitred/maitred_body.h +++ b/engines/titanic/game/maitred/maitred_body.h @@ -31,7 +31,7 @@ class CMaitreDBody : public CMaitreDProdReceptor { private: int _fieldC8; public: - CLASSDEF + CLASSDEF; CMaitreDBody() : CMaitreDProdReceptor(), _fieldC8(1) {} /** diff --git a/engines/titanic/game/maitred/maitred_legs.h b/engines/titanic/game/maitred/maitred_legs.h index 5ee9482d18..24ba01e712 100644 --- a/engines/titanic/game/maitred/maitred_legs.h +++ b/engines/titanic/game/maitred/maitred_legs.h @@ -31,7 +31,7 @@ class CMaitreDLegs : public CMaitreDProdReceptor { private: int _fieldC8; public: - CLASSDEF + CLASSDEF; CMaitreDLegs() : CMaitreDProdReceptor(), _fieldC8(1) {} /** diff --git a/engines/titanic/game/maitred/maitred_prod_receptor.h b/engines/titanic/game/maitred/maitred_prod_receptor.h index 5138d46e6e..f3a547b8ef 100644 --- a/engines/titanic/game/maitred/maitred_prod_receptor.h +++ b/engines/titanic/game/maitred/maitred_prod_receptor.h @@ -33,7 +33,7 @@ protected: int _fieldC0; int _fieldC4; public: - CLASSDEF + CLASSDEF; CMaitreDProdReceptor() : CGameObject(), _fieldBC(0), _fieldC0(0), _fieldC4(1) {} diff --git a/engines/titanic/game/missiveomat.h b/engines/titanic/game/missiveomat.h index 1b7850ff3d..7fde8cf25d 100644 --- a/engines/titanic/game/missiveomat.h +++ b/engines/titanic/game/missiveomat.h @@ -36,7 +36,7 @@ public: CString _string2; int _fieldE0; public: - CLASSDEF + CLASSDEF; CMissiveOMat(); /** diff --git a/engines/titanic/game/missiveomat_button.h b/engines/titanic/game/missiveomat_button.h index eb00b7e2a2..d36f5bd958 100644 --- a/engines/titanic/game/missiveomat_button.h +++ b/engines/titanic/game/missiveomat_button.h @@ -31,7 +31,7 @@ class CMissiveOMatButton : public CEditControl { public: int _fieldFC; public: - CLASSDEF + CLASSDEF; CMissiveOMatButton() : CEditControl(), _fieldFC(2) {} /** diff --git a/engines/titanic/game/movie_tester.h b/engines/titanic/game/movie_tester.h index cf39ae3f61..de2ef2cc5e 100644 --- a/engines/titanic/game/movie_tester.h +++ b/engines/titanic/game/movie_tester.h @@ -31,7 +31,7 @@ class CMovieTester : public CGameObject { public: int _value1, _value2; public: - CLASSDEF + CLASSDEF; CMovieTester() : CGameObject(), _value1(0), _value2(0) {} /** diff --git a/engines/titanic/game/music_console_button.h b/engines/titanic/game/music_console_button.h index 1a1861b36b..8e05b698d7 100644 --- a/engines/titanic/game/music_console_button.h +++ b/engines/titanic/game/music_console_button.h @@ -29,7 +29,7 @@ namespace Titanic { class CMusicConsoleButton : public CMusicPlayer { public: - CLASSDEF + 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 dcc7267cde..58afe7f427 100644 --- a/engines/titanic/game/music_room_phonograph.h +++ b/engines/titanic/game/music_room_phonograph.h @@ -32,7 +32,7 @@ class CMusicRoomPhonograph : public CRestaurantPhonograph { private: int _field118; public: - CLASSDEF + CLASSDEF; CMusicRoomPhonograph() : CRestaurantPhonograph(), _field118(0) {} /** diff --git a/engines/titanic/game/music_room_stop_phonograph_button.h b/engines/titanic/game/music_room_stop_phonograph_button.h index 81cd755526..7260e5aaab 100644 --- a/engines/titanic/game/music_room_stop_phonograph_button.h +++ b/engines/titanic/game/music_room_stop_phonograph_button.h @@ -31,7 +31,7 @@ class CMusicRoomStopPhonographButton : public CEjectPhonographButton { private: int _field100; public: - CLASSDEF + CLASSDEF; CMusicRoomStopPhonographButton() : CEjectPhonographButton(), _field100(0) {} /** diff --git a/engines/titanic/game/music_system_lock.h b/engines/titanic/game/music_system_lock.h index ad722caccf..ff826f5c77 100644 --- a/engines/titanic/game/music_system_lock.h +++ b/engines/titanic/game/music_system_lock.h @@ -31,7 +31,7 @@ class CMusicSystemLock : public CDropTarget { private: int _value; public: - CLASSDEF + CLASSDEF; CMusicSystemLock() : CDropTarget(), _value(0) {} /** diff --git a/engines/titanic/game/musical_instrument.h b/engines/titanic/game/musical_instrument.h index 273770c2e6..8b534606e0 100644 --- a/engines/titanic/game/musical_instrument.h +++ b/engines/titanic/game/musical_instrument.h @@ -30,7 +30,7 @@ namespace Titanic { class CMusicalInstrument : public CBackground { DECLARE_MESSAGE_MAP public: - CLASSDEF + 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 5e17622b65..74caa52534 100644 --- a/engines/titanic/game/nav_helmet.h +++ b/engines/titanic/game/nav_helmet.h @@ -31,7 +31,7 @@ class CNavHelmet : public CGameObject { private: int _value; public: - CLASSDEF + CLASSDEF; CNavHelmet() : CGameObject(), _value(0) {} /** diff --git a/engines/titanic/game/navigation_computer.h b/engines/titanic/game/navigation_computer.h index f24cbada34..6de75437a5 100644 --- a/engines/titanic/game/navigation_computer.h +++ b/engines/titanic/game/navigation_computer.h @@ -30,7 +30,7 @@ namespace Titanic { class CNavigationComputer : public CGameObject { DECLARE_MESSAGE_MAP public: - CLASSDEF + 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 5cb3aa2c43..548b324869 100644 --- a/engines/titanic/game/no_nut_bowl.h +++ b/engines/titanic/game/no_nut_bowl.h @@ -29,7 +29,7 @@ namespace Titanic { class CNoNutBowl : public CBackground { public: - CLASSDEF + 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 6e25835465..b8cca95869 100644 --- a/engines/titanic/game/nose_holder.h +++ b/engines/titanic/game/nose_holder.h @@ -32,7 +32,7 @@ private: int _field118; int _field11C; public: - CLASSDEF + CLASSDEF; CNoseHolder(); /** diff --git a/engines/titanic/game/null_port_hole.h b/engines/titanic/game/null_port_hole.h index 3170a84b39..2924aff9f5 100644 --- a/engines/titanic/game/null_port_hole.h +++ b/engines/titanic/game/null_port_hole.h @@ -30,7 +30,7 @@ namespace Titanic { class CNullPortHole : public CClickResponder { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CNullPortHole(); /** diff --git a/engines/titanic/game/nut_replacer.h b/engines/titanic/game/nut_replacer.h index 6a8e014751..ead9713801 100644 --- a/engines/titanic/game/nut_replacer.h +++ b/engines/titanic/game/nut_replacer.h @@ -29,7 +29,7 @@ namespace Titanic { class CNutReplacer : public CGameObject { public: - CLASSDEF + 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 9f5ddcab75..d2fa4a1801 100644 --- a/engines/titanic/game/parrot/parrot_lobby_controller.h +++ b/engines/titanic/game/parrot/parrot_lobby_controller.h @@ -29,7 +29,7 @@ namespace Titanic { class CParrotLobbyController : public CParrotLobbyObject { public: - CLASSDEF + 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 a433f0be84..0470a62dee 100644 --- a/engines/titanic/game/parrot/parrot_lobby_link_updater.h +++ b/engines/titanic/game/parrot/parrot_lobby_link_updater.h @@ -31,7 +31,7 @@ class CParrotLobbyLinkUpdater : public CParrotLobbyObject { public: int _fieldBC; public: - CLASSDEF + CLASSDEF; CParrotLobbyLinkUpdater() : CParrotLobbyObject(), _fieldBC(1) {} /** diff --git a/engines/titanic/game/parrot/parrot_lobby_object.h b/engines/titanic/game/parrot/parrot_lobby_object.h index 967ad23fd8..dfb6592325 100644 --- a/engines/titanic/game/parrot/parrot_lobby_object.h +++ b/engines/titanic/game/parrot/parrot_lobby_object.h @@ -37,7 +37,7 @@ public: static void init(); public: - CLASSDEF + 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 656924ff9f..3179bb962d 100644 --- a/engines/titanic/game/parrot/parrot_lobby_view_object.h +++ b/engines/titanic/game/parrot/parrot_lobby_view_object.h @@ -31,7 +31,7 @@ class CParrotLobbyViewObject : public CParrotLobbyObject { public: int _fieldBC; public: - CLASSDEF + CLASSDEF; CParrotLobbyViewObject() : CParrotLobbyObject(), _fieldBC(1) {} /** diff --git a/engines/titanic/game/parrot/parrot_loser.h b/engines/titanic/game/parrot/parrot_loser.h index c1e6c9fddd..819fd6614c 100644 --- a/engines/titanic/game/parrot/parrot_loser.h +++ b/engines/titanic/game/parrot/parrot_loser.h @@ -29,7 +29,7 @@ namespace Titanic { class CParrotLoser : public CGameObject { public: - CLASSDEF + 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 34be83a918..d8395bb65a 100644 --- a/engines/titanic/game/parrot/parrot_nut_bowl_actor.h +++ b/engines/titanic/game/parrot/parrot_nut_bowl_actor.h @@ -31,7 +31,7 @@ class CParrotNutBowlActor : public CGameObject { public: int _value1, _value2; public: - CLASSDEF + CLASSDEF; CParrotNutBowlActor(); /** diff --git a/engines/titanic/game/parrot/parrot_nut_eater.h b/engines/titanic/game/parrot/parrot_nut_eater.h index fe0a3aeb0f..5dcb01ca11 100644 --- a/engines/titanic/game/parrot/parrot_nut_eater.h +++ b/engines/titanic/game/parrot/parrot_nut_eater.h @@ -35,7 +35,7 @@ public: int _fieldC8; int _fieldCC; public: - CLASSDEF + CLASSDEF; CParrotNutEater(); /** diff --git a/engines/titanic/game/parrot/parrot_perch_holder.h b/engines/titanic/game/parrot/parrot_perch_holder.h index 8c7a441001..ff618f09dc 100644 --- a/engines/titanic/game/parrot/parrot_perch_holder.h +++ b/engines/titanic/game/parrot/parrot_perch_holder.h @@ -29,7 +29,7 @@ namespace Titanic { class CParrotPerchHolder : public CMultiDropTarget { public: - CLASSDEF + 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 7984cc6a8c..6f5d9e602a 100644 --- a/engines/titanic/game/parrot/parrot_succubus.h +++ b/engines/titanic/game/parrot/parrot_succubus.h @@ -35,7 +35,7 @@ public: int _field1F0; int _field1F4; public: - CLASSDEF + CLASSDEF; CParrotSuccUBus(); /** diff --git a/engines/titanic/game/parrot/parrot_trigger.h b/engines/titanic/game/parrot/parrot_trigger.h index f2d1d7e904..28a1663fa8 100644 --- a/engines/titanic/game/parrot/parrot_trigger.h +++ b/engines/titanic/game/parrot/parrot_trigger.h @@ -31,7 +31,7 @@ class CParrotTrigger : public CGameObject { public: int _value; public: - CLASSDEF + CLASSDEF; CParrotTrigger() : CGameObject(), _value(0x446AB) {} /** diff --git a/engines/titanic/game/parrot/player_meets_parrot.h b/engines/titanic/game/parrot/player_meets_parrot.h index 0a720993a5..9cee9ee322 100644 --- a/engines/titanic/game/parrot/player_meets_parrot.h +++ b/engines/titanic/game/parrot/player_meets_parrot.h @@ -32,7 +32,7 @@ class CPlayerMeetsParrot : public CGameObject { protected: bool EnterRoomMsg(CEnterRoomMsg *msg); public: - CLASSDEF + 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 de62294994..cdad649401 100644 --- a/engines/titanic/game/pet/pet.h +++ b/engines/titanic/game/pet/pet.h @@ -37,7 +37,7 @@ public: int _fieldD8; int _fieldDC; public: - CLASSDEF + CLASSDEF; CPET(); /** diff --git a/engines/titanic/game/pet/pet_class1.h b/engines/titanic/game/pet/pet_class1.h index aeb01adc7c..ad97f45bb2 100644 --- a/engines/titanic/game/pet/pet_class1.h +++ b/engines/titanic/game/pet/pet_class1.h @@ -30,7 +30,7 @@ namespace Titanic { class CPETClass1 : public CGameObject { DECLARE_MESSAGE_MAP public: - CLASSDEF + 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 aa85397385..6ae78f4db8 100644 --- a/engines/titanic/game/pet/pet_class2.h +++ b/engines/titanic/game/pet/pet_class2.h @@ -30,7 +30,7 @@ namespace Titanic { class CPETClass2 : public CGameObject { DECLARE_MESSAGE_MAP public: - CLASSDEF + 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 733186a096..780cad3b6c 100644 --- a/engines/titanic/game/pet/pet_class3.h +++ b/engines/titanic/game/pet/pet_class3.h @@ -30,7 +30,7 @@ namespace Titanic { class CPETClass3 : public CGameObject { DECLARE_MESSAGE_MAP public: - CLASSDEF + 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 9bdf5313d0..88b4e1c029 100644 --- a/engines/titanic/game/pet/pet_lift.h +++ b/engines/titanic/game/pet/pet_lift.h @@ -29,7 +29,7 @@ namespace Titanic { class CPETLift : public CPETTransport { public: - CLASSDEF + 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 140c17b825..3fc50bdf63 100644 --- a/engines/titanic/game/pet/pet_monitor.h +++ b/engines/titanic/game/pet/pet_monitor.h @@ -32,7 +32,7 @@ class CPETMonitor : public CGameObject { DECLARE_MESSAGE_MAP bool EnterRoomMsg(CEnterRoomMsg *msg); public: - CLASSDEF + 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 31b44e337b..9b90c9af28 100644 --- a/engines/titanic/game/pet/pet_pellerator.h +++ b/engines/titanic/game/pet/pet_pellerator.h @@ -29,7 +29,7 @@ namespace Titanic { class CPETPellerator : public CPETTransport { public: - CLASSDEF + 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 63c0bf215f..9419684823 100644 --- a/engines/titanic/game/pet/pet_position.h +++ b/engines/titanic/game/pet/pet_position.h @@ -32,7 +32,7 @@ class CPETPosition : public CGameObject { DECLARE_MESSAGE_MAP bool EnterRoomMsg(CEnterRoomMsg *msg); public: - CLASSDEF + 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 8b1e992ebf..f7f9fef0ba 100644 --- a/engines/titanic/game/pet/pet_sentinal.h +++ b/engines/titanic/game/pet/pet_sentinal.h @@ -29,7 +29,7 @@ namespace Titanic { class CPETSentinal : public CGameObject { public: - CLASSDEF + 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 3513da5535..1d3acdb5f3 100644 --- a/engines/titanic/game/pet/pet_sounds.h +++ b/engines/titanic/game/pet/pet_sounds.h @@ -31,7 +31,7 @@ class CPETSounds : public CGameObject { public: int _value; public: - CLASSDEF + CLASSDEF; CPETSounds() : CGameObject(), _value(0) {} /** diff --git a/engines/titanic/game/pet/pet_transition.h b/engines/titanic/game/pet/pet_transition.h index 9e4a62875d..4abf16d509 100644 --- a/engines/titanic/game/pet/pet_transition.h +++ b/engines/titanic/game/pet/pet_transition.h @@ -29,7 +29,7 @@ namespace Titanic { class CPETTransition : public CGameObject { public: - CLASSDEF + 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 e580ab8616..44beafebc8 100644 --- a/engines/titanic/game/pet/pet_transport.h +++ b/engines/titanic/game/pet/pet_transport.h @@ -32,7 +32,7 @@ class CPETTransport : public CGameObject { DECLARE_MESSAGE_MAP virtual bool EnterRoomMsg(CEnterRoomMsg *msg); public: - CLASSDEF + 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 5928d44921..92b4dff0a8 100644 --- a/engines/titanic/game/pet_disabler.h +++ b/engines/titanic/game/pet_disabler.h @@ -31,7 +31,7 @@ class CPetDisabler : public CGameObject { public: CString _value; public: - CLASSDEF + CLASSDEF; CPetDisabler() : CGameObject() {} /** diff --git a/engines/titanic/game/phonograph.h b/engines/titanic/game/phonograph.h index e0f407b251..274d4ba367 100644 --- a/engines/titanic/game/phonograph.h +++ b/engines/titanic/game/phonograph.h @@ -39,7 +39,7 @@ protected: int _fieldF0; int _fieldF4; public: - CLASSDEF + CLASSDEF; CPhonograph(); /** diff --git a/engines/titanic/game/phonograph_lid.h b/engines/titanic/game/phonograph_lid.h index 486a9b4b84..ab32be268b 100644 --- a/engines/titanic/game/phonograph_lid.h +++ b/engines/titanic/game/phonograph_lid.h @@ -31,7 +31,7 @@ class CPhonographLid : public CGameObject { private: int _value; public: - CLASSDEF + CLASSDEF; CPhonographLid() : CGameObject(), _value(0) {} /** diff --git a/engines/titanic/game/pickup/pick_up.h b/engines/titanic/game/pickup/pick_up.h index 76537d1e74..f0b6794442 100644 --- a/engines/titanic/game/pickup/pick_up.h +++ b/engines/titanic/game/pickup/pick_up.h @@ -31,7 +31,7 @@ class CPickUp : public CGameObject { private: int _fieldBC; public: - CLASSDEF + CLASSDEF; CPickUp() : CGameObject(), _fieldBC(0) {} /** diff --git a/engines/titanic/game/pickup/pick_up_bar_glass.h b/engines/titanic/game/pickup/pick_up_bar_glass.h index f9bcb00192..b5ef6f5a47 100644 --- a/engines/titanic/game/pickup/pick_up_bar_glass.h +++ b/engines/titanic/game/pickup/pick_up_bar_glass.h @@ -29,7 +29,7 @@ namespace Titanic { class CPickUpBarGlass : public CPickUp { public: - CLASSDEF + 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 68bec367d4..80ccedc845 100644 --- a/engines/titanic/game/pickup/pick_up_hose.h +++ b/engines/titanic/game/pickup/pick_up_hose.h @@ -33,7 +33,7 @@ private: CString _string1; public: - CLASSDEF + 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 9bed9ceb73..0312c71012 100644 --- a/engines/titanic/game/pickup/pick_up_lemon.h +++ b/engines/titanic/game/pickup/pick_up_lemon.h @@ -29,7 +29,7 @@ namespace Titanic { class CPickUpLemon : public CPickUp { public: - CLASSDEF + 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 a74566b4d5..29dce04fb3 100644 --- a/engines/titanic/game/pickup/pick_up_speech_centre.h +++ b/engines/titanic/game/pickup/pick_up_speech_centre.h @@ -29,7 +29,7 @@ namespace Titanic { class CPickUpSpeechCentre : public CPickUp { public: - CLASSDEF + 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 059c4f85b0..4f808f73c5 100644 --- a/engines/titanic/game/pickup/pick_up_vis_centre.h +++ b/engines/titanic/game/pickup/pick_up_vis_centre.h @@ -29,7 +29,7 @@ namespace Titanic { class CPickUpVisCentre : public CPickUp { public: - CLASSDEF + 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 7cb4478d8a..a53ef2633f 100644 --- a/engines/titanic/game/placeholder/bar_shelf_vis_centre.h +++ b/engines/titanic/game/placeholder/bar_shelf_vis_centre.h @@ -31,7 +31,7 @@ class CBarShelfVisCentre : public CPlaceHolderItem { private: int _value; public: - CLASSDEF + CLASSDEF; CBarShelfVisCentre() : CPlaceHolderItem(), _value(0) {} /** diff --git a/engines/titanic/game/placeholder/lemon_on_bar.h b/engines/titanic/game/placeholder/lemon_on_bar.h index 030481e9ea..92dd54c49b 100644 --- a/engines/titanic/game/placeholder/lemon_on_bar.h +++ b/engines/titanic/game/placeholder/lemon_on_bar.h @@ -31,7 +31,7 @@ class CLemonOnBar : public CPlaceHolderItem { private: Point _pos1; public: - CLASSDEF + CLASSDEF; /** * Save the data for the class to file diff --git a/engines/titanic/game/placeholder/place_holder_item.h b/engines/titanic/game/placeholder/place_holder_item.h index 72f49c0a8a..de04a64bf7 100644 --- a/engines/titanic/game/placeholder/place_holder_item.h +++ b/engines/titanic/game/placeholder/place_holder_item.h @@ -29,7 +29,7 @@ namespace Titanic { class CPlaceHolderItem : public CGameObject { public: - CLASSDEF + 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 ffe8109a9b..d41d972e73 100644 --- a/engines/titanic/game/placeholder/tv_on_bar.h +++ b/engines/titanic/game/placeholder/tv_on_bar.h @@ -31,7 +31,7 @@ class CTVOnBar : public CPlaceHolderItem { private: Point _pos1; public: - CLASSDEF + 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 8ae32dc8c2..4e3474181c 100644 --- a/engines/titanic/game/play_music_button.h +++ b/engines/titanic/game/play_music_button.h @@ -32,7 +32,7 @@ public: int _fieldE0; int _fieldE4; public: - CLASSDEF + CLASSDEF; CPlayMusicButton() : CBackground(), _fieldE0(0), _fieldE4(0) {} /** diff --git a/engines/titanic/game/play_on_act.h b/engines/titanic/game/play_on_act.h index bd6060077a..197e647943 100644 --- a/engines/titanic/game/play_on_act.h +++ b/engines/titanic/game/play_on_act.h @@ -29,7 +29,7 @@ namespace Titanic { class CPlayOnAct : public CBackground { public: - CLASSDEF + 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 4e952cc369..7bba18d12a 100644 --- a/engines/titanic/game/port_hole.h +++ b/engines/titanic/game/port_hole.h @@ -32,7 +32,7 @@ private: int _fieldBC; CString _string1, _string2; public: - CLASSDEF + CLASSDEF; CPortHole(); /** diff --git a/engines/titanic/game/record_phonograph_button.h b/engines/titanic/game/record_phonograph_button.h index 9750b7d42e..3383c01e31 100644 --- a/engines/titanic/game/record_phonograph_button.h +++ b/engines/titanic/game/record_phonograph_button.h @@ -31,7 +31,7 @@ class CRecordPhonographButton : public CBackground { public: int _value; public: - CLASSDEF + CLASSDEF; CRecordPhonographButton() : CBackground(), _value(0) {} /** diff --git a/engines/titanic/game/replacement_ear.h b/engines/titanic/game/replacement_ear.h index 59d291f231..0d282b7fb4 100644 --- a/engines/titanic/game/replacement_ear.h +++ b/engines/titanic/game/replacement_ear.h @@ -29,7 +29,7 @@ namespace Titanic { class CReplacementEar : public CBackground { public: - CLASSDEF + 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 a0927fafe1..a3532c7d14 100644 --- a/engines/titanic/game/reserved_table.h +++ b/engines/titanic/game/reserved_table.h @@ -31,7 +31,7 @@ class CReservedTable : public CGameObject { public: int _value1, _value2; public: - CLASSDEF + CLASSDEF; CReservedTable() : CGameObject(), _value1(0), _value2(0) {} /** diff --git a/engines/titanic/game/restaurant_cylinder_holder.h b/engines/titanic/game/restaurant_cylinder_holder.h index d679dd1aa3..3aa979b0a5 100644 --- a/engines/titanic/game/restaurant_cylinder_holder.h +++ b/engines/titanic/game/restaurant_cylinder_holder.h @@ -37,7 +37,7 @@ private: CString _string6; int _field140; public: - CLASSDEF + CLASSDEF; CRestaurantCylinderHolder(); /** diff --git a/engines/titanic/game/restaurant_phonograph.h b/engines/titanic/game/restaurant_phonograph.h index 62434977be..710a2edd73 100644 --- a/engines/titanic/game/restaurant_phonograph.h +++ b/engines/titanic/game/restaurant_phonograph.h @@ -34,7 +34,7 @@ private: CString _string3; int _field114; public: - CLASSDEF + CLASSDEF; CRestaurantPhonograph(); /** diff --git a/engines/titanic/game/sauce_dispensor.h b/engines/titanic/game/sauce_dispensor.h index f87420b489..aa177050d5 100644 --- a/engines/titanic/game/sauce_dispensor.h +++ b/engines/titanic/game/sauce_dispensor.h @@ -37,7 +37,7 @@ public: int _field104; int _field108; public: - CLASSDEF + CLASSDEF; CSauceDispensor(); /** diff --git a/engines/titanic/game/search_point.h b/engines/titanic/game/search_point.h index 057bb4d2aa..3c5639b104 100644 --- a/engines/titanic/game/search_point.h +++ b/engines/titanic/game/search_point.h @@ -31,7 +31,7 @@ class CSearchPoint : public CGameObject { public: int _value; public: - CLASSDEF + CLASSDEF; CSearchPoint() : CGameObject(), _value(2) {} /** diff --git a/engines/titanic/game/season_background.h b/engines/titanic/game/season_background.h index c89e6a6ba4..f0fd2cdc63 100644 --- a/engines/titanic/game/season_background.h +++ b/engines/titanic/game/season_background.h @@ -34,7 +34,7 @@ public: int _fieldE8; int _fieldEC; public: - CLASSDEF + CLASSDEF; CSeasonBackground(); /** diff --git a/engines/titanic/game/season_barrel.h b/engines/titanic/game/season_barrel.h index 145dfa02b2..f77864599d 100644 --- a/engines/titanic/game/season_barrel.h +++ b/engines/titanic/game/season_barrel.h @@ -32,7 +32,7 @@ public: int _fieldE0; int _fieldE4; public: - CLASSDEF + CLASSDEF; CSeasonBarrel() : CBackground(), _fieldE0(0), _fieldE4(7) {} /** diff --git a/engines/titanic/game/seasonal_adjustment.h b/engines/titanic/game/seasonal_adjustment.h index 4f251ad764..39132d614d 100644 --- a/engines/titanic/game/seasonal_adjustment.h +++ b/engines/titanic/game/seasonal_adjustment.h @@ -32,7 +32,7 @@ public: int _fieldE0; int _fieldE4; public: - CLASSDEF + CLASSDEF; CSeasonalAdjustment() : CBackground(), _fieldE0(0), _fieldE4(0) {} /** diff --git a/engines/titanic/game/service_elevator_window.h b/engines/titanic/game/service_elevator_window.h index 08150238cc..4233b8405a 100644 --- a/engines/titanic/game/service_elevator_window.h +++ b/engines/titanic/game/service_elevator_window.h @@ -34,7 +34,7 @@ public: int _fieldE8; int _fieldEC; public: - CLASSDEF + CLASSDEF; CServiceElevatorWindow(); /** diff --git a/engines/titanic/game/sgt/armchair.h b/engines/titanic/game/sgt/armchair.h index 5dfd94d095..b5505554f0 100644 --- a/engines/titanic/game/sgt/armchair.h +++ b/engines/titanic/game/sgt/armchair.h @@ -29,7 +29,7 @@ namespace Titanic { class CArmchair : public CSGTStateRoom { public: - CLASSDEF + 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 950bdb8241..e4a36eb841 100644 --- a/engines/titanic/game/sgt/basin.h +++ b/engines/titanic/game/sgt/basin.h @@ -29,7 +29,7 @@ namespace Titanic { class CBasin : public CSGTStateRoom { public: - CLASSDEF + 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 db1e1dd031..df3db42d6d 100644 --- a/engines/titanic/game/sgt/bedfoot.h +++ b/engines/titanic/game/sgt/bedfoot.h @@ -29,7 +29,7 @@ namespace Titanic { class CBedfoot : public CSGTStateRoom { public: - CLASSDEF + 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 b938dcd795..f1ba31786c 100644 --- a/engines/titanic/game/sgt/bedhead.h +++ b/engines/titanic/game/sgt/bedhead.h @@ -29,7 +29,7 @@ namespace Titanic { class CBedhead : public CSGTStateRoom { public: - CLASSDEF + 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 5b72f3eef3..16a1bf8fea 100644 --- a/engines/titanic/game/sgt/chest_of_drawers.h +++ b/engines/titanic/game/sgt/chest_of_drawers.h @@ -29,7 +29,7 @@ namespace Titanic { class CChestOfDrawers : public CSGTStateRoom { public: - CLASSDEF + 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 d35417c599..77b5fa17af 100644 --- a/engines/titanic/game/sgt/desk.h +++ b/engines/titanic/game/sgt/desk.h @@ -29,7 +29,7 @@ namespace Titanic { class CDesk : public CSGTStateRoom { public: - CLASSDEF + 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 38e4d6de5d..5181b650d2 100644 --- a/engines/titanic/game/sgt/deskchair.h +++ b/engines/titanic/game/sgt/deskchair.h @@ -29,7 +29,7 @@ namespace Titanic { class CDeskchair : public CSGTStateRoom { public: - CLASSDEF + 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 4f68b1b5ad..c079be389f 100644 --- a/engines/titanic/game/sgt/drawer.h +++ b/engines/titanic/game/sgt/drawer.h @@ -31,7 +31,7 @@ class CDrawer : public CSGTStateRoom { private: int _fieldF4; public: - CLASSDEF + CLASSDEF; CDrawer(); /** diff --git a/engines/titanic/game/sgt/sgt_doors.h b/engines/titanic/game/sgt/sgt_doors.h index 11825c069b..4b4f4a3153 100644 --- a/engines/titanic/game/sgt/sgt_doors.h +++ b/engines/titanic/game/sgt/sgt_doors.h @@ -31,7 +31,7 @@ class CSGTDoors : public CGameObject { public: int _value1, _value2; public: - CLASSDEF + CLASSDEF; CSGTDoors() : CGameObject(), _value1(0), _value2(0) {} /** diff --git a/engines/titanic/game/sgt/sgt_nav.h b/engines/titanic/game/sgt/sgt_nav.h index 39b267fc9c..40fdc4eff1 100644 --- a/engines/titanic/game/sgt/sgt_nav.h +++ b/engines/titanic/game/sgt/sgt_nav.h @@ -29,7 +29,7 @@ namespace Titanic { class SGTNav : public CSGTStateRoom { public: - CLASSDEF + 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 ac8c475cce..6d24fe6761 100644 --- a/engines/titanic/game/sgt/sgt_navigation.h +++ b/engines/titanic/game/sgt/sgt_navigation.h @@ -37,7 +37,7 @@ class CSGTNavigation : public CGameObject { private: static CSGTNavigationStatics *_statics; public: - CLASSDEF + CLASSDEF; static void init(); static void deinit(); diff --git a/engines/titanic/game/sgt/sgt_restaurant_doors.h b/engines/titanic/game/sgt/sgt_restaurant_doors.h index e740db6246..2a10d8f059 100644 --- a/engines/titanic/game/sgt/sgt_restaurant_doors.h +++ b/engines/titanic/game/sgt/sgt_restaurant_doors.h @@ -31,7 +31,7 @@ class CSGTRestaurantDoors : public CGameObject { private: int _fieldBC; public: - CLASSDEF + CLASSDEF; CSGTRestaurantDoors() : CGameObject(), _fieldBC(0) {} /** diff --git a/engines/titanic/game/sgt/sgt_state_control.h b/engines/titanic/game/sgt/sgt_state_control.h index af51274355..49fd5113cd 100644 --- a/engines/titanic/game/sgt/sgt_state_control.h +++ b/engines/titanic/game/sgt/sgt_state_control.h @@ -31,7 +31,7 @@ class CSGTStateControl : public CBackground { private: int _fieldE0; public: - CLASSDEF + CLASSDEF; CSGTStateControl() : CBackground(), _fieldE0(1) {} /** diff --git a/engines/titanic/game/sgt/sgt_state_room.h b/engines/titanic/game/sgt/sgt_state_room.h index 1809ec8ee2..ee9079943b 100644 --- a/engines/titanic/game/sgt/sgt_state_room.h +++ b/engines/titanic/game/sgt/sgt_state_room.h @@ -57,7 +57,7 @@ private: int _fieldEC; int _fieldF0; public: - CLASSDEF + CLASSDEF; CSGTStateRoom(); static void init(); static void deinit(); diff --git a/engines/titanic/game/sgt/sgt_tv.h b/engines/titanic/game/sgt/sgt_tv.h index e97f97427a..90fed90efe 100644 --- a/engines/titanic/game/sgt/sgt_tv.h +++ b/engines/titanic/game/sgt/sgt_tv.h @@ -29,7 +29,7 @@ namespace Titanic { class CSGTTV : public CSGTStateRoom { public: - CLASSDEF + 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 3289b88f43..fc8c6c2bf1 100644 --- a/engines/titanic/game/sgt/sgt_upper_doors_sound.h +++ b/engines/titanic/game/sgt/sgt_upper_doors_sound.h @@ -29,7 +29,7 @@ namespace Titanic { class CSGTUpperDoorsSound : public CClickResponder { public: - CLASSDEF + CLASSDEF; CSGTUpperDoorsSound(); /** diff --git a/engines/titanic/game/sgt/toilet.h b/engines/titanic/game/sgt/toilet.h index d0d2851367..d87531ad7a 100644 --- a/engines/titanic/game/sgt/toilet.h +++ b/engines/titanic/game/sgt/toilet.h @@ -29,7 +29,7 @@ namespace Titanic { class CToilet : public CSGTStateRoom { public: - CLASSDEF + 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 ec3662b9ee..8aa35acdf5 100644 --- a/engines/titanic/game/sgt/vase.h +++ b/engines/titanic/game/sgt/vase.h @@ -29,7 +29,7 @@ namespace Titanic { class CVase : public CSGTStateRoom { public: - CLASSDEF + 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 ea7636c485..f140b17f49 100644 --- a/engines/titanic/game/sgt/washstand.h +++ b/engines/titanic/game/sgt/washstand.h @@ -29,7 +29,7 @@ namespace Titanic { class CWashstand : public CSGTStateRoom { public: - CLASSDEF + 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 e0a52dd4c7..4fcc10a424 100644 --- a/engines/titanic/game/ship_setting.h +++ b/engines/titanic/game/ship_setting.h @@ -36,7 +36,7 @@ public: CString _string4; CString _string5; public: - CLASSDEF + CLASSDEF; CShipSetting(); /** diff --git a/engines/titanic/game/ship_setting_button.h b/engines/titanic/game/ship_setting_button.h index e5a889bcc3..e152e8e2c3 100644 --- a/engines/titanic/game/ship_setting_button.h +++ b/engines/titanic/game/ship_setting_button.h @@ -33,7 +33,7 @@ private: int _fieldC8; int _fieldCC; public: - CLASSDEF + CLASSDEF; CShipSettingButton(); /** diff --git a/engines/titanic/game/show_cell_points.h b/engines/titanic/game/show_cell_points.h index 83592210e5..9de2e06dca 100644 --- a/engines/titanic/game/show_cell_points.h +++ b/engines/titanic/game/show_cell_points.h @@ -32,7 +32,7 @@ public: CString _strValue; int _numValue; public: - CLASSDEF + CLASSDEF; CShowCellpoints() : CGameObject(), _numValue(0) {} /** diff --git a/engines/titanic/game/speech_dispensor.h b/engines/titanic/game/speech_dispensor.h index 6302ca3d88..3b877e8d99 100644 --- a/engines/titanic/game/speech_dispensor.h +++ b/engines/titanic/game/speech_dispensor.h @@ -38,7 +38,7 @@ private: int _fieldF8; int _fieldFC; public: - CLASSDEF + 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 4b70b38f10..b1de994f92 100644 --- a/engines/titanic/game/splash_animation.h +++ b/engines/titanic/game/splash_animation.h @@ -30,7 +30,7 @@ namespace Titanic { class CSplashAnimation : public CGameObject { DECLARE_MESSAGE_MAP public: - CLASSDEF + 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 36cd23e54d..fcd3319958 100644 --- a/engines/titanic/game/starling_puret.h +++ b/engines/titanic/game/starling_puret.h @@ -31,7 +31,7 @@ class CStarlingPuret : public CGameObject { private: int _value; public: - CLASSDEF + CLASSDEF; CStarlingPuret() : CGameObject(), _value(0) {} /** diff --git a/engines/titanic/game/start_action.h b/engines/titanic/game/start_action.h index 6b6860e265..8be17f0a50 100644 --- a/engines/titanic/game/start_action.h +++ b/engines/titanic/game/start_action.h @@ -36,7 +36,7 @@ protected: CString _msgTarget; CString _msgAction; public: - CLASSDEF + CLASSDEF; CStartAction(); /** diff --git a/engines/titanic/game/stop_phonograph_button.h b/engines/titanic/game/stop_phonograph_button.h index 1109f81475..b469375e20 100644 --- a/engines/titanic/game/stop_phonograph_button.h +++ b/engines/titanic/game/stop_phonograph_button.h @@ -29,7 +29,7 @@ namespace Titanic { class CStopPhonographButton : public CBackground { public: - CLASSDEF + 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 1aa73d21ff..aab5c8400e 100644 --- a/engines/titanic/game/sub_glass.h +++ b/engines/titanic/game/sub_glass.h @@ -36,7 +36,7 @@ private: int _fieldCC; CString _string; public: - CLASSDEF + CLASSDEF; CSUBGlass(); /** diff --git a/engines/titanic/game/sub_wrapper.h b/engines/titanic/game/sub_wrapper.h index d2fc914a08..81f8fdc941 100644 --- a/engines/titanic/game/sub_wrapper.h +++ b/engines/titanic/game/sub_wrapper.h @@ -31,7 +31,7 @@ class CSUBWrapper : public CGameObject { public: int _value; public: - CLASSDEF + CLASSDEF; CSUBWrapper() : CGameObject(), _value(0) {} /** diff --git a/engines/titanic/game/sweet_bowl.h b/engines/titanic/game/sweet_bowl.h index 5beb9605f0..cf3d0023a4 100644 --- a/engines/titanic/game/sweet_bowl.h +++ b/engines/titanic/game/sweet_bowl.h @@ -29,7 +29,7 @@ namespace Titanic { class CSweetBowl : public CGameObject { public: - CLASSDEF + CLASSDEF; /** * Save the data for the class to file diff --git a/engines/titanic/game/television.h b/engines/titanic/game/television.h index 27dd3d65a8..3ce55053bf 100644 --- a/engines/titanic/game/television.h +++ b/engines/titanic/game/television.h @@ -58,7 +58,7 @@ private: int _fieldEC; int _soundHandle; public: - CLASSDEF + CLASSDEF; CTelevision(); static void init(); static void deinit(); diff --git a/engines/titanic/game/third_class_canal.h b/engines/titanic/game/third_class_canal.h index 1cc53948d3..f6fc471444 100644 --- a/engines/titanic/game/third_class_canal.h +++ b/engines/titanic/game/third_class_canal.h @@ -29,7 +29,7 @@ namespace Titanic { class CThirdClassCanal : public CBackground { public: - CLASSDEF + 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 ce10264230..b6003aa3ef 100644 --- a/engines/titanic/game/throw_tv_down_well.h +++ b/engines/titanic/game/throw_tv_down_well.h @@ -32,7 +32,7 @@ public: CString _strValue; int _numValue; public: - CLASSDEF + CLASSDEF; CThrowTVDownWell() : CGameObject(), _numValue(0) {} /** diff --git a/engines/titanic/game/titania_still_control.h b/engines/titanic/game/titania_still_control.h index dbff0c73bb..66c3045187 100644 --- a/engines/titanic/game/titania_still_control.h +++ b/engines/titanic/game/titania_still_control.h @@ -29,7 +29,7 @@ namespace Titanic { class CTitaniaStillControl : public CGameObject { public: - CLASSDEF + 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 651b8bea56..17618ff6de 100644 --- a/engines/titanic/game/tow_parrot_nav.h +++ b/engines/titanic/game/tow_parrot_nav.h @@ -29,7 +29,7 @@ namespace Titanic { class CTOWParrotNav : public CGameObject { public: - CLASSDEF + 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 e55a8fbf04..53056c7417 100644 --- a/engines/titanic/game/transport/exit_pellerator.h +++ b/engines/titanic/game/transport/exit_pellerator.h @@ -32,7 +32,7 @@ private: static int _v1; static int _v2; public: - CLASSDEF + 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 4f4c57081b..ac1617256f 100644 --- a/engines/titanic/game/transport/gondolier.h +++ b/engines/titanic/game/transport/gondolier.h @@ -29,7 +29,7 @@ namespace Titanic { class CGondolier : public CTransport { public: - CLASSDEF + 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 4b39d34008..9c90466af5 100644 --- a/engines/titanic/game/transport/lift.h +++ b/engines/titanic/game/transport/lift.h @@ -41,7 +41,7 @@ private: int _fieldF8; public: - CLASSDEF + CLASSDEF; CLift() : CTransport(), _fieldF8(1) {} /** diff --git a/engines/titanic/game/transport/lift_indicator.h b/engines/titanic/game/transport/lift_indicator.h index 2b08da5975..ff394d7230 100644 --- a/engines/titanic/game/transport/lift_indicator.h +++ b/engines/titanic/game/transport/lift_indicator.h @@ -37,7 +37,7 @@ private: int _field108; int _field10C; public: - CLASSDEF + CLASSDEF; CLiftindicator(); /** diff --git a/engines/titanic/game/transport/pellerator.h b/engines/titanic/game/transport/pellerator.h index ac1486de3a..9d223ec770 100644 --- a/engines/titanic/game/transport/pellerator.h +++ b/engines/titanic/game/transport/pellerator.h @@ -35,7 +35,7 @@ private: static int _v1; static int _v2; public: - CLASSDEF + 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 472f4580ad..b2c135021a 100644 --- a/engines/titanic/game/transport/service_elevator.h +++ b/engines/titanic/game/transport/service_elevator.h @@ -38,7 +38,7 @@ private: int _field100; int _field104; public: - CLASSDEF + CLASSDEF; CServiceElevator(); /** diff --git a/engines/titanic/game/transport/transport.h b/engines/titanic/game/transport/transport.h index 66906888a0..b2c9aee20d 100644 --- a/engines/titanic/game/transport/transport.h +++ b/engines/titanic/game/transport/transport.h @@ -33,7 +33,7 @@ public: CString _string1; CString _string2; public: - CLASSDEF + CLASSDEF; CTransport(); /** diff --git a/engines/titanic/game/up_lighter.h b/engines/titanic/game/up_lighter.h index be76f576de..2367e41314 100644 --- a/engines/titanic/game/up_lighter.h +++ b/engines/titanic/game/up_lighter.h @@ -36,7 +36,7 @@ private: int _field120; int _field124; public: - CLASSDEF + CLASSDEF; CUpLighter(); /** diff --git a/engines/titanic/game/useless_lever.h b/engines/titanic/game/useless_lever.h index d6c54802f9..27397de216 100644 --- a/engines/titanic/game/useless_lever.h +++ b/engines/titanic/game/useless_lever.h @@ -29,7 +29,7 @@ namespace Titanic { class CUselessLever : public CToggleButton { public: - CLASSDEF + CLASSDEF; /** * Save the data for the class to file diff --git a/engines/titanic/game/volume_control.h b/engines/titanic/game/volume_control.h index 77e33463e4..dcc6f63781 100644 --- a/engines/titanic/game/volume_control.h +++ b/engines/titanic/game/volume_control.h @@ -35,7 +35,7 @@ private: CString _string1; int _fieldCC; public: - CLASSDEF + CLASSDEF; CVolumeControl(); /** diff --git a/engines/titanic/game/wheel_button.h b/engines/titanic/game/wheel_button.h index 78ea7085c2..cb089a660f 100644 --- a/engines/titanic/game/wheel_button.h +++ b/engines/titanic/game/wheel_button.h @@ -33,7 +33,7 @@ public: int _fieldE4; int _fieldE8; public: - CLASSDEF + CLASSDEF; CWheelButton(); /** diff --git a/engines/titanic/game/wheel_hotspot.h b/engines/titanic/game/wheel_hotspot.h index 75b597c425..364fe9a060 100644 --- a/engines/titanic/game/wheel_hotspot.h +++ b/engines/titanic/game/wheel_hotspot.h @@ -32,7 +32,7 @@ public: int _fieldE0; int _fieldE4; public: - CLASSDEF + CLASSDEF; CWheelHotSpot() : CBackground(), _fieldE0(0), _fieldE4(0) {} /** diff --git a/engines/titanic/game/wheel_spin.h b/engines/titanic/game/wheel_spin.h index 9e584a1e48..509db1a4bf 100644 --- a/engines/titanic/game/wheel_spin.h +++ b/engines/titanic/game/wheel_spin.h @@ -31,7 +31,7 @@ class CWheelSpin : public CBackground { public: int _value; public: - CLASSDEF + CLASSDEF; CWheelSpin() : CBackground(), _value(0) {} /** diff --git a/engines/titanic/game/wheel_spin_horn.h b/engines/titanic/game/wheel_spin_horn.h index ac4021f3a7..21182253b3 100644 --- a/engines/titanic/game/wheel_spin_horn.h +++ b/engines/titanic/game/wheel_spin_horn.h @@ -32,7 +32,7 @@ public: CString _string1; CString _string2; public: - CLASSDEF + 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 3b78e0c3af..26e5595411 100644 --- a/engines/titanic/gfx/act_button.h +++ b/engines/titanic/gfx/act_button.h @@ -29,7 +29,7 @@ namespace Titanic { class CActButton : public CSTButton { public: - CLASSDEF + CLASSDEF; CActButton(); /** diff --git a/engines/titanic/gfx/changes_season_button.h b/engines/titanic/gfx/changes_season_button.h index 2fe4672c1f..2b58a3199b 100644 --- a/engines/titanic/gfx/changes_season_button.h +++ b/engines/titanic/gfx/changes_season_button.h @@ -29,7 +29,7 @@ namespace Titanic { class CChangesSeasonButton : public CSTButton { public: - CLASSDEF + CLASSDEF; CChangesSeasonButton(); /** diff --git a/engines/titanic/gfx/chev_left_off.h b/engines/titanic/gfx/chev_left_off.h index 572f58abf3..1e356d3bf9 100644 --- a/engines/titanic/gfx/chev_left_off.h +++ b/engines/titanic/gfx/chev_left_off.h @@ -30,7 +30,7 @@ namespace Titanic { class CChevLeftOff : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CChevLeftOff(); /** diff --git a/engines/titanic/gfx/chev_left_on.h b/engines/titanic/gfx/chev_left_on.h index c015eef7c1..2014002fca 100644 --- a/engines/titanic/gfx/chev_left_on.h +++ b/engines/titanic/gfx/chev_left_on.h @@ -30,7 +30,7 @@ namespace Titanic { class CChevLeftOn : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CChevLeftOn(); /** diff --git a/engines/titanic/gfx/chev_right_off.h b/engines/titanic/gfx/chev_right_off.h index 05b62f3241..2bd3e24f9f 100644 --- a/engines/titanic/gfx/chev_right_off.h +++ b/engines/titanic/gfx/chev_right_off.h @@ -30,7 +30,7 @@ namespace Titanic { class CChevRightOff : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CChevRightOff(); /** diff --git a/engines/titanic/gfx/chev_right_on.h b/engines/titanic/gfx/chev_right_on.h index 56672f27bb..bc3e0ff7be 100644 --- a/engines/titanic/gfx/chev_right_on.h +++ b/engines/titanic/gfx/chev_right_on.h @@ -30,7 +30,7 @@ namespace Titanic { class CChevRightOn : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CChevRightOn(); /** diff --git a/engines/titanic/gfx/chev_send_rec_switch.h b/engines/titanic/gfx/chev_send_rec_switch.h index 17a1b0a855..041492893c 100644 --- a/engines/titanic/gfx/chev_send_rec_switch.h +++ b/engines/titanic/gfx/chev_send_rec_switch.h @@ -30,7 +30,7 @@ namespace Titanic { class CChevSendRecSwitch : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CChevSendRecSwitch(); /** diff --git a/engines/titanic/gfx/chev_switch.h b/engines/titanic/gfx/chev_switch.h index d3c884e92a..0305a6ca83 100644 --- a/engines/titanic/gfx/chev_switch.h +++ b/engines/titanic/gfx/chev_switch.h @@ -29,7 +29,7 @@ namespace Titanic { class CChevSwitch : public CToggleSwitch { public: - CLASSDEF + CLASSDEF; CChevSwitch(); /** diff --git a/engines/titanic/gfx/edit_control.h b/engines/titanic/gfx/edit_control.h index 42886372d2..77d03cb225 100644 --- a/engines/titanic/gfx/edit_control.h +++ b/engines/titanic/gfx/edit_control.h @@ -43,7 +43,7 @@ protected: int _fieldF0; int _fieldF4; public: - CLASSDEF + CLASSDEF; CEditControl(); /** diff --git a/engines/titanic/gfx/elevator_button.h b/engines/titanic/gfx/elevator_button.h index da7e25a275..dec4775f3f 100644 --- a/engines/titanic/gfx/elevator_button.h +++ b/engines/titanic/gfx/elevator_button.h @@ -30,7 +30,7 @@ namespace Titanic { class CElevatorButton : public CSTButton { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CElevatorButton(); /** diff --git a/engines/titanic/gfx/get_from_succ.h b/engines/titanic/gfx/get_from_succ.h index 5f16f9175f..d93341e913 100644 --- a/engines/titanic/gfx/get_from_succ.h +++ b/engines/titanic/gfx/get_from_succ.h @@ -30,7 +30,7 @@ namespace Titanic { class CGetFromSucc : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CGetFromSucc(); /** diff --git a/engines/titanic/gfx/helmet_on_off.h b/engines/titanic/gfx/helmet_on_off.h index c0e1a0affe..881757a2ef 100644 --- a/engines/titanic/gfx/helmet_on_off.h +++ b/engines/titanic/gfx/helmet_on_off.h @@ -30,7 +30,7 @@ namespace Titanic { class CHelmetOnOff : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CHelmetOnOff(); /** diff --git a/engines/titanic/gfx/home_photo.h b/engines/titanic/gfx/home_photo.h index c14352375a..9181bfd820 100644 --- a/engines/titanic/gfx/home_photo.h +++ b/engines/titanic/gfx/home_photo.h @@ -30,7 +30,7 @@ namespace Titanic { class CHomePhoto : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CHomePhoto(); /** diff --git a/engines/titanic/gfx/icon_nav_action.h b/engines/titanic/gfx/icon_nav_action.h index 2a5961d590..9a63a47196 100644 --- a/engines/titanic/gfx/icon_nav_action.h +++ b/engines/titanic/gfx/icon_nav_action.h @@ -30,7 +30,7 @@ namespace Titanic { class CIconNavAction : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CIconNavAction(); /** diff --git a/engines/titanic/gfx/icon_nav_butt.h b/engines/titanic/gfx/icon_nav_butt.h index 3c73a274b2..a27fc8b0fa 100644 --- a/engines/titanic/gfx/icon_nav_butt.h +++ b/engines/titanic/gfx/icon_nav_butt.h @@ -30,7 +30,7 @@ namespace Titanic { class CIconNavButt : public CPetGraphic { DECLARE_MESSAGE_MAP public: - CLASSDEF + 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 6de13eac11..759d887913 100644 --- a/engines/titanic/gfx/icon_nav_down.h +++ b/engines/titanic/gfx/icon_nav_down.h @@ -30,7 +30,7 @@ namespace Titanic { class CIconNavDown : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CIconNavDown(); /** diff --git a/engines/titanic/gfx/icon_nav_image.h b/engines/titanic/gfx/icon_nav_image.h index 3ff82f385c..ab0e955bfa 100644 --- a/engines/titanic/gfx/icon_nav_image.h +++ b/engines/titanic/gfx/icon_nav_image.h @@ -30,7 +30,7 @@ namespace Titanic { class CIconNavImage : public CPetGraphic { DECLARE_MESSAGE_MAP public: - CLASSDEF + 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 bba3016d7b..d58a426ae9 100644 --- a/engines/titanic/gfx/icon_nav_left.h +++ b/engines/titanic/gfx/icon_nav_left.h @@ -30,7 +30,7 @@ namespace Titanic { class CIconNavLeft : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CIconNavLeft(); /** diff --git a/engines/titanic/gfx/icon_nav_receive.h b/engines/titanic/gfx/icon_nav_receive.h index 8fff0d0cd1..5d055dd156 100644 --- a/engines/titanic/gfx/icon_nav_receive.h +++ b/engines/titanic/gfx/icon_nav_receive.h @@ -30,7 +30,7 @@ namespace Titanic { class CIconNavReceive : public CPetGraphic { DECLARE_MESSAGE_MAP public: - CLASSDEF + 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 1df10433b5..c12ff7cf8b 100644 --- a/engines/titanic/gfx/icon_nav_right.h +++ b/engines/titanic/gfx/icon_nav_right.h @@ -30,7 +30,7 @@ namespace Titanic { class CIconNavRight : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CIconNavRight(); /** diff --git a/engines/titanic/gfx/icon_nav_send.h b/engines/titanic/gfx/icon_nav_send.h index d70920507a..f2b220f0d9 100644 --- a/engines/titanic/gfx/icon_nav_send.h +++ b/engines/titanic/gfx/icon_nav_send.h @@ -30,7 +30,7 @@ namespace Titanic { class CIconNavSend : public CPetGraphic { DECLARE_MESSAGE_MAP public: - CLASSDEF + 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 73d4fc3f8b..a9702c763f 100644 --- a/engines/titanic/gfx/icon_nav_up.h +++ b/engines/titanic/gfx/icon_nav_up.h @@ -30,7 +30,7 @@ namespace Titanic { class CIconNavUp : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CIconNavUp(); /** diff --git a/engines/titanic/gfx/keybrd_butt.h b/engines/titanic/gfx/keybrd_butt.h index 4bf38a1954..5514f115c7 100644 --- a/engines/titanic/gfx/keybrd_butt.h +++ b/engines/titanic/gfx/keybrd_butt.h @@ -30,7 +30,7 @@ namespace Titanic { class CKeybrdButt : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CKeybrdButt(); /** diff --git a/engines/titanic/gfx/move_object_button.h b/engines/titanic/gfx/move_object_button.h index a255ecf38a..eb2fdc4ff2 100644 --- a/engines/titanic/gfx/move_object_button.h +++ b/engines/titanic/gfx/move_object_button.h @@ -32,7 +32,7 @@ private: Point _pos1; int _field11C; public: - CLASSDEF + CLASSDEF; CMoveObjectButton(); /** diff --git a/engines/titanic/gfx/music_control.h b/engines/titanic/gfx/music_control.h index 4b7927060b..04085f789c 100644 --- a/engines/titanic/gfx/music_control.h +++ b/engines/titanic/gfx/music_control.h @@ -34,7 +34,7 @@ public: int _fieldE8; int _fieldEC; public: - CLASSDEF + CLASSDEF; CMusicControl(); /** diff --git a/engines/titanic/gfx/music_slider.h b/engines/titanic/gfx/music_slider.h index 87a06c6b60..1636afeb89 100644 --- a/engines/titanic/gfx/music_slider.h +++ b/engines/titanic/gfx/music_slider.h @@ -30,7 +30,7 @@ namespace Titanic { class CMusicSlider : public CMusicControl { DECLARE_MESSAGE_MAP public: - CLASSDEF + 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 edb8f42680..10c1d62c3a 100644 --- a/engines/titanic/gfx/music_slider_pitch.h +++ b/engines/titanic/gfx/music_slider_pitch.h @@ -29,7 +29,7 @@ namespace Titanic { class CMusicSliderPitch : public CMusicSlider { public: - CLASSDEF + 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 c6a35ddd5f..9814ca0312 100644 --- a/engines/titanic/gfx/music_slider_speed.h +++ b/engines/titanic/gfx/music_slider_speed.h @@ -29,7 +29,7 @@ namespace Titanic { class CMusicSliderSpeed : public CMusicSlider { public: - CLASSDEF + 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 bb90a8f205..6ee615d594 100644 --- a/engines/titanic/gfx/music_switch.h +++ b/engines/titanic/gfx/music_switch.h @@ -30,7 +30,7 @@ namespace Titanic { class CMusicSwitch : public CMusicControl { DECLARE_MESSAGE_MAP public: - CLASSDEF + 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 052c812897..8b3718cf14 100644 --- a/engines/titanic/gfx/music_switch_inversion.h +++ b/engines/titanic/gfx/music_switch_inversion.h @@ -29,7 +29,7 @@ namespace Titanic { class CMusicSwitchInversion : public CMusicSwitch { public: - CLASSDEF + 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 5a6208cede..3bfcb53b00 100644 --- a/engines/titanic/gfx/music_switch_reverse.h +++ b/engines/titanic/gfx/music_switch_reverse.h @@ -29,7 +29,7 @@ namespace Titanic { class CMusicSwitchReverse : public CMusicSwitch { public: - CLASSDEF + 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 85aeda869c..ca15806c09 100644 --- a/engines/titanic/gfx/music_voice_mute.h +++ b/engines/titanic/gfx/music_voice_mute.h @@ -29,7 +29,7 @@ namespace Titanic { class CMusicVoiceMute : public CMusicControl { public: - CLASSDEF + 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 1b8d17741e..dfcb345f4c 100644 --- a/engines/titanic/gfx/send_to_succ.h +++ b/engines/titanic/gfx/send_to_succ.h @@ -30,7 +30,7 @@ namespace Titanic { class CSendToSucc : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CSendToSucc(); /** diff --git a/engines/titanic/gfx/sgt_selector.h b/engines/titanic/gfx/sgt_selector.h index c6d2a167d2..2afd40209b 100644 --- a/engines/titanic/gfx/sgt_selector.h +++ b/engines/titanic/gfx/sgt_selector.h @@ -30,7 +30,7 @@ namespace Titanic { class CSGTSelector : public CPetGraphic { DECLARE_MESSAGE_MAP public: - CLASSDEF + 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 3bd33aa2ba..398290bb05 100644 --- a/engines/titanic/gfx/slider_button.h +++ b/engines/titanic/gfx/slider_button.h @@ -34,7 +34,7 @@ private: int _field11C; Point _pos1; public: - CLASSDEF + CLASSDEF; CSliderButton(); /** diff --git a/engines/titanic/gfx/small_chev_left_off.h b/engines/titanic/gfx/small_chev_left_off.h index a164235828..c3af9bb837 100644 --- a/engines/titanic/gfx/small_chev_left_off.h +++ b/engines/titanic/gfx/small_chev_left_off.h @@ -30,7 +30,7 @@ namespace Titanic { class CSmallChevLeftOff : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CSmallChevLeftOff(); /** diff --git a/engines/titanic/gfx/small_chev_left_on.h b/engines/titanic/gfx/small_chev_left_on.h index ab9414727d..4fcba625fa 100644 --- a/engines/titanic/gfx/small_chev_left_on.h +++ b/engines/titanic/gfx/small_chev_left_on.h @@ -30,7 +30,7 @@ namespace Titanic { class CSmallChevLeftOn : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CSmallChevLeftOn(); /** diff --git a/engines/titanic/gfx/small_chev_right_off.h b/engines/titanic/gfx/small_chev_right_off.h index 3283eb2606..f56cc83981 100644 --- a/engines/titanic/gfx/small_chev_right_off.h +++ b/engines/titanic/gfx/small_chev_right_off.h @@ -30,7 +30,7 @@ namespace Titanic { class CSmallChevRightOff : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CSmallChevRightOff(); /** diff --git a/engines/titanic/gfx/small_chev_right_on.h b/engines/titanic/gfx/small_chev_right_on.h index fe522c45cb..aeb9ce33e7 100644 --- a/engines/titanic/gfx/small_chev_right_on.h +++ b/engines/titanic/gfx/small_chev_right_on.h @@ -30,7 +30,7 @@ namespace Titanic { class CSmallChevRightOn : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CSmallChevRightOn(); /** diff --git a/engines/titanic/gfx/st_button.h b/engines/titanic/gfx/st_button.h index b3bd5e82ad..6a8af1b9fa 100644 --- a/engines/titanic/gfx/st_button.h +++ b/engines/titanic/gfx/st_button.h @@ -43,7 +43,7 @@ private: CString _soundName; int _buttonFrame; public: - CLASSDEF + CLASSDEF; CSTButton(); /** diff --git a/engines/titanic/gfx/status_change_button.h b/engines/titanic/gfx/status_change_button.h index 818f21e056..9e410c66f2 100644 --- a/engines/titanic/gfx/status_change_button.h +++ b/engines/titanic/gfx/status_change_button.h @@ -29,7 +29,7 @@ namespace Titanic { class CStatusChangeButton : public CSTButton { public: - CLASSDEF + CLASSDEF; CStatusChangeButton(); /** diff --git a/engines/titanic/gfx/text_down.h b/engines/titanic/gfx/text_down.h index 04805e714a..5c924b8129 100644 --- a/engines/titanic/gfx/text_down.h +++ b/engines/titanic/gfx/text_down.h @@ -30,7 +30,7 @@ namespace Titanic { class CTextDown : public CPetGraphic { DECLARE_MESSAGE_MAP public: - CLASSDEF + 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 a9326336bb..df90d95ba6 100644 --- a/engines/titanic/gfx/text_skrew.h +++ b/engines/titanic/gfx/text_skrew.h @@ -30,7 +30,7 @@ namespace Titanic { class CTextSkrew : public CPetGraphic { DECLARE_MESSAGE_MAP public: - CLASSDEF + 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 19f150b600..0e839e0345 100644 --- a/engines/titanic/gfx/text_up.h +++ b/engines/titanic/gfx/text_up.h @@ -30,7 +30,7 @@ namespace Titanic { class CTextUp : public CPetGraphic { DECLARE_MESSAGE_MAP public: - CLASSDEF + 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 b82e255029..9eb6fdb8c8 100644 --- a/engines/titanic/gfx/toggle_button.h +++ b/engines/titanic/gfx/toggle_button.h @@ -32,7 +32,7 @@ class CToggleButton : public CBackground { private: int _fieldE0; public: - CLASSDEF + CLASSDEF; CToggleButton() : CBackground(), _fieldE0(1) {} /** diff --git a/engines/titanic/gfx/toggle_switch.h b/engines/titanic/gfx/toggle_switch.h index ce39feefda..ae96c75ebd 100644 --- a/engines/titanic/gfx/toggle_switch.h +++ b/engines/titanic/gfx/toggle_switch.h @@ -32,7 +32,7 @@ private: int _fieldBC; Point _pos1; public: - CLASSDEF + CLASSDEF; CToggleSwitch(); /** diff --git a/engines/titanic/messages/auto_sound_event.h b/engines/titanic/messages/auto_sound_event.h index 599404de9e..eb1c11c4ff 100644 --- a/engines/titanic/messages/auto_sound_event.h +++ b/engines/titanic/messages/auto_sound_event.h @@ -32,7 +32,7 @@ public: int _value1; int _value2; public: - CLASSDEF + CLASSDEF; CAutoSoundEvent(); /** diff --git a/engines/titanic/messages/bilge_auto_sound_event.h b/engines/titanic/messages/bilge_auto_sound_event.h index 5d322820ac..9a7fbd6261 100644 --- a/engines/titanic/messages/bilge_auto_sound_event.h +++ b/engines/titanic/messages/bilge_auto_sound_event.h @@ -29,7 +29,7 @@ namespace Titanic { class CBilgeAutoSoundEvent : public CAutoSoundEvent { public: - CLASSDEF + 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 8616373174..96ef92a54e 100644 --- a/engines/titanic/messages/bilge_dispensor_event.h +++ b/engines/titanic/messages/bilge_dispensor_event.h @@ -31,7 +31,7 @@ namespace Titanic { class CBilgeDispensorEvent : public CAutoSoundEvent { bool EnterRoomMsg(CEnterRoomMsg *msg); public: - CLASSDEF + 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 9b3ebbc3bc..e6ea1b0f98 100644 --- a/engines/titanic/messages/door_auto_sound_event.h +++ b/engines/titanic/messages/door_auto_sound_event.h @@ -34,7 +34,7 @@ public: int _fieldDC; int _fieldE0; public: - CLASSDEF + CLASSDEF; CDoorAutoSoundEvent() : CAutoSoundEvent(), _string1("z#44.wav"), _string2("z#43.wav"), _fieldDC(25), _fieldE0(25) { } diff --git a/engines/titanic/messages/messages.h b/engines/titanic/messages/messages.h index 0fe6968ed4..b7205df8b3 100644 --- a/engines/titanic/messages/messages.h +++ b/engines/titanic/messages/messages.h @@ -38,7 +38,7 @@ enum MessageFlag { #define MESSAGE0(NAME) \ class NAME: public CMessage { \ public: NAME() : CMessage() {} \ - CLASSDEF \ + CLASSDEF; \ static bool isSupportedBy(const CTreeItem *item) { \ return supports(item, _type); } \ } @@ -47,7 +47,7 @@ enum MessageFlag { public: F1 _##N1; \ NAME() : CMessage(), _##N1(V1) {} \ NAME(F1 N1) : CMessage(), _##N1(N1) {} \ - CLASSDEF \ + CLASSDEF; \ static bool isSupportedBy(const CTreeItem *item) { \ return supports(item, _type); } \ } @@ -56,7 +56,7 @@ enum MessageFlag { public: F1 _##N1; F2 _##N2; \ NAME() : CMessage(), _##N1(V1), _##N2(V2) {} \ NAME(F1 N1, F2 N2) : CMessage(), _##N1(N1), _##N2(N2) {} \ - CLASSDEF \ + CLASSDEF; \ static bool isSupportedBy(const CTreeItem *item) { \ return supports(item, _type); } \ } @@ -65,7 +65,7 @@ enum MessageFlag { 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 \ + CLASSDEF; \ static bool isSupportedBy(const CTreeItem *item) { \ return supports(item, _type); } \ } @@ -74,7 +74,7 @@ enum MessageFlag { 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 \ + CLASSDEF; \ static bool isSupportedBy(const CTreeItem *item) { \ return supports(item, _type); } \ } @@ -93,7 +93,7 @@ private: */ static const MSGMAP_ENTRY *findMapEntry(const CTreeItem *treeItem, const ClassDef *classDef); public: - CLASSDEF + CLASSDEF; CMessage(); /** @@ -155,7 +155,7 @@ public: int _field1C; int _field20; public: - CLASSDEF + CLASSDEF; CEditControlMsg() : _field4(0), _field8(0), _field18(0), _field1C(0), _field20(0) {} @@ -171,7 +171,7 @@ public: int _fieldC; int _field10; public: - CLASSDEF + CLASSDEF; CLightsMsg() : CMessage(), _field4(0), _field8(0), _fieldC(0), _field10(0) {} @@ -188,7 +188,7 @@ public: int _actionVal; CString _action; public: - CLASSDEF + CLASSDEF; CTimerMsg() : CTimeMsg(), _timerCtr(0), _actionVal(0) {} CTimerMsg(uint ticks, uint timerCtr, int actionVal, const CString &action) : CTimeMsg(ticks), _timerCtr(timerCtr), _actionVal(actionVal), _action(action) {} diff --git a/engines/titanic/messages/mouse_messages.h b/engines/titanic/messages/mouse_messages.h index 8d5aa8bced..d17bd51c78 100644 --- a/engines/titanic/messages/mouse_messages.h +++ b/engines/titanic/messages/mouse_messages.h @@ -35,7 +35,7 @@ public: int _buttons; Point _mousePos; public: - CLASSDEF + CLASSDEF; static bool isSupportedBy(const CTreeItem *item) { return supports(item, _type); } @@ -47,7 +47,7 @@ public: class CMouseMoveMsg : public CMouseMsg { public: - CLASSDEF + CLASSDEF; CMouseMoveMsg() : CMouseMsg() {} CMouseMoveMsg(const Point &pt, int buttons) : CMouseMsg(pt, buttons) {} @@ -60,7 +60,7 @@ class CMouseButtonMsg : public CMouseMsg { public: int _field10; public: - CLASSDEF + CLASSDEF; CMouseButtonMsg() : CMouseMsg(), _field10(0) {} CMouseButtonMsg(const Point &pt, int buttons) : CMouseMsg(pt, buttons) {} @@ -71,7 +71,7 @@ public: class CMouseButtonDownMsg : public CMouseButtonMsg { public: - CLASSDEF + CLASSDEF; CMouseButtonDownMsg() : CMouseButtonMsg() {} CMouseButtonDownMsg(const Point &pt, int buttons) : CMouseButtonMsg(pt, buttons) {} @@ -87,7 +87,7 @@ public: class CMouseButtonUpMsg : public CMouseButtonMsg { public: - CLASSDEF + CLASSDEF; CMouseButtonUpMsg() : CMouseButtonMsg() {} CMouseButtonUpMsg(const Point &pt, int buttons) : CMouseButtonMsg(pt, buttons) {} @@ -103,7 +103,7 @@ public: class CMouseDoubleClickMsg : public CMouseButtonMsg { public: - CLASSDEF + CLASSDEF; CMouseDoubleClickMsg() : CMouseButtonMsg() {} CMouseDoubleClickMsg(const Point &pt, int buttons) : CMouseButtonMsg(pt, buttons) {} @@ -114,7 +114,7 @@ public: class CMouseDragMsg : public CMouseMsg { public: - CLASSDEF + CLASSDEF; CMouseDragMsg() : CMouseMsg() {} CMouseDragMsg(const Point &pt) : CMouseMsg(pt, 0) {} @@ -125,7 +125,7 @@ public: class CMouseDragMoveMsg : public CMouseDragMsg { public: - CLASSDEF + CLASSDEF; CMouseDragMoveMsg() : CMouseDragMsg() {} CMouseDragMoveMsg(const Point &pt) : CMouseDragMsg(pt) {} @@ -139,7 +139,7 @@ public: CTreeItem *_dragItem; bool _handled; public: - CLASSDEF + CLASSDEF; CMouseDragStartMsg() : CMouseDragMsg(), _dragItem(nullptr), _handled(false) {} CMouseDragStartMsg(const Point &pt) : CMouseDragMsg(pt), _dragItem(nullptr), _handled(false) {} @@ -155,7 +155,7 @@ public: int _value3; int _value4; public: - CLASSDEF + CLASSDEF; CPassOnDragStartMsg() : CMessage() {} CPassOnDragStartMsg(const Point &pt, int v3 = 0, int v4 = 0) : CMessage(), _mousePos(pt), _value3(v3), _value4(v4) {} @@ -169,7 +169,7 @@ class CMouseDragEndMsg : public CMouseDragMsg { public: CGameObject *_dropTarget; public: - CLASSDEF + CLASSDEF; CMouseDragEndMsg() : CMouseDragMsg(), _dropTarget(nullptr) {} CMouseDragEndMsg(const Point &pt, CGameObject *dropTarget = nullptr) : CMouseDragMsg(pt), _dropTarget(dropTarget) {} diff --git a/engines/titanic/messages/pet_messages.h b/engines/titanic/messages/pet_messages.h index f7d9c301a6..48e5bab64c 100644 --- a/engines/titanic/messages/pet_messages.h +++ b/engines/titanic/messages/pet_messages.h @@ -47,7 +47,7 @@ MESSAGE2(CPETTargetMsg, CString, name, "", int, numValue, -1); public: \ NAME() : CPETTargetMsg() {} \ NAME(const CString &name, int num) : CPETTargetMsg(name, num) {} \ - CLASSDEF \ + CLASSDEF; \ static bool isSupportedBy(const CTreeItem *item) { \ return supports(item, _type); \ } \ diff --git a/engines/titanic/messages/service_elevator_door.h b/engines/titanic/messages/service_elevator_door.h index 104b5735f1..cc8da0917d 100644 --- a/engines/titanic/messages/service_elevator_door.h +++ b/engines/titanic/messages/service_elevator_door.h @@ -29,7 +29,7 @@ namespace Titanic { class CServiceElevatorDoor : public CDoorAutoSoundEvent { public: - CLASSDEF + CLASSDEF; CServiceElevatorDoor(); /** diff --git a/engines/titanic/moves/enter_bomb_room.h b/engines/titanic/moves/enter_bomb_room.h index d49b17688a..7fe8287eae 100644 --- a/engines/titanic/moves/enter_bomb_room.h +++ b/engines/titanic/moves/enter_bomb_room.h @@ -31,7 +31,7 @@ class CEnterBombRoom : public CMovePlayerTo { protected: int _fieldC8; public: - CLASSDEF + CLASSDEF; CEnterBombRoom(); /** diff --git a/engines/titanic/moves/enter_bridge.h b/engines/titanic/moves/enter_bridge.h index 86cc2f3dca..a2410a6f1f 100644 --- a/engines/titanic/moves/enter_bridge.h +++ b/engines/titanic/moves/enter_bridge.h @@ -33,7 +33,7 @@ class CEnterBridge : public CGameObject { private: int _value; public: - CLASSDEF + CLASSDEF; CEnterBridge() : CGameObject(), _value(1) {} /** diff --git a/engines/titanic/moves/enter_exit_first_class_state.h b/engines/titanic/moves/enter_exit_first_class_state.h index 2038084214..a08de07711 100644 --- a/engines/titanic/moves/enter_exit_first_class_state.h +++ b/engines/titanic/moves/enter_exit_first_class_state.h @@ -41,7 +41,7 @@ public: */ static void deinit(); public: - CLASSDEF + 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 e973cf8f8f..26f3dba8d4 100644 --- a/engines/titanic/moves/enter_exit_mini_lift.h +++ b/engines/titanic/moves/enter_exit_mini_lift.h @@ -32,7 +32,7 @@ private: int _fieldBC; int _fieldC0; public: - CLASSDEF + CLASSDEF; CEnterExitMiniLift() : CSGTNavigation(), _fieldBC(0), _fieldC0(1) {} /** 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 935dfb7079..10c7edca7d 100644 --- a/engines/titanic/moves/enter_exit_sec_class_mini_lift.h +++ b/engines/titanic/moves/enter_exit_sec_class_mini_lift.h @@ -39,7 +39,7 @@ private: static CEnterExitSecClassMiniLiftStatics *_statics; int _value; public: - CLASSDEF + CLASSDEF; CEnterExitSecClassMiniLift() : CGameObject(), _value(0) {} static void init(); static void deinit(); diff --git a/engines/titanic/moves/enter_exit_view.h b/engines/titanic/moves/enter_exit_view.h index 774c72e512..4a3f1a967b 100644 --- a/engines/titanic/moves/enter_exit_view.h +++ b/engines/titanic/moves/enter_exit_view.h @@ -35,7 +35,7 @@ public: int _fieldC8; int _fieldCC; public: - CLASSDEF + CLASSDEF; CEnterExitView(); /** diff --git a/engines/titanic/moves/enter_sec_class_state.h b/engines/titanic/moves/enter_sec_class_state.h index 3eadfa2717..c3e3cabf20 100644 --- a/engines/titanic/moves/enter_sec_class_state.h +++ b/engines/titanic/moves/enter_sec_class_state.h @@ -31,7 +31,7 @@ class CEnterSecClassState : public CGameObject { public: int _value1, _value2; public: - CLASSDEF + CLASSDEF; CEnterSecClassState() : CGameObject(), _value1(0), _value2(0) {} /** diff --git a/engines/titanic/moves/exit_arboretum.h b/engines/titanic/moves/exit_arboretum.h index a20cf46fff..f6ebf71515 100644 --- a/engines/titanic/moves/exit_arboretum.h +++ b/engines/titanic/moves/exit_arboretum.h @@ -33,7 +33,7 @@ protected: int _fieldCC; int _fieldD0; public: - CLASSDEF + CLASSDEF; CExitArboretum(); /** diff --git a/engines/titanic/moves/exit_bridge.h b/engines/titanic/moves/exit_bridge.h index b5fcd9af27..4ab29524db 100644 --- a/engines/titanic/moves/exit_bridge.h +++ b/engines/titanic/moves/exit_bridge.h @@ -31,7 +31,7 @@ class CExitBridge : public CMovePlayerTo { private: CString _string1; public: - CLASSDEF + CLASSDEF; CExitBridge(); /** diff --git a/engines/titanic/moves/exit_lift.h b/engines/titanic/moves/exit_lift.h index 6144d4325d..04dabfaf13 100644 --- a/engines/titanic/moves/exit_lift.h +++ b/engines/titanic/moves/exit_lift.h @@ -31,7 +31,7 @@ class CExitLift : public CGameObject { public: CString _value; public: - CLASSDEF + 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 36108314bd..280d1e9a6c 100644 --- a/engines/titanic/moves/exit_pellerator.h +++ b/engines/titanic/moves/exit_pellerator.h @@ -37,7 +37,7 @@ class CExitPellerator : public CGameObject { private: static CExitPelleratorStatics *_statics; public: - CLASSDEF + CLASSDEF; static void init(); static void deinit(); diff --git a/engines/titanic/moves/exit_state_room.h b/engines/titanic/moves/exit_state_room.h index ac94297986..c0f9737817 100644 --- a/engines/titanic/moves/exit_state_room.h +++ b/engines/titanic/moves/exit_state_room.h @@ -31,7 +31,7 @@ class CExitStateRoom : public CMovePlayerTo { protected: int _fieldC8; public: - CLASSDEF + CLASSDEF; CExitStateRoom(); /** diff --git a/engines/titanic/moves/exit_tiania.h b/engines/titanic/moves/exit_tiania.h index 6ae3bc8406..c2b7772ce7 100644 --- a/engines/titanic/moves/exit_tiania.h +++ b/engines/titanic/moves/exit_tiania.h @@ -34,7 +34,7 @@ private: CString _string2; CString _string3; public: - CLASSDEF + CLASSDEF; CExitTiania(); /** diff --git a/engines/titanic/moves/move_player_in_parrot_room.h b/engines/titanic/moves/move_player_in_parrot_room.h index cdb00070a8..de693fe2e2 100644 --- a/engines/titanic/moves/move_player_in_parrot_room.h +++ b/engines/titanic/moves/move_player_in_parrot_room.h @@ -29,7 +29,7 @@ namespace Titanic { class CMovePlayerInParrotRoom : public CMovePlayerTo { public: - CLASSDEF + CLASSDEF; CMovePlayerInParrotRoom(); /** diff --git a/engines/titanic/moves/move_player_to.h b/engines/titanic/moves/move_player_to.h index 890c822acd..4bfffcb0b2 100644 --- a/engines/titanic/moves/move_player_to.h +++ b/engines/titanic/moves/move_player_to.h @@ -31,7 +31,7 @@ class CMovePlayerTo : public CGameObject { protected: CString _destination; public: - CLASSDEF + CLASSDEF; CMovePlayerTo(); /** diff --git a/engines/titanic/moves/move_player_to_from.h b/engines/titanic/moves/move_player_to_from.h index 14c6e3ae25..c9eefe532f 100644 --- a/engines/titanic/moves/move_player_to_from.h +++ b/engines/titanic/moves/move_player_to_from.h @@ -31,7 +31,7 @@ class CMovePlayerToFrom : public CGameObject { private: CString _string2; public: - CLASSDEF + CLASSDEF; CMovePlayerToFrom(); /** diff --git a/engines/titanic/moves/multi_move.h b/engines/titanic/moves/multi_move.h index a18eb7676f..977afc2a20 100644 --- a/engines/titanic/moves/multi_move.h +++ b/engines/titanic/moves/multi_move.h @@ -35,7 +35,7 @@ private: CString _string4; CString _string5; public: - CLASSDEF + CLASSDEF; CMultiMove(); /** diff --git a/engines/titanic/moves/pan_from_pel.h b/engines/titanic/moves/pan_from_pel.h index 936bac8764..c81be9f338 100644 --- a/engines/titanic/moves/pan_from_pel.h +++ b/engines/titanic/moves/pan_from_pel.h @@ -32,7 +32,7 @@ protected: int _fieldC8; CString _string1; public: - CLASSDEF + CLASSDEF; CPanFromPel(); /** diff --git a/engines/titanic/moves/restaurant_pan_handler.h b/engines/titanic/moves/restaurant_pan_handler.h index 2caf286d6c..4925aa685b 100644 --- a/engines/titanic/moves/restaurant_pan_handler.h +++ b/engines/titanic/moves/restaurant_pan_handler.h @@ -34,7 +34,7 @@ protected: CString _string1; CString _string2; public: - CLASSDEF + 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 59ff69ff3f..bdf093c353 100644 --- a/engines/titanic/moves/restricted_move.h +++ b/engines/titanic/moves/restricted_move.h @@ -31,7 +31,7 @@ class CRestrictedMove : public CMovePlayerTo { protected: int _fieldC8; public: - CLASSDEF + CLASSDEF; CRestrictedMove(); /** diff --git a/engines/titanic/moves/scraliontis_table.h b/engines/titanic/moves/scraliontis_table.h index a1b8052bfc..2ce3745654 100644 --- a/engines/titanic/moves/scraliontis_table.h +++ b/engines/titanic/moves/scraliontis_table.h @@ -34,7 +34,7 @@ private: int _fieldE8; int _fieldEC; public: - CLASSDEF + CLASSDEF; CScraliontisTable(); /** diff --git a/engines/titanic/moves/trip_down_canal.h b/engines/titanic/moves/trip_down_canal.h index debe064287..736caf4131 100644 --- a/engines/titanic/moves/trip_down_canal.h +++ b/engines/titanic/moves/trip_down_canal.h @@ -29,7 +29,7 @@ namespace Titanic { class CTripDownCanal : public CMovePlayerTo { public: - CLASSDEF + CLASSDEF; CTripDownCanal(); /** diff --git a/engines/titanic/npcs/barbot.h b/engines/titanic/npcs/barbot.h index 27a091ef29..7557fdd2c6 100644 --- a/engines/titanic/npcs/barbot.h +++ b/engines/titanic/npcs/barbot.h @@ -175,7 +175,7 @@ private: int _field33C; int _field340; public: - CLASSDEF + CLASSDEF; CBarbot(); /** diff --git a/engines/titanic/npcs/bellbot.h b/engines/titanic/npcs/bellbot.h index 6be0615303..93c4a2857d 100644 --- a/engines/titanic/npcs/bellbot.h +++ b/engines/titanic/npcs/bellbot.h @@ -31,7 +31,7 @@ class CBellBot : public CTrueTalkNPC { private: int _field108; public: - CLASSDEF + CLASSDEF; CBellBot(); /** diff --git a/engines/titanic/npcs/callbot.h b/engines/titanic/npcs/callbot.h index 6848121529..9b89d59d3f 100644 --- a/engines/titanic/npcs/callbot.h +++ b/engines/titanic/npcs/callbot.h @@ -32,7 +32,7 @@ protected: CString _string1; int _fieldC8; public: - CLASSDEF + CLASSDEF; CCallBot(); /** diff --git a/engines/titanic/npcs/character.h b/engines/titanic/npcs/character.h index 2362f01dac..6f3de9a06a 100644 --- a/engines/titanic/npcs/character.h +++ b/engines/titanic/npcs/character.h @@ -38,7 +38,7 @@ protected: int _fieldC4; CString _charName; public: - CLASSDEF + CLASSDEF; CCharacter(); /** diff --git a/engines/titanic/npcs/deskbot.h b/engines/titanic/npcs/deskbot.h index ff5459910b..e900781ea6 100644 --- a/engines/titanic/npcs/deskbot.h +++ b/engines/titanic/npcs/deskbot.h @@ -47,7 +47,7 @@ public: bool _deskbotActive; int _classNum; public: - CLASSDEF + CLASSDEF; CDeskbot(); /** diff --git a/engines/titanic/npcs/doorbot.h b/engines/titanic/npcs/doorbot.h index 9ea7de6c77..b62026c7d9 100644 --- a/engines/titanic/npcs/doorbot.h +++ b/engines/titanic/npcs/doorbot.h @@ -37,7 +37,7 @@ private: int _field110; int _field114; public: - CLASSDEF + CLASSDEF; CDoorbot(); /** diff --git a/engines/titanic/npcs/liftbot.h b/engines/titanic/npcs/liftbot.h index e993da0d32..7550a8a6f0 100644 --- a/engines/titanic/npcs/liftbot.h +++ b/engines/titanic/npcs/liftbot.h @@ -36,7 +36,7 @@ private: private: int _field108; public: - CLASSDEF + CLASSDEF; CLiftBot(); /** diff --git a/engines/titanic/npcs/maitre_d.h b/engines/titanic/npcs/maitre_d.h index 6a63348d28..af73f02a9a 100644 --- a/engines/titanic/npcs/maitre_d.h +++ b/engines/titanic/npcs/maitre_d.h @@ -41,7 +41,7 @@ private: int _field134; int _field138; public: - CLASSDEF + CLASSDEF; CMaitreD(); /** diff --git a/engines/titanic/npcs/mobile.h b/engines/titanic/npcs/mobile.h index 42effc6715..f9b3955d71 100644 --- a/engines/titanic/npcs/mobile.h +++ b/engines/titanic/npcs/mobile.h @@ -33,7 +33,7 @@ private: Point _pos1; int _fieldDC; public: - CLASSDEF + CLASSDEF; CMobile(); /** diff --git a/engines/titanic/npcs/parrot.h b/engines/titanic/npcs/parrot.h index 010d9af503..a3c8540f0e 100644 --- a/engines/titanic/npcs/parrot.h +++ b/engines/titanic/npcs/parrot.h @@ -92,7 +92,7 @@ private: int _field1E8; int _field1EC; public: - CLASSDEF + CLASSDEF; CParrot(); /** diff --git a/engines/titanic/npcs/robot_controller.h b/engines/titanic/npcs/robot_controller.h index 54b0a20b24..6cbf57aef2 100644 --- a/engines/titanic/npcs/robot_controller.h +++ b/engines/titanic/npcs/robot_controller.h @@ -31,7 +31,7 @@ class CRobotController : public CGameObject { protected: CString _string1; public: - CLASSDEF + CLASSDEF; CRobotController(); /** diff --git a/engines/titanic/npcs/starlings.h b/engines/titanic/npcs/starlings.h index 40cb1b8083..4d96e5c77f 100644 --- a/engines/titanic/npcs/starlings.h +++ b/engines/titanic/npcs/starlings.h @@ -31,7 +31,7 @@ class CStarlings : public CCharacter { private: static int _v1; public: - CLASSDEF + CLASSDEF; CStarlings(); /** diff --git a/engines/titanic/npcs/succubus.h b/engines/titanic/npcs/succubus.h index a78a88b69a..f6f5a6b9e9 100644 --- a/engines/titanic/npcs/succubus.h +++ b/engines/titanic/npcs/succubus.h @@ -87,7 +87,7 @@ private: int _field1D4; int _field1D8; public: - CLASSDEF + CLASSDEF; CSuccUBus(); /** diff --git a/engines/titanic/npcs/summon_bots.h b/engines/titanic/npcs/summon_bots.h index 245d047bfa..ee537fee76 100644 --- a/engines/titanic/npcs/summon_bots.h +++ b/engines/titanic/npcs/summon_bots.h @@ -33,7 +33,7 @@ protected: int _fieldC8; int _fieldCC; public: - CLASSDEF + CLASSDEF; CSummonBots(); /** diff --git a/engines/titanic/npcs/titania.h b/engines/titanic/npcs/titania.h index 3eb95c08d3..4edd626ab6 100644 --- a/engines/titanic/npcs/titania.h +++ b/engines/titanic/npcs/titania.h @@ -42,7 +42,7 @@ private: int _fieldFC; int _field100; public: - CLASSDEF + CLASSDEF; CTitania(); /** diff --git a/engines/titanic/npcs/true_talk_npc.h b/engines/titanic/npcs/true_talk_npc.h index 7202f253de..cece8ed055 100644 --- a/engines/titanic/npcs/true_talk_npc.h +++ b/engines/titanic/npcs/true_talk_npc.h @@ -78,7 +78,7 @@ protected: */ void performAction(bool startTalking, CViewItem *view); public: - CLASSDEF + CLASSDEF; CTrueTalkNPC(); /** diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h index 39df91cf91..468c4f3b14 100644 --- a/engines/titanic/pet_control/pet_control.h +++ b/engines/titanic/pet_control/pet_control.h @@ -122,7 +122,7 @@ public: CTreeItem *_activeNPC; CGameObject *_remoteTarget; public: - CLASSDEF + CLASSDEF; CPetControl(); /** diff --git a/engines/titanic/pet_control/pet_drag_chev.h b/engines/titanic/pet_control/pet_drag_chev.h index 1ca9788f5b..153b954c40 100644 --- a/engines/titanic/pet_control/pet_drag_chev.h +++ b/engines/titanic/pet_control/pet_drag_chev.h @@ -34,7 +34,7 @@ protected: bool MouseDragMoveMsg(CMouseDragMoveMsg *msg); bool MouseDragEndMsg(CMouseDragEndMsg *msg); public: - CLASSDEF + CLASSDEF; /** * Save the data for the class to file diff --git a/engines/titanic/pet_control/pet_graphic.h b/engines/titanic/pet_control/pet_graphic.h index 34badfd8a5..082a27fe0d 100644 --- a/engines/titanic/pet_control/pet_graphic.h +++ b/engines/titanic/pet_control/pet_graphic.h @@ -30,7 +30,7 @@ namespace Titanic { class CPetGraphic : public CGameObject { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; /** * Save the data for the class to file diff --git a/engines/titanic/pet_control/pet_graphic2.h b/engines/titanic/pet_control/pet_graphic2.h index 4e77662a82..6b832fef7d 100644 --- a/engines/titanic/pet_control/pet_graphic2.h +++ b/engines/titanic/pet_control/pet_graphic2.h @@ -30,7 +30,7 @@ namespace Titanic { class CPetGraphic2 : public CGameObject { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; /** * Save the data for the class to file diff --git a/engines/titanic/pet_control/pet_leaf.h b/engines/titanic/pet_control/pet_leaf.h index 0d187423ff..8428647eab 100644 --- a/engines/titanic/pet_control/pet_leaf.h +++ b/engines/titanic/pet_control/pet_leaf.h @@ -30,7 +30,7 @@ namespace Titanic { class PETLeaf : public CGameObject { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; /** * Save the data for the class to file diff --git a/engines/titanic/pet_control/pet_mode_off.h b/engines/titanic/pet_control/pet_mode_off.h index 0a4851ad72..a906bc6174 100644 --- a/engines/titanic/pet_control/pet_mode_off.h +++ b/engines/titanic/pet_control/pet_mode_off.h @@ -30,7 +30,7 @@ namespace Titanic { class CPetModeOff : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CPetModeOff(); /** diff --git a/engines/titanic/pet_control/pet_mode_on.h b/engines/titanic/pet_control/pet_mode_on.h index d33a0d2829..074e33ea8c 100644 --- a/engines/titanic/pet_control/pet_mode_on.h +++ b/engines/titanic/pet_control/pet_mode_on.h @@ -30,7 +30,7 @@ namespace Titanic { class CPetModeOn : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CPetModeOn(); /** diff --git a/engines/titanic/pet_control/pet_mode_panel.h b/engines/titanic/pet_control/pet_mode_panel.h index 17ce48d8b8..0812c11942 100644 --- a/engines/titanic/pet_control/pet_mode_panel.h +++ b/engines/titanic/pet_control/pet_mode_panel.h @@ -30,7 +30,7 @@ namespace Titanic { class CPetModePanel : public CToggleSwitch { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; CPetModePanel(); /** diff --git a/engines/titanic/pet_control/pet_pannel1.h b/engines/titanic/pet_control/pet_pannel1.h index c81d451d50..7ca7378a09 100644 --- a/engines/titanic/pet_control/pet_pannel1.h +++ b/engines/titanic/pet_control/pet_pannel1.h @@ -30,7 +30,7 @@ namespace Titanic { class CPetPannel1 : public CPetGraphic { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; /** * Save the data for the class to file diff --git a/engines/titanic/pet_control/pet_pannel2.h b/engines/titanic/pet_control/pet_pannel2.h index 404dd88be5..62dd2aae2b 100644 --- a/engines/titanic/pet_control/pet_pannel2.h +++ b/engines/titanic/pet_control/pet_pannel2.h @@ -30,7 +30,7 @@ namespace Titanic { class CPetPannel2 : public CPetGraphic { DECLARE_MESSAGE_MAP public: - CLASSDEF + CLASSDEF; /** * Save the data for the class to file diff --git a/engines/titanic/pet_control/pet_pannel3.h b/engines/titanic/pet_control/pet_pannel3.h index addf6144eb..2acf269873 100644 --- a/engines/titanic/pet_control/pet_pannel3.h +++ b/engines/titanic/pet_control/pet_pannel3.h @@ -30,7 +30,7 @@ namespace Titanic { class CPetPannel3 : public CPetGraphic { DECLARE_MESSAGE_MAP public: - CLASSDEF + 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 5d9bb0f332..e9e9763116 100644 --- a/engines/titanic/sound/auto_music_player.h +++ b/engines/titanic/sound/auto_music_player.h @@ -33,7 +33,7 @@ class CAutoMusicPlayer : public CAutoMusicPlayerBase { private: CString _string2; public: - CLASSDEF + CLASSDEF; CAutoMusicPlayer(); /** diff --git a/engines/titanic/sound/auto_music_player_base.h b/engines/titanic/sound/auto_music_player_base.h index d6d9926db3..657c5272e4 100644 --- a/engines/titanic/sound/auto_music_player_base.h +++ b/engines/titanic/sound/auto_music_player_base.h @@ -35,7 +35,7 @@ protected: int _fieldD0; int _fieldD4; public: - CLASSDEF + CLASSDEF; CAutoMusicPlayerBase(); /** diff --git a/engines/titanic/sound/auto_sound_player.h b/engines/titanic/sound/auto_sound_player.h index b85bb68cea..6de2b12561 100644 --- a/engines/titanic/sound/auto_sound_player.h +++ b/engines/titanic/sound/auto_sound_player.h @@ -40,7 +40,7 @@ public: int _fieldE4; int _fieldE8; public: - CLASSDEF + CLASSDEF; CAutoSoundPlayer(); /** diff --git a/engines/titanic/sound/auto_sound_player_adsr.h b/engines/titanic/sound/auto_sound_player_adsr.h index 9dd9ec5b15..6dc2853425 100644 --- a/engines/titanic/sound/auto_sound_player_adsr.h +++ b/engines/titanic/sound/auto_sound_player_adsr.h @@ -33,7 +33,7 @@ private: CString _string3; CString _string4; public: - CLASSDEF + 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 32fb50b080..022d8f4741 100644 --- a/engines/titanic/sound/background_sound_maker.h +++ b/engines/titanic/sound/background_sound_maker.h @@ -31,7 +31,7 @@ class CBackgroundSoundMaker : public CGameObject { public: int _value; public: - CLASSDEF + CLASSDEF; CBackgroundSoundMaker() : CGameObject(), _value(0) {} /** diff --git a/engines/titanic/sound/bird_song.h b/engines/titanic/sound/bird_song.h index 1b1e309931..35758e5b77 100644 --- a/engines/titanic/sound/bird_song.h +++ b/engines/titanic/sound/bird_song.h @@ -31,7 +31,7 @@ class CBirdSong : public CRoomAutoSoundPlayer { public: int _value; public: - CLASSDEF + CLASSDEF; CBirdSong() : CRoomAutoSoundPlayer(), _value(0) {} /** diff --git a/engines/titanic/sound/dome_from_top_of_well.h b/engines/titanic/sound/dome_from_top_of_well.h index 62c97da137..fba71685f1 100644 --- a/engines/titanic/sound/dome_from_top_of_well.h +++ b/engines/titanic/sound/dome_from_top_of_well.h @@ -30,7 +30,7 @@ namespace Titanic { class CDomeFromTopOfWell : public CViewAutoSoundPlayer { DECLARE_MESSAGE_MAP public: - CLASSDEF + 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 adcf3df2d4..6bbeea4890 100644 --- a/engines/titanic/sound/enter_view_toggles_other_music.h +++ b/engines/titanic/sound/enter_view_toggles_other_music.h @@ -31,7 +31,7 @@ class CEnterViewTogglesOtherMusic : public CTriggerAutoMusicPlayer { protected: int _fieldC8; public: - CLASSDEF + CLASSDEF; CEnterViewTogglesOtherMusic(); /** diff --git a/engines/titanic/sound/gondolier_song.h b/engines/titanic/sound/gondolier_song.h index 710cd961fe..0a7120c0fc 100644 --- a/engines/titanic/sound/gondolier_song.h +++ b/engines/titanic/sound/gondolier_song.h @@ -31,7 +31,7 @@ class CGondolierSong : public CRoomAutoSoundPlayer { public: int _value; public: - CLASSDEF + CLASSDEF; CGondolierSong() : CRoomAutoSoundPlayer(), _value(0) {} /** diff --git a/engines/titanic/sound/music_player.h b/engines/titanic/sound/music_player.h index fa877ec861..a2c495d2eb 100644 --- a/engines/titanic/sound/music_player.h +++ b/engines/titanic/sound/music_player.h @@ -36,7 +36,7 @@ protected: int _fieldCC; int _fieldD0; public: - CLASSDEF + CLASSDEF; CMusicPlayer() : CGameObject(), _fieldBC(0), _fieldCC(0), _fieldD0(100) {} diff --git a/engines/titanic/sound/node_auto_sound_player.h b/engines/titanic/sound/node_auto_sound_player.h index 06322f84d3..e980841c36 100644 --- a/engines/titanic/sound/node_auto_sound_player.h +++ b/engines/titanic/sound/node_auto_sound_player.h @@ -33,7 +33,7 @@ class CNodeAutoSoundPlayer : public CAutoSoundPlayer { private: int _fieldEC; public: - CLASSDEF + CLASSDEF; CNodeAutoSoundPlayer() : CAutoSoundPlayer(), _fieldEC(1) {} /** diff --git a/engines/titanic/sound/restricted_auto_music_player.h b/engines/titanic/sound/restricted_auto_music_player.h index be40bd84a1..4a26d3770a 100644 --- a/engines/titanic/sound/restricted_auto_music_player.h +++ b/engines/titanic/sound/restricted_auto_music_player.h @@ -36,7 +36,7 @@ private: CString _string5; CString _string6; public: - CLASSDEF + 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 8b5fc86488..9c3feb5d91 100644 --- a/engines/titanic/sound/room_auto_sound_player.h +++ b/engines/titanic/sound/room_auto_sound_player.h @@ -31,7 +31,7 @@ namespace Titanic { class CRoomAutoSoundPlayer : public CAutoSoundPlayer { bool EnterRoomMsg(CEnterRoomMsg *msg); public: - CLASSDEF + CLASSDEF; /** * Save the data for the class to file diff --git a/engines/titanic/sound/room_trigger_auto_music_player.h b/engines/titanic/sound/room_trigger_auto_music_player.h index da378a32e5..250adad864 100644 --- a/engines/titanic/sound/room_trigger_auto_music_player.h +++ b/engines/titanic/sound/room_trigger_auto_music_player.h @@ -31,7 +31,7 @@ namespace Titanic { class CRoomTriggerAutoMusicPlayer : public CTriggerAutoMusicPlayer { bool EnterRoomMsg(CEnterRoomMsg *msg); public: - CLASSDEF + 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 6d65de8373..ff39b01d73 100644 --- a/engines/titanic/sound/season_noises.h +++ b/engines/titanic/sound/season_noises.h @@ -35,7 +35,7 @@ private: CString _string4; CString _string5; public: - CLASSDEF + CLASSDEF; CSeasonNoises(); /** diff --git a/engines/titanic/sound/seasonal_music_player.h b/engines/titanic/sound/seasonal_music_player.h index 3c434ec023..30c296d24d 100644 --- a/engines/titanic/sound/seasonal_music_player.h +++ b/engines/titanic/sound/seasonal_music_player.h @@ -38,7 +38,7 @@ private: int _fieldF0; int _fieldF4; public: - CLASSDEF + CLASSDEF; CSeasonalMusicPlayer(); /** diff --git a/engines/titanic/sound/titania_speech.h b/engines/titanic/sound/titania_speech.h index 1ff52be1a2..c9b93043f6 100644 --- a/engines/titanic/sound/titania_speech.h +++ b/engines/titanic/sound/titania_speech.h @@ -33,7 +33,7 @@ class CTitaniaSpeech : public CGameObject { private: int _value1, _value2; public: - CLASSDEF + CLASSDEF; CTitaniaSpeech() : CGameObject(), _value1(1), _value2(0) {} /** diff --git a/engines/titanic/sound/trigger_auto_music_player.h b/engines/titanic/sound/trigger_auto_music_player.h index 11c096682a..537e780db6 100644 --- a/engines/titanic/sound/trigger_auto_music_player.h +++ b/engines/titanic/sound/trigger_auto_music_player.h @@ -31,7 +31,7 @@ class CTriggerAutoMusicPlayer : public CGameObject { protected: CString _fieldBC; public: - CLASSDEF + 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 dab96678da..29bdee71a0 100644 --- a/engines/titanic/sound/view_auto_sound_player.h +++ b/engines/titanic/sound/view_auto_sound_player.h @@ -31,7 +31,7 @@ class CViewAutoSoundPlayer : public CAutoSoundPlayer { private: int _fieldEC; public: - CLASSDEF + CLASSDEF; CViewAutoSoundPlayer() : CAutoSoundPlayer(), _fieldEC(0) {} /** diff --git a/engines/titanic/sound/view_toggles_other_music.h b/engines/titanic/sound/view_toggles_other_music.h index f97f690998..a5ba68ba45 100644 --- a/engines/titanic/sound/view_toggles_other_music.h +++ b/engines/titanic/sound/view_toggles_other_music.h @@ -31,7 +31,7 @@ class CViewTogglesOtherMusic : public CEnterViewTogglesOtherMusic { private: int _fieldCC; public: - CLASSDEF + CLASSDEF; CViewTogglesOtherMusic(); /** diff --git a/engines/titanic/sound/water_lapping_sounds.h b/engines/titanic/sound/water_lapping_sounds.h index 7fc7cc4361..d7017d29c1 100644 --- a/engines/titanic/sound/water_lapping_sounds.h +++ b/engines/titanic/sound/water_lapping_sounds.h @@ -32,7 +32,7 @@ class CWaterLappingSounds : public CRoomAutoSoundPlayer { public: int _value; public: - CLASSDEF + CLASSDEF; CWaterLappingSounds() : CRoomAutoSoundPlayer(), _value(0) {} /** diff --git a/engines/titanic/star_control/star_control.h b/engines/titanic/star_control/star_control.h index 2f6a86ad78..f5f0af2653 100644 --- a/engines/titanic/star_control/star_control.h +++ b/engines/titanic/star_control/star_control.h @@ -47,7 +47,7 @@ private: */ void newFrame(); public: - CLASSDEF + CLASSDEF; CStarControl(); virtual ~CStarControl(); diff --git a/engines/titanic/support/movie_clip.h b/engines/titanic/support/movie_clip.h index 813996bbf0..513ed4a339 100644 --- a/engines/titanic/support/movie_clip.h +++ b/engines/titanic/support/movie_clip.h @@ -49,7 +49,7 @@ public: int _startFrame; int _endFrame; public: - CLASSDEF + CLASSDEF; CMovieClip(); CMovieClip(const CString &name, int startFrame, int endFrame); diff --git a/engines/titanic/support/time_event_info.h b/engines/titanic/support/time_event_info.h index ee787bcbef..ebf5b54458 100644 --- a/engines/titanic/support/time_event_info.h +++ b/engines/titanic/support/time_event_info.h @@ -62,7 +62,7 @@ public: bool _persisent; CString _targetName; public: - CLASSDEF + CLASSDEF; CTimeEventInfo(); CTimeEventInfo(uint ticks, bool repeated, uint firstDuration, uint repeatDuration, CTreeItem *target, int endVal, const CString &action); |