diff options
110 files changed, 111 insertions, 111 deletions
diff --git a/engines/titanic/carry/arm.h b/engines/titanic/carry/arm.h index 48201ed90a..fc8bba1f08 100644 --- a/engines/titanic/carry/arm.h +++ b/engines/titanic/carry/arm.h @@ -31,7 +31,7 @@ namespace Titanic { class CArm : public CCarry { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool PuzzleSolvedMsg(CPuzzleSolvedMsg *msg); bool TranslateObjectMsg(CTranslateObjectMsg *msg); bool UseWithOtherMsg(CUseWithOtherMsg *msg); diff --git a/engines/titanic/carry/brain.h b/engines/titanic/carry/brain.h index 5f76e7deff..bcba161e27 100644 --- a/engines/titanic/carry/brain.h +++ b/engines/titanic/carry/brain.h @@ -31,7 +31,7 @@ namespace Titanic { class CBrain : public CCarry { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool UseWithOtherMsg(CUseWithOtherMsg *msg); bool VisibleMsg(CVisibleMsg *msg); bool MouseDragStartMsg(CMouseDragStartMsg *msg); diff --git a/engines/titanic/carry/bridge_piece.h b/engines/titanic/carry/bridge_piece.h index 01c44c0b97..80a1cc98a8 100644 --- a/engines/titanic/carry/bridge_piece.h +++ b/engines/titanic/carry/bridge_piece.h @@ -28,7 +28,7 @@ namespace Titanic { class CBridgePiece : public CCarry { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool UseWithOtherMsg(CUseWithOtherMsg *msg); bool PassOnDragStartMsg(CPassOnDragStartMsg *msg); private: diff --git a/engines/titanic/carry/carry.h b/engines/titanic/carry/carry.h index f4ea648b80..72f4024904 100644 --- a/engines/titanic/carry/carry.h +++ b/engines/titanic/carry/carry.h @@ -30,7 +30,7 @@ namespace Titanic { class CCarry : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool MouseDragStartMsg(CMouseDragStartMsg *msg); bool MouseDragMoveMsg(CMouseDragMoveMsg *msg); bool MouseDragEndMsg(CMouseDragEndMsg *msg); diff --git a/engines/titanic/carry/carry_parrot.h b/engines/titanic/carry/carry_parrot.h index 70caee85d3..2980f26d8a 100644 --- a/engines/titanic/carry/carry_parrot.h +++ b/engines/titanic/carry/carry_parrot.h @@ -31,7 +31,7 @@ namespace Titanic { class CCarryParrot : public CCarry { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool PETGainedObjectMsg(CPETGainedObjectMsg *msg); bool TimerMsg(CTimerMsg *msg); bool IsParrotPresentMsg(CIsParrotPresentMsg *msg); diff --git a/engines/titanic/carry/chicken.h b/engines/titanic/carry/chicken.h index c78d4a023b..65fe30fd81 100644 --- a/engines/titanic/carry/chicken.h +++ b/engines/titanic/carry/chicken.h @@ -30,7 +30,7 @@ namespace Titanic { class CChicken : public CCarry { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool UseWithOtherMsg(CUseWithOtherMsg *msg); bool UseWithCharMsg(CUseWithCharMsg *msg); bool ActMsg(CActMsg *msg); diff --git a/engines/titanic/carry/crushed_tv.h b/engines/titanic/carry/crushed_tv.h index ba6b52cd2e..340930f842 100644 --- a/engines/titanic/carry/crushed_tv.h +++ b/engines/titanic/carry/crushed_tv.h @@ -30,7 +30,7 @@ namespace Titanic { class CCrushedTV : public CCarry { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool ActMsg(CActMsg *msg); bool UseWithCharMsg(CUseWithCharMsg *msg); bool MouseDragStartMsg(CMouseDragStartMsg *msg); diff --git a/engines/titanic/carry/feathers.h b/engines/titanic/carry/feathers.h index 4d193afc3f..7282bcb580 100644 --- a/engines/titanic/carry/feathers.h +++ b/engines/titanic/carry/feathers.h @@ -28,7 +28,7 @@ namespace Titanic { class CFeathers : public CCarry { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CFeathers(); diff --git a/engines/titanic/carry/hose_end.h b/engines/titanic/carry/hose_end.h index 6996d6367a..836c94456a 100644 --- a/engines/titanic/carry/hose_end.h +++ b/engines/titanic/carry/hose_end.h @@ -28,7 +28,7 @@ namespace Titanic { class CHoseEnd : public CHose { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CHoseEnd(); diff --git a/engines/titanic/carry/magazine.h b/engines/titanic/carry/magazine.h index 69b9937b85..d1db4689ba 100644 --- a/engines/titanic/carry/magazine.h +++ b/engines/titanic/carry/magazine.h @@ -30,7 +30,7 @@ namespace Titanic { class CMagazine : public CCarry { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool UseWithCharMsg(CUseWithCharMsg *msg); bool MouseDoubleClickMsg(CMouseDoubleClickMsg *msg); bool VisibleMsg(CVisibleMsg *msg); diff --git a/engines/titanic/carry/napkin.h b/engines/titanic/carry/napkin.h index cec7a6b7fc..ce47dd6059 100644 --- a/engines/titanic/carry/napkin.h +++ b/engines/titanic/carry/napkin.h @@ -29,7 +29,7 @@ namespace Titanic { class CNapkin : public CCarry { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool UseWithOtherMsg(CUseWithOtherMsg *msg); public: CLASSDEF; diff --git a/engines/titanic/carry/note.h b/engines/titanic/carry/note.h index 4edb2024c5..37ebf96d72 100644 --- a/engines/titanic/carry/note.h +++ b/engines/titanic/carry/note.h @@ -29,7 +29,7 @@ namespace Titanic { class CNote : public CCarry { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool MouseDoubleClickMsg(CMouseDoubleClickMsg *msg); private: CString _string6; diff --git a/engines/titanic/carry/parcel.h b/engines/titanic/carry/parcel.h index 88282a6c14..f33c2ff65a 100644 --- a/engines/titanic/carry/parcel.h +++ b/engines/titanic/carry/parcel.h @@ -28,7 +28,7 @@ namespace Titanic { class CParcel : public CCarry { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CParcel(); diff --git a/engines/titanic/carry/phonograph_cylinder.h b/engines/titanic/carry/phonograph_cylinder.h index ba56bb3ca2..bbb1524cb5 100644 --- a/engines/titanic/carry/phonograph_cylinder.h +++ b/engines/titanic/carry/phonograph_cylinder.h @@ -28,7 +28,7 @@ namespace Titanic { class CPhonographCylinder : public CCarry { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool UseWithOtherMsg(CUseWithOtherMsg *msg); bool QueryCylinderMsg(CQueryCylinderMsg *msg); bool RecordOntoCylinderMsg(CRecordOntoCylinderMsg *msg); diff --git a/engines/titanic/carry/photograph.h b/engines/titanic/carry/photograph.h index fcae07be07..9cea1e4799 100644 --- a/engines/titanic/carry/photograph.h +++ b/engines/titanic/carry/photograph.h @@ -31,7 +31,7 @@ namespace Titanic { class CPhotograph : public CCarry { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool MouseDragEndMsg(CMouseDragEndMsg *msg); bool MouseDragStartMsg(CMouseDragStartMsg *msg); bool PETGainedObjectMsg(CPETGainedObjectMsg *msg); diff --git a/engines/titanic/carry/plug_in.h b/engines/titanic/carry/plug_in.h index 9601dc161c..1358a99e39 100644 --- a/engines/titanic/carry/plug_in.h +++ b/engines/titanic/carry/plug_in.h @@ -28,7 +28,7 @@ namespace Titanic { class CPlugIn : public CCarry { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool UseWithOtherMsg(CUseWithOtherMsg *msg); private: int _field12C; diff --git a/engines/titanic/carry/sweets.h b/engines/titanic/carry/sweets.h index ed598767fc..3655fabfb9 100644 --- a/engines/titanic/carry/sweets.h +++ b/engines/titanic/carry/sweets.h @@ -29,7 +29,7 @@ namespace Titanic { class CSweets : public CCarry { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool MouseButtonUpMsg(CMouseButtonUpMsg *msg); public: CLASSDEF; diff --git a/engines/titanic/core/background.h b/engines/titanic/core/background.h index 004ab4d0cf..6a2fd21454 100644 --- a/engines/titanic/core/background.h +++ b/engines/titanic/core/background.h @@ -29,7 +29,7 @@ namespace Titanic { class CBackground : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool StatusChangeMsg(CStatusChangeMsg *msg); bool SetFrameMsg(CSetFrameMsg *msg); bool VisibleMsg(CVisibleMsg *msg); diff --git a/engines/titanic/core/dont_save_file_item.h b/engines/titanic/core/dont_save_file_item.h index 92425ae009..f5ec4f791d 100644 --- a/engines/titanic/core/dont_save_file_item.h +++ b/engines/titanic/core/dont_save_file_item.h @@ -28,7 +28,7 @@ namespace Titanic { class CDontSaveFileItem : public CFileItem { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/core/file_item.h b/engines/titanic/core/file_item.h index 4b7c341fdb..4cecee4882 100644 --- a/engines/titanic/core/file_item.h +++ b/engines/titanic/core/file_item.h @@ -30,7 +30,7 @@ namespace Titanic { class CFileItem: public CTreeItem { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; private: CString _filename; public: diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h index 746ef45db4..69036b1690 100644 --- a/engines/titanic/core/game_object.h +++ b/engines/titanic/core/game_object.h @@ -50,7 +50,7 @@ class OSMovie; class CGameObject : public CNamedItem { friend class OSMovie; - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; private: static CCreditText *_credits; private: diff --git a/engines/titanic/core/link_item.h b/engines/titanic/core/link_item.h index 4b316809fb..dd93e2a0bf 100644 --- a/engines/titanic/core/link_item.h +++ b/engines/titanic/core/link_item.h @@ -34,7 +34,7 @@ class CNodeItem; class CRoomItem; class CLinkItem : public CNamedItem { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; private: /** * Returns a new name for the link item, based on the diff --git a/engines/titanic/core/message_target.h b/engines/titanic/core/message_target.h index 0afd847c34..a52de591b3 100644 --- a/engines/titanic/core/message_target.h +++ b/engines/titanic/core/message_target.h @@ -45,7 +45,7 @@ struct MSGMAP { #define DECLARE_MESSAGE_MAP \ protected: \ static const MSGMAP *getThisMessageMap(); \ - virtual const MSGMAP *getMessageMap() const; + virtual const MSGMAP *getMessageMap() const #define BEGIN_MESSAGE_MAP(theClass, baseClass) \ const MSGMAP *theClass::getMessageMap() const \ @@ -84,7 +84,7 @@ protected: \ static const int DUMMY = 0 class CMessageTarget: public CSaveableObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/core/named_item.h b/engines/titanic/core/named_item.h index 2ff34c7421..809cda1156 100644 --- a/engines/titanic/core/named_item.h +++ b/engines/titanic/core/named_item.h @@ -32,7 +32,7 @@ class CNodeItem; class CRoomItem; class CNamedItem: public CTreeItem { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CString _name; public: diff --git a/engines/titanic/core/node_item.h b/engines/titanic/core/node_item.h index f54e882085..8fda9464ec 100644 --- a/engines/titanic/core/node_item.h +++ b/engines/titanic/core/node_item.h @@ -28,7 +28,7 @@ namespace Titanic { class CNodeItem : public CNamedItem { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: int _nodeNumber; Point _nodePos; diff --git a/engines/titanic/core/project_item.h b/engines/titanic/core/project_item.h index 00c13e52a2..473ffd9556 100644 --- a/engines/titanic/core/project_item.h +++ b/engines/titanic/core/project_item.h @@ -76,7 +76,7 @@ class CFileList: public List<CFileListItem> { }; class CProjectItem : public CFileItem { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; private: CString _filename; CFileList _files; diff --git a/engines/titanic/core/room_item.h b/engines/titanic/core/room_item.h index 22d6e8b40a..cb343a15d2 100644 --- a/engines/titanic/core/room_item.h +++ b/engines/titanic/core/room_item.h @@ -32,7 +32,7 @@ namespace Titanic { class CRoomItem : public CNamedItem { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; private: /** * Handles post-load processing diff --git a/engines/titanic/core/static_image.h b/engines/titanic/core/static_image.h index 16cae82ff7..7a715a84fa 100644 --- a/engines/titanic/core/static_image.h +++ b/engines/titanic/core/static_image.h @@ -28,7 +28,7 @@ namespace Titanic { class CStaticImage : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/core/tree_item.h b/engines/titanic/core/tree_item.h index 85d0215e9b..db4ba30a44 100644 --- a/engines/titanic/core/tree_item.h +++ b/engines/titanic/core/tree_item.h @@ -37,7 +37,7 @@ class CViewItem; class CTreeItem: public CMessageTarget { friend class CMessage; - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; private: CTreeItem *_parent; CTreeItem *_nextSibling; diff --git a/engines/titanic/core/turn_on_object.h b/engines/titanic/core/turn_on_object.h index 67cef9c1ab..0f7cd76382 100644 --- a/engines/titanic/core/turn_on_object.h +++ b/engines/titanic/core/turn_on_object.h @@ -28,7 +28,7 @@ namespace Titanic { class CTurnOnObject : public CBackground { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool MouseButtonDownMsg(CMouseButtonDownMsg *msg); bool MouseButtonUpMsg(CMouseButtonUpMsg *msg); protected: diff --git a/engines/titanic/core/view_item.h b/engines/titanic/core/view_item.h index 227319fac6..6e8003d6c6 100644 --- a/engines/titanic/core/view_item.h +++ b/engines/titanic/core/view_item.h @@ -31,7 +31,7 @@ namespace Titanic { class CViewItem : public CNamedItem { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool MouseButtonDownMsg(CMouseButtonDownMsg *msg); bool MouseButtonUpMsg(CMouseButtonUpMsg *msg); bool MouseMoveMsg(CMouseMoveMsg *msg); diff --git a/engines/titanic/game/arb_background.h b/engines/titanic/game/arb_background.h index b80c988d23..88d4d1bec6 100644 --- a/engines/titanic/game/arb_background.h +++ b/engines/titanic/game/arb_background.h @@ -28,7 +28,7 @@ namespace Titanic { class CArbBackground : public CBackground { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: int _fieldE0; int _fieldE4; diff --git a/engines/titanic/game/arboretum_gate.h b/engines/titanic/game/arboretum_gate.h index 7e07261fbd..927b2190c7 100644 --- a/engines/titanic/game/arboretum_gate.h +++ b/engines/titanic/game/arboretum_gate.h @@ -30,7 +30,7 @@ namespace Titanic { class CArboretumGate : public CBackground { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool ActMsg(CActMsg *msg); bool LeaveViewMsg(CLeaveViewMsg *msg); bool TurnOff(CTurnOff *msg); diff --git a/engines/titanic/game/broken_pell_base.h b/engines/titanic/game/broken_pell_base.h index f62f04d8f8..f63cd0112b 100644 --- a/engines/titanic/game/broken_pell_base.h +++ b/engines/titanic/game/broken_pell_base.h @@ -28,7 +28,7 @@ namespace Titanic { class CBrokenPellBase : public CBackground { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; private: static int _v1; static int _v2; diff --git a/engines/titanic/game/cdrom.h b/engines/titanic/game/cdrom.h index 9dcb270d74..017914830c 100644 --- a/engines/titanic/game/cdrom.h +++ b/engines/titanic/game/cdrom.h @@ -30,7 +30,7 @@ namespace Titanic { class CCDROM : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool MouseDragStartMsg(CMouseDragStartMsg *msg); bool MouseDragEndMsg(CMouseDragEndMsg *msg); bool MouseDragMoveMsg(CMouseDragMoveMsg *msg); diff --git a/engines/titanic/game/cdrom_computer.h b/engines/titanic/game/cdrom_computer.h index 90b7b518d1..39fa9b9498 100644 --- a/engines/titanic/game/cdrom_computer.h +++ b/engines/titanic/game/cdrom_computer.h @@ -29,7 +29,7 @@ namespace Titanic { class CCDROMComputer : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool MouseButtonDownMsg(CMouseButtonDownMsg *msg); private: Rect _clickRect; diff --git a/engines/titanic/game/cdrom_tray.h b/engines/titanic/game/cdrom_tray.h index 76c7a9a6ad..10fc1e145e 100644 --- a/engines/titanic/game/cdrom_tray.h +++ b/engines/titanic/game/cdrom_tray.h @@ -29,7 +29,7 @@ namespace Titanic { class CCDROMTray : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool ActMsg(CActMsg *msg); bool MovieEndMsg(CMovieEndMsg *msg); bool StatusChangeMsg(CStatusChangeMsg *msg); diff --git a/engines/titanic/game/computer.h b/engines/titanic/game/computer.h index f64f723733..6acdba27ea 100644 --- a/engines/titanic/game/computer.h +++ b/engines/titanic/game/computer.h @@ -28,7 +28,7 @@ namespace Titanic { class CComputer : public CBackground { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool ActMsg(CActMsg *msg); bool MouseButtonDownMsg(CMouseButtonDownMsg *msg); bool MovieEndMsg(CMovieEndMsg *msg); diff --git a/engines/titanic/game/computer_screen.h b/engines/titanic/game/computer_screen.h index 1aed01c723..8fb1dcd4dc 100644 --- a/engines/titanic/game/computer_screen.h +++ b/engines/titanic/game/computer_screen.h @@ -28,7 +28,7 @@ namespace Titanic { class CComputerScreen : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool ActMsg(CActMsg *msg); bool MovieEndMsg(CMovieEndMsg *msg); bool EnterViewMsg(CEnterViewMsg *msg); diff --git a/engines/titanic/game/dead_area.h b/engines/titanic/game/dead_area.h index 05a3f4ed62..fdb44ef5df 100644 --- a/engines/titanic/game/dead_area.h +++ b/engines/titanic/game/dead_area.h @@ -32,7 +32,7 @@ namespace Titanic { * Implements a non-responsive screen area */ class CDeadArea : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool MouseButtonDownMsg(CMouseButtonDownMsg *msg) { return true; } bool MouseButtonUpMsg(CMouseButtonUpMsg *msg) { return true; } public: diff --git a/engines/titanic/game/leave_sec_class_state.h b/engines/titanic/game/leave_sec_class_state.h index 67300b6b17..0b1e854f57 100644 --- a/engines/titanic/game/leave_sec_class_state.h +++ b/engines/titanic/game/leave_sec_class_state.h @@ -28,7 +28,7 @@ namespace Titanic { class CLeaveSecClassState : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/game/music_room_phonograph.h b/engines/titanic/game/music_room_phonograph.h index 58afe7f427..9286861785 100644 --- a/engines/titanic/game/music_room_phonograph.h +++ b/engines/titanic/game/music_room_phonograph.h @@ -28,7 +28,7 @@ namespace Titanic { class CMusicRoomPhonograph : public CRestaurantPhonograph { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; private: int _field118; public: diff --git a/engines/titanic/game/musical_instrument.h b/engines/titanic/game/musical_instrument.h index 8b534606e0..5d18ed91f0 100644 --- a/engines/titanic/game/musical_instrument.h +++ b/engines/titanic/game/musical_instrument.h @@ -28,7 +28,7 @@ namespace Titanic { class CMusicalInstrument : public CBackground { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/game/navigation_computer.h b/engines/titanic/game/navigation_computer.h index 6de75437a5..27d06c1f27 100644 --- a/engines/titanic/game/navigation_computer.h +++ b/engines/titanic/game/navigation_computer.h @@ -28,7 +28,7 @@ namespace Titanic { class CNavigationComputer : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/game/null_port_hole.h b/engines/titanic/game/null_port_hole.h index 2924aff9f5..26564271b9 100644 --- a/engines/titanic/game/null_port_hole.h +++ b/engines/titanic/game/null_port_hole.h @@ -28,7 +28,7 @@ namespace Titanic { class CNullPortHole : public CClickResponder { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CNullPortHole(); diff --git a/engines/titanic/game/parrot/parrot_lobby_object.h b/engines/titanic/game/parrot/parrot_lobby_object.h index dfb6592325..5272303888 100644 --- a/engines/titanic/game/parrot/parrot_lobby_object.h +++ b/engines/titanic/game/parrot/parrot_lobby_object.h @@ -28,7 +28,7 @@ namespace Titanic { class CParrotLobbyObject : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: static int _v1; static int _v2; diff --git a/engines/titanic/game/pet/pet_class1.h b/engines/titanic/game/pet/pet_class1.h index ad97f45bb2..fb7a48b927 100644 --- a/engines/titanic/game/pet/pet_class1.h +++ b/engines/titanic/game/pet/pet_class1.h @@ -28,7 +28,7 @@ namespace Titanic { class CPETClass1 : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/game/pet/pet_class2.h b/engines/titanic/game/pet/pet_class2.h index 6ae78f4db8..c8855c82f3 100644 --- a/engines/titanic/game/pet/pet_class2.h +++ b/engines/titanic/game/pet/pet_class2.h @@ -28,7 +28,7 @@ namespace Titanic { class CPETClass2 : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/game/pet/pet_class3.h b/engines/titanic/game/pet/pet_class3.h index 780cad3b6c..59d8389665 100644 --- a/engines/titanic/game/pet/pet_class3.h +++ b/engines/titanic/game/pet/pet_class3.h @@ -28,7 +28,7 @@ namespace Titanic { class CPETClass3 : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/game/pet/pet_monitor.h b/engines/titanic/game/pet/pet_monitor.h index 3fc50bdf63..61d1ba8ab6 100644 --- a/engines/titanic/game/pet/pet_monitor.h +++ b/engines/titanic/game/pet/pet_monitor.h @@ -29,7 +29,7 @@ namespace Titanic { class CPETMonitor : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool EnterRoomMsg(CEnterRoomMsg *msg); public: CLASSDEF; diff --git a/engines/titanic/game/pet/pet_position.h b/engines/titanic/game/pet/pet_position.h index 9419684823..d1ac0507f4 100644 --- a/engines/titanic/game/pet/pet_position.h +++ b/engines/titanic/game/pet/pet_position.h @@ -29,7 +29,7 @@ namespace Titanic { class CPETPosition : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool EnterRoomMsg(CEnterRoomMsg *msg); public: CLASSDEF; diff --git a/engines/titanic/game/pet/pet_transport.h b/engines/titanic/game/pet/pet_transport.h index 44beafebc8..58aefe6743 100644 --- a/engines/titanic/game/pet/pet_transport.h +++ b/engines/titanic/game/pet/pet_transport.h @@ -29,7 +29,7 @@ namespace Titanic { class CPETTransport : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; virtual bool EnterRoomMsg(CEnterRoomMsg *msg); public: CLASSDEF; diff --git a/engines/titanic/game/sgt/sgt_state_room.h b/engines/titanic/game/sgt/sgt_state_room.h index ee9079943b..375da71326 100644 --- a/engines/titanic/game/sgt/sgt_state_room.h +++ b/engines/titanic/game/sgt/sgt_state_room.h @@ -46,7 +46,7 @@ struct CSGTStateRoomStatics { }; class CSGTStateRoom : public CBackground { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool EnterRoomMsg(CEnterRoomMsg *msg); private: static CSGTStateRoomStatics *_statics; diff --git a/engines/titanic/game/splash_animation.h b/engines/titanic/game/splash_animation.h index b1de994f92..11715b4d73 100644 --- a/engines/titanic/game/splash_animation.h +++ b/engines/titanic/game/splash_animation.h @@ -28,7 +28,7 @@ namespace Titanic { class CSplashAnimation : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/game/start_action.h b/engines/titanic/game/start_action.h index 8be17f0a50..60381bad2f 100644 --- a/engines/titanic/game/start_action.h +++ b/engines/titanic/game/start_action.h @@ -29,7 +29,7 @@ namespace Titanic { class CStartAction : public CBackground { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool MouseButtonDownMsg(CMouseButtonDownMsg *msg); bool MouseButtonUpMsg(CMouseButtonUpMsg *msg); protected: diff --git a/engines/titanic/game/television.h b/engines/titanic/game/television.h index 3ce55053bf..6e6d9b23c2 100644 --- a/engines/titanic/game/television.h +++ b/engines/titanic/game/television.h @@ -30,7 +30,7 @@ namespace Titanic { class CTelevision : public CBackground { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool LeaveViewMsg(CLeaveViewMsg *msg); bool ChangeSeasonMsg(CChangeSeasonMsg *msg); bool EnterViewMsg(CEnterViewMsg *msg); diff --git a/engines/titanic/game/transport/lift.h b/engines/titanic/game/transport/lift.h index 9c90466af5..4595f0fec2 100644 --- a/engines/titanic/game/transport/lift.h +++ b/engines/titanic/game/transport/lift.h @@ -29,7 +29,7 @@ namespace Titanic { class CLift : public CTransport { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool EnterRoomMsg(CEnterRoomMsg *msg); private: static int _v1; diff --git a/engines/titanic/game/transport/lift_indicator.h b/engines/titanic/game/transport/lift_indicator.h index ff394d7230..945f627417 100644 --- a/engines/titanic/game/transport/lift_indicator.h +++ b/engines/titanic/game/transport/lift_indicator.h @@ -29,7 +29,7 @@ namespace Titanic { class CLiftindicator : public CLift { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool EnterRoomMsg(CEnterRoomMsg *msg) { return true; } private: int _fieldFC; diff --git a/engines/titanic/game/transport/pellerator.h b/engines/titanic/game/transport/pellerator.h index 9d223ec770..fa400a49cd 100644 --- a/engines/titanic/game/transport/pellerator.h +++ b/engines/titanic/game/transport/pellerator.h @@ -29,7 +29,7 @@ namespace Titanic { class CPellerator : public CTransport { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool EnterRoomMsg(CEnterRoomMsg *msg); private: static int _v1; diff --git a/engines/titanic/game/transport/transport.h b/engines/titanic/game/transport/transport.h index b2c9aee20d..d87251212a 100644 --- a/engines/titanic/game/transport/transport.h +++ b/engines/titanic/game/transport/transport.h @@ -28,7 +28,7 @@ namespace Titanic { class CTransport : public CMobile { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CString _string1; CString _string2; diff --git a/engines/titanic/gfx/chev_left_off.h b/engines/titanic/gfx/chev_left_off.h index 1e356d3bf9..5034c1a71a 100644 --- a/engines/titanic/gfx/chev_left_off.h +++ b/engines/titanic/gfx/chev_left_off.h @@ -28,7 +28,7 @@ namespace Titanic { class CChevLeftOff : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CChevLeftOff(); diff --git a/engines/titanic/gfx/chev_left_on.h b/engines/titanic/gfx/chev_left_on.h index 2014002fca..df430f6700 100644 --- a/engines/titanic/gfx/chev_left_on.h +++ b/engines/titanic/gfx/chev_left_on.h @@ -28,7 +28,7 @@ namespace Titanic { class CChevLeftOn : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CChevLeftOn(); diff --git a/engines/titanic/gfx/chev_right_off.h b/engines/titanic/gfx/chev_right_off.h index 2bd3e24f9f..8f6c3fc254 100644 --- a/engines/titanic/gfx/chev_right_off.h +++ b/engines/titanic/gfx/chev_right_off.h @@ -28,7 +28,7 @@ namespace Titanic { class CChevRightOff : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CChevRightOff(); diff --git a/engines/titanic/gfx/chev_right_on.h b/engines/titanic/gfx/chev_right_on.h index bc3e0ff7be..accd42cff8 100644 --- a/engines/titanic/gfx/chev_right_on.h +++ b/engines/titanic/gfx/chev_right_on.h @@ -28,7 +28,7 @@ namespace Titanic { class CChevRightOn : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CChevRightOn(); diff --git a/engines/titanic/gfx/chev_send_rec_switch.h b/engines/titanic/gfx/chev_send_rec_switch.h index 041492893c..b3ccab2f09 100644 --- a/engines/titanic/gfx/chev_send_rec_switch.h +++ b/engines/titanic/gfx/chev_send_rec_switch.h @@ -28,7 +28,7 @@ namespace Titanic { class CChevSendRecSwitch : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CChevSendRecSwitch(); diff --git a/engines/titanic/gfx/elevator_button.h b/engines/titanic/gfx/elevator_button.h index dec4775f3f..28110d8102 100644 --- a/engines/titanic/gfx/elevator_button.h +++ b/engines/titanic/gfx/elevator_button.h @@ -28,7 +28,7 @@ namespace Titanic { class CElevatorButton : public CSTButton { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CElevatorButton(); diff --git a/engines/titanic/gfx/get_from_succ.h b/engines/titanic/gfx/get_from_succ.h index d93341e913..f85f1b4cf2 100644 --- a/engines/titanic/gfx/get_from_succ.h +++ b/engines/titanic/gfx/get_from_succ.h @@ -28,7 +28,7 @@ namespace Titanic { class CGetFromSucc : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CGetFromSucc(); diff --git a/engines/titanic/gfx/helmet_on_off.h b/engines/titanic/gfx/helmet_on_off.h index 881757a2ef..c2910eb59d 100644 --- a/engines/titanic/gfx/helmet_on_off.h +++ b/engines/titanic/gfx/helmet_on_off.h @@ -28,7 +28,7 @@ namespace Titanic { class CHelmetOnOff : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CHelmetOnOff(); diff --git a/engines/titanic/gfx/home_photo.h b/engines/titanic/gfx/home_photo.h index 9181bfd820..09b18b7c0f 100644 --- a/engines/titanic/gfx/home_photo.h +++ b/engines/titanic/gfx/home_photo.h @@ -28,7 +28,7 @@ namespace Titanic { class CHomePhoto : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CHomePhoto(); diff --git a/engines/titanic/gfx/icon_nav_action.h b/engines/titanic/gfx/icon_nav_action.h index 9a63a47196..841334dd41 100644 --- a/engines/titanic/gfx/icon_nav_action.h +++ b/engines/titanic/gfx/icon_nav_action.h @@ -28,7 +28,7 @@ namespace Titanic { class CIconNavAction : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CIconNavAction(); diff --git a/engines/titanic/gfx/icon_nav_butt.h b/engines/titanic/gfx/icon_nav_butt.h index a27fc8b0fa..c60877e2c0 100644 --- a/engines/titanic/gfx/icon_nav_butt.h +++ b/engines/titanic/gfx/icon_nav_butt.h @@ -28,7 +28,7 @@ namespace Titanic { class CIconNavButt : public CPetGraphic { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/gfx/icon_nav_down.h b/engines/titanic/gfx/icon_nav_down.h index 759d887913..6c0c2870e4 100644 --- a/engines/titanic/gfx/icon_nav_down.h +++ b/engines/titanic/gfx/icon_nav_down.h @@ -28,7 +28,7 @@ namespace Titanic { class CIconNavDown : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CIconNavDown(); diff --git a/engines/titanic/gfx/icon_nav_image.h b/engines/titanic/gfx/icon_nav_image.h index ab0e955bfa..580762c32d 100644 --- a/engines/titanic/gfx/icon_nav_image.h +++ b/engines/titanic/gfx/icon_nav_image.h @@ -28,7 +28,7 @@ namespace Titanic { class CIconNavImage : public CPetGraphic { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/gfx/icon_nav_left.h b/engines/titanic/gfx/icon_nav_left.h index d58a426ae9..bb61c26362 100644 --- a/engines/titanic/gfx/icon_nav_left.h +++ b/engines/titanic/gfx/icon_nav_left.h @@ -28,7 +28,7 @@ namespace Titanic { class CIconNavLeft : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CIconNavLeft(); diff --git a/engines/titanic/gfx/icon_nav_receive.h b/engines/titanic/gfx/icon_nav_receive.h index 5d055dd156..0744105835 100644 --- a/engines/titanic/gfx/icon_nav_receive.h +++ b/engines/titanic/gfx/icon_nav_receive.h @@ -28,7 +28,7 @@ namespace Titanic { class CIconNavReceive : public CPetGraphic { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/gfx/icon_nav_right.h b/engines/titanic/gfx/icon_nav_right.h index c12ff7cf8b..a1bed9ca8f 100644 --- a/engines/titanic/gfx/icon_nav_right.h +++ b/engines/titanic/gfx/icon_nav_right.h @@ -28,7 +28,7 @@ namespace Titanic { class CIconNavRight : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CIconNavRight(); diff --git a/engines/titanic/gfx/icon_nav_send.h b/engines/titanic/gfx/icon_nav_send.h index f2b220f0d9..f3af8d9c65 100644 --- a/engines/titanic/gfx/icon_nav_send.h +++ b/engines/titanic/gfx/icon_nav_send.h @@ -28,7 +28,7 @@ namespace Titanic { class CIconNavSend : public CPetGraphic { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/gfx/icon_nav_up.h b/engines/titanic/gfx/icon_nav_up.h index a9702c763f..4b7320d610 100644 --- a/engines/titanic/gfx/icon_nav_up.h +++ b/engines/titanic/gfx/icon_nav_up.h @@ -28,7 +28,7 @@ namespace Titanic { class CIconNavUp : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CIconNavUp(); diff --git a/engines/titanic/gfx/keybrd_butt.h b/engines/titanic/gfx/keybrd_butt.h index 5514f115c7..822be41ed2 100644 --- a/engines/titanic/gfx/keybrd_butt.h +++ b/engines/titanic/gfx/keybrd_butt.h @@ -28,7 +28,7 @@ namespace Titanic { class CKeybrdButt : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CKeybrdButt(); diff --git a/engines/titanic/gfx/music_slider.h b/engines/titanic/gfx/music_slider.h index 1636afeb89..be2c5631b6 100644 --- a/engines/titanic/gfx/music_slider.h +++ b/engines/titanic/gfx/music_slider.h @@ -28,7 +28,7 @@ namespace Titanic { class CMusicSlider : public CMusicControl { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/gfx/music_switch.h b/engines/titanic/gfx/music_switch.h index 6ee615d594..35af84bdbf 100644 --- a/engines/titanic/gfx/music_switch.h +++ b/engines/titanic/gfx/music_switch.h @@ -28,7 +28,7 @@ namespace Titanic { class CMusicSwitch : public CMusicControl { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/gfx/send_to_succ.h b/engines/titanic/gfx/send_to_succ.h index dfcb345f4c..734c4a7db3 100644 --- a/engines/titanic/gfx/send_to_succ.h +++ b/engines/titanic/gfx/send_to_succ.h @@ -28,7 +28,7 @@ namespace Titanic { class CSendToSucc : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CSendToSucc(); diff --git a/engines/titanic/gfx/sgt_selector.h b/engines/titanic/gfx/sgt_selector.h index 2afd40209b..be35635c2b 100644 --- a/engines/titanic/gfx/sgt_selector.h +++ b/engines/titanic/gfx/sgt_selector.h @@ -28,7 +28,7 @@ namespace Titanic { class CSGTSelector : public CPetGraphic { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/gfx/small_chev_left_off.h b/engines/titanic/gfx/small_chev_left_off.h index c3af9bb837..bed64befdb 100644 --- a/engines/titanic/gfx/small_chev_left_off.h +++ b/engines/titanic/gfx/small_chev_left_off.h @@ -28,7 +28,7 @@ namespace Titanic { class CSmallChevLeftOff : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CSmallChevLeftOff(); diff --git a/engines/titanic/gfx/small_chev_left_on.h b/engines/titanic/gfx/small_chev_left_on.h index 4fcba625fa..9d1771311c 100644 --- a/engines/titanic/gfx/small_chev_left_on.h +++ b/engines/titanic/gfx/small_chev_left_on.h @@ -28,7 +28,7 @@ namespace Titanic { class CSmallChevLeftOn : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CSmallChevLeftOn(); diff --git a/engines/titanic/gfx/small_chev_right_off.h b/engines/titanic/gfx/small_chev_right_off.h index f56cc83981..eb6ca455d2 100644 --- a/engines/titanic/gfx/small_chev_right_off.h +++ b/engines/titanic/gfx/small_chev_right_off.h @@ -28,7 +28,7 @@ namespace Titanic { class CSmallChevRightOff : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CSmallChevRightOff(); diff --git a/engines/titanic/gfx/small_chev_right_on.h b/engines/titanic/gfx/small_chev_right_on.h index aeb9ce33e7..1dfb2d6fb2 100644 --- a/engines/titanic/gfx/small_chev_right_on.h +++ b/engines/titanic/gfx/small_chev_right_on.h @@ -28,7 +28,7 @@ namespace Titanic { class CSmallChevRightOn : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CSmallChevRightOn(); diff --git a/engines/titanic/gfx/st_button.h b/engines/titanic/gfx/st_button.h index 6a8af1b9fa..789437691b 100644 --- a/engines/titanic/gfx/st_button.h +++ b/engines/titanic/gfx/st_button.h @@ -30,7 +30,7 @@ namespace Titanic { class CSTButton : public CBackground { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool MouseButtonDownMsg(CMouseButtonDownMsg *msg); bool MouseButtonUpMsg(CMouseButtonUpMsg *msg); bool EnterViewMsg(CEnterViewMsg *msg); diff --git a/engines/titanic/gfx/text_down.h b/engines/titanic/gfx/text_down.h index 5c924b8129..97660605d5 100644 --- a/engines/titanic/gfx/text_down.h +++ b/engines/titanic/gfx/text_down.h @@ -28,7 +28,7 @@ namespace Titanic { class CTextDown : public CPetGraphic { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/gfx/text_skrew.h b/engines/titanic/gfx/text_skrew.h index df90d95ba6..d0d9b82afd 100644 --- a/engines/titanic/gfx/text_skrew.h +++ b/engines/titanic/gfx/text_skrew.h @@ -28,7 +28,7 @@ namespace Titanic { class CTextSkrew : public CPetGraphic { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/gfx/text_up.h b/engines/titanic/gfx/text_up.h index 0e839e0345..dda8d8461b 100644 --- a/engines/titanic/gfx/text_up.h +++ b/engines/titanic/gfx/text_up.h @@ -28,7 +28,7 @@ namespace Titanic { class CTextUp : public CPetGraphic { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/gfx/toggle_button.h b/engines/titanic/gfx/toggle_button.h index 9eb6fdb8c8..5328072982 100644 --- a/engines/titanic/gfx/toggle_button.h +++ b/engines/titanic/gfx/toggle_button.h @@ -28,7 +28,7 @@ namespace Titanic { class CToggleButton : public CBackground { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; private: int _fieldE0; public: diff --git a/engines/titanic/npcs/character.h b/engines/titanic/npcs/character.h index 6f3de9a06a..4912740189 100644 --- a/engines/titanic/npcs/character.h +++ b/engines/titanic/npcs/character.h @@ -28,7 +28,7 @@ namespace Titanic { class CCharacter : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool LeaveViewMsg(CLeaveViewMsg *msg); bool TurnOn(CTurnOn *msg); bool TurnOff(CTurnOff *msg); diff --git a/engines/titanic/npcs/deskbot.h b/engines/titanic/npcs/deskbot.h index e900781ea6..ab48d63546 100644 --- a/engines/titanic/npcs/deskbot.h +++ b/engines/titanic/npcs/deskbot.h @@ -28,7 +28,7 @@ namespace Titanic { class CDeskbot : public CTrueTalkNPC { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool TurnOn(CTurnOn *msg); bool EnterViewMsg(CEnterViewMsg *msg); bool ActMsg(CActMsg *msg); diff --git a/engines/titanic/npcs/mobile.h b/engines/titanic/npcs/mobile.h index f9b3955d71..68e74a5afe 100644 --- a/engines/titanic/npcs/mobile.h +++ b/engines/titanic/npcs/mobile.h @@ -28,7 +28,7 @@ namespace Titanic { class CMobile : public CCharacter { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; private: Point _pos1; int _fieldDC; diff --git a/engines/titanic/npcs/true_talk_npc.h b/engines/titanic/npcs/true_talk_npc.h index cece8ed055..0deb832c82 100644 --- a/engines/titanic/npcs/true_talk_npc.h +++ b/engines/titanic/npcs/true_talk_npc.h @@ -38,7 +38,7 @@ enum NpcFlag { class CViewItem; class CTrueTalkNPC : public CCharacter { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool TextInputMsg(CTextInputMsg *msg); bool TrueTalkGetAssetDetailsMsg(CTrueTalkGetAssetDetailsMsg *msg); bool DismissBotMsg(CDismissBotMsg *msg); diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h index 468c4f3b14..5e77b15230 100644 --- a/engines/titanic/pet_control/pet_control.h +++ b/engines/titanic/pet_control/pet_control.h @@ -43,7 +43,7 @@ namespace Titanic { enum SummonResult { SUMMON_CANT = 0, SUMMON_PRESENT = 1, SUMMON_CAN = 2 }; class CPetControl : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; struct PetEventInfo { int _id; CPetSection *_target; diff --git a/engines/titanic/pet_control/pet_drag_chev.h b/engines/titanic/pet_control/pet_drag_chev.h index 153b954c40..9f4a6f0dc9 100644 --- a/engines/titanic/pet_control/pet_drag_chev.h +++ b/engines/titanic/pet_control/pet_drag_chev.h @@ -28,7 +28,7 @@ namespace Titanic { class CPetDragChev : public CPetGraphic2 { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; protected: bool MouseDragStartMsg(CMouseDragStartMsg *msg); bool MouseDragMoveMsg(CMouseDragMoveMsg *msg); diff --git a/engines/titanic/pet_control/pet_graphic.h b/engines/titanic/pet_control/pet_graphic.h index 082a27fe0d..630c8446eb 100644 --- a/engines/titanic/pet_control/pet_graphic.h +++ b/engines/titanic/pet_control/pet_graphic.h @@ -28,7 +28,7 @@ namespace Titanic { class CPetGraphic : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/pet_control/pet_graphic2.h b/engines/titanic/pet_control/pet_graphic2.h index 6b832fef7d..58852fc65e 100644 --- a/engines/titanic/pet_control/pet_graphic2.h +++ b/engines/titanic/pet_control/pet_graphic2.h @@ -28,7 +28,7 @@ namespace Titanic { class CPetGraphic2 : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/pet_control/pet_leaf.h b/engines/titanic/pet_control/pet_leaf.h index 8428647eab..0c21352e39 100644 --- a/engines/titanic/pet_control/pet_leaf.h +++ b/engines/titanic/pet_control/pet_leaf.h @@ -28,7 +28,7 @@ namespace Titanic { class PETLeaf : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/pet_control/pet_mode_off.h b/engines/titanic/pet_control/pet_mode_off.h index a906bc6174..9162270953 100644 --- a/engines/titanic/pet_control/pet_mode_off.h +++ b/engines/titanic/pet_control/pet_mode_off.h @@ -28,7 +28,7 @@ namespace Titanic { class CPetModeOff : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CPetModeOff(); diff --git a/engines/titanic/pet_control/pet_mode_on.h b/engines/titanic/pet_control/pet_mode_on.h index 074e33ea8c..f77fd1f447 100644 --- a/engines/titanic/pet_control/pet_mode_on.h +++ b/engines/titanic/pet_control/pet_mode_on.h @@ -28,7 +28,7 @@ namespace Titanic { class CPetModeOn : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CPetModeOn(); diff --git a/engines/titanic/pet_control/pet_mode_panel.h b/engines/titanic/pet_control/pet_mode_panel.h index 0812c11942..f37c543b98 100644 --- a/engines/titanic/pet_control/pet_mode_panel.h +++ b/engines/titanic/pet_control/pet_mode_panel.h @@ -28,7 +28,7 @@ namespace Titanic { class CPetModePanel : public CToggleSwitch { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; CPetModePanel(); diff --git a/engines/titanic/pet_control/pet_pannel1.h b/engines/titanic/pet_control/pet_pannel1.h index 7ca7378a09..f39314fed9 100644 --- a/engines/titanic/pet_control/pet_pannel1.h +++ b/engines/titanic/pet_control/pet_pannel1.h @@ -28,7 +28,7 @@ namespace Titanic { class CPetPannel1 : public CPetGraphic { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/pet_control/pet_pannel2.h b/engines/titanic/pet_control/pet_pannel2.h index 62dd2aae2b..f820847035 100644 --- a/engines/titanic/pet_control/pet_pannel2.h +++ b/engines/titanic/pet_control/pet_pannel2.h @@ -28,7 +28,7 @@ namespace Titanic { class CPetPannel2 : public CPetGraphic { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/pet_control/pet_pannel3.h b/engines/titanic/pet_control/pet_pannel3.h index 2acf269873..dd0d2f9fa2 100644 --- a/engines/titanic/pet_control/pet_pannel3.h +++ b/engines/titanic/pet_control/pet_pannel3.h @@ -28,7 +28,7 @@ namespace Titanic { class CPetPannel3 : public CPetGraphic { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/sound/dome_from_top_of_well.h b/engines/titanic/sound/dome_from_top_of_well.h index fba71685f1..e3d2877379 100644 --- a/engines/titanic/sound/dome_from_top_of_well.h +++ b/engines/titanic/sound/dome_from_top_of_well.h @@ -28,7 +28,7 @@ namespace Titanic { class CDomeFromTopOfWell : public CViewAutoSoundPlayer { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: CLASSDEF; diff --git a/engines/titanic/sound/water_lapping_sounds.h b/engines/titanic/sound/water_lapping_sounds.h index d7017d29c1..5db41a312e 100644 --- a/engines/titanic/sound/water_lapping_sounds.h +++ b/engines/titanic/sound/water_lapping_sounds.h @@ -28,7 +28,7 @@ namespace Titanic { class CWaterLappingSounds : public CRoomAutoSoundPlayer { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; public: int _value; public: diff --git a/engines/titanic/star_control/star_control.h b/engines/titanic/star_control/star_control.h index f5f0af2653..c0561ce908 100644 --- a/engines/titanic/star_control/star_control.h +++ b/engines/titanic/star_control/star_control.h @@ -30,7 +30,7 @@ namespace Titanic { class CStarControl : public CGameObject { - DECLARE_MESSAGE_MAP + DECLARE_MESSAGE_MAP; bool MouseButtonDownMsg(CMouseButtonDownMsg *msg); bool MouseMoveMsg(CMouseMoveMsg *msg); bool KeyCharMsg(CKeyCharMsg *msg); |