TITANIC: Set up empty message targets for classes without messages

engines/titanic/carry/brain.cpp

@@ -123,7 +123,7 @@ bool CBrain::PassOnDragStartMsg(CPassOnDragStartMsg *msg) {
 bool CBrain::PETGainedObjectMsg(CPETGainedObjectMsg *msg) {
 	if (!_field138) {
 		if (getName() == "Perch") {
-			incState38();
+			stateInc38();
 			_field138 = 1;
 		}
 	}

engines/titanic/carry/feathers.cpp

@@ -24,8 +24,7 @@
 
 namespace Titanic {
 
-BEGIN_MESSAGE_MAP(CFeathers, CCarry)
+EMPTY_MESSAGE_MAP(CFeathers, CCarry)
-END_MESSAGE_MAP()
 
 CFeathers::CFeathers() : CCarry() {
 }

engines/titanic/carry/hose_end.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CHoseEnd, CHose)
+
 CHoseEnd::CHoseEnd() : CHose() {
 	_string6 = "Connection refused by remote hose.";
 }

engines/titanic/carry/hose_end.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CHoseEnd : public CHose {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 	CHoseEnd();

engines/titanic/carry/parcel.cpp

@@ -24,8 +24,7 @@
 
 namespace Titanic {
 
-BEGIN_MESSAGE_MAP(CParcel, CCarry)
+EMPTY_MESSAGE_MAP(CParcel, CCarry)
-END_MESSAGE_MAP()
 
 CParcel::CParcel() : CCarry() {
 }

engines/titanic/core/dont_save_file_item.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CDontSaveFileItem, CFileItem)
+
 void CDontSaveFileItem::save(SimpleFile *file, int indent) const {
 	file->writeNumberLine(0, indent);
 }

engines/titanic/core/dont_save_file_item.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CDontSaveFileItem : public CFileItem {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 

engines/titanic/core/file_item.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CFileItem, CTreeItem)
+
 void CFileItem::save(SimpleFile *file, int indent) const {
 	file->writeNumberLine(0, indent);
 	CTreeItem::save(file, indent);

engines/titanic/core/file_item.h

@@ -30,6 +30,7 @@
 namespace Titanic {
 
 class CFileItem: public CTreeItem {
+	DECLARE_MESSAGE_MAP
 private:
 	CString _filename;
 public:

engines/titanic/core/game_object.cpp

@@ -35,8 +35,7 @@
 
 namespace Titanic {
 
-BEGIN_MESSAGE_MAP(CGameObject, CNamedItem)
+EMPTY_MESSAGE_MAP(CGameObject, CNamedItem)
-END_MESSAGE_MAP()
 
 CCreditText *CGameObject::_credits;
 
@@ -424,6 +423,10 @@ void CGameObject::soundFn5(int v1, int v2, int v3) {
 	warning("CGameObject::soundFn5");
 }
 
+void CGameObject::sound8(bool flag) const {
+	getGameManager()->_sound.managerProc8(flag ? 3 : 0);
+}
+
 void CGameObject::setVisible(bool val) {
 	if (val != _visible) {
 		_visible = val;
@@ -582,10 +585,6 @@ int CGameObject::getSurface45() const {
 	return _surface ? _surface->proc45() : 0;
 }
 
-void CGameObject::sound8(bool flag) const {
-	getGameManager()->_sound.managerProc8(flag ? 3 : 0);
-}
-
 void CGameObject::loadSound(const CString &name) {
 	CGameManager *gameManager = getGameManager();
 	if (gameManager) {
@@ -855,15 +854,11 @@ void CGameObject::moveToView(const CString &name) {
 	view->addUnder(this);
 }
 
-void CGameObject::incState38() {
-	getGameManager()->_gameState.inc38();
-}
-
 void CGameObject::stateInc14() {
 	getGameManager()->_gameState.inc14();
 }
 
-int CGameObject::stateGet14() {
+int CGameObject::stateGet14() const {
 	return getGameManager()->_gameState._field14;
 }
 
@@ -871,10 +866,22 @@ void CGameObject::stateSet24() {
 	getGameManager()->_gameState.set24(1);
 }
 
-int CGameObject::stateGet24() {
+int CGameObject::stateGet24() const {
 	return getGameManager()->_gameState.get24();
 }
 
+void CGameObject::stateInc38() {
+	getGameManager()->_gameState.inc38();
+}
+
+int CGameObject::stateGet38() const {
+	return getGameManager()->_gameState._field38;
+}
+
+void CGameObject::quitGame() {
+	getGameManager()->_gameState._quitGame = true;
+}
+
 void CGameObject::inc54() {
 	getGameManager()->inc54();
 }

engines/titanic/core/game_object.h

@@ -201,6 +201,8 @@ protected:
 
 	void soundFn5(int v1, int v2, int v3);
 
+	void sound8(bool flag) const;
+
 	/**
 	 * Adds a timer
 	 */
@@ -287,8 +289,6 @@ protected:
 	 */
 	Point getControid() const;
 
-	void sound8(bool flag) const;
-
 	/**
 	 * Plays a movie
 	 */
@@ -440,11 +440,17 @@ protected:
 	void petUnlockInput();
 
 	void setState1C(bool flag);
-	void incState38();
 	void stateInc14();
-	int stateGet14();
+	int stateGet14() const;
 	void stateSet24();
-	int stateGet24();
+	int stateGet24() const;
+	void stateInc38();
+	int stateGet38() const;
+
+	/**
+	 * Flag to quit the game
+	 */
+	void quitGame();
 
 	void surface39(int v1, int v2);
 

engines/titanic/core/link_item.cpp

@@ -27,6 +27,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CLinkItem, CNamedItem)
+
 CLinkItem::CLinkItem() : CNamedItem() {
 	_roomNumber = -1;
 	_nodeNumber = -1;

engines/titanic/core/link_item.h

@@ -34,6 +34,7 @@ class CNodeItem;
 class CRoomItem;
 
 class CLinkItem : public CNamedItem {
+	DECLARE_MESSAGE_MAP
 private:
 	/**
 	 * Returns a new name for the link item, based on the

engines/titanic/core/message_target.h

@@ -68,6 +68,21 @@ protected: \
 		return &messageMap; \
 	}
 
+#define EMPTY_MESSAGE_MAP(theClass, baseClass) \
+	const MSGMAP *theClass::getMessageMap() const \
+		{ return getThisMessageMap(); } \
+	const MSGMAP *theClass::getThisMessageMap() \
+	{ \
+		typedef theClass ThisClass;						   \
+		typedef baseClass TheBaseClass;					   \
+		static const MSGMAP_ENTRY _messageEntries[] = { \
+		{ (PMSG)nullptr, nullptr } \
+	}; \
+		static const MSGMAP messageMap = \
+		{ &TheBaseClass::getThisMessageMap, &_messageEntries[0] }; \
+		return &messageMap; \
+	}
+
 class CMessageTarget: public CSaveableObject {
 	DECLARE_MESSAGE_MAP
 public:

engines/titanic/core/named_item.cpp

@@ -27,8 +27,7 @@
 
 namespace Titanic {
 
-BEGIN_MESSAGE_MAP(CNamedItem, CTreeItem)
+EMPTY_MESSAGE_MAP(CNamedItem, CTreeItem)
-END_MESSAGE_MAP()
 
 CString CNamedItem::dumpItem(int indent) const {
 	CString result = CTreeItem::dumpItem(indent);

engines/titanic/core/node_item.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CNodeItem, CNamedItem)
+
 CNodeItem::CNodeItem() : CNamedItem(), _nodeNumber(0) {
 }
 

engines/titanic/core/node_item.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CNodeItem : public CNamedItem {
+	DECLARE_MESSAGE_MAP
 public:
 	int _nodeNumber;
 	Point _nodePos;

engines/titanic/core/project_item.cpp

@@ -41,6 +41,8 @@ namespace Titanic {
 static const char *const SAVEGAME_STR = "TNIC";
 #define SAVEGAME_STR_SIZE 4
 
+EMPTY_MESSAGE_MAP(CProjectItem, CFileItem)
+
 void CFileListItem::save(SimpleFile *file, int indent) const {
 	file->writeNumberLine(0, indent);
 	file->writeQuotedLine(_name, indent);

engines/titanic/core/project_item.h

@@ -73,11 +73,10 @@ public:
  * Filename list
  */
 class CFileList: public List<CFileListItem> {
-public:
 };
 
-
 class CProjectItem : public CFileItem {
+	DECLARE_MESSAGE_MAP
 private:
 	CString _filename;
 	CFileList _files;

engines/titanic/core/room_item.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CRoomItem, CNamedItem)
+
 CRoomItem::CRoomItem() : CNamedItem(), _roomNumber(0),
 		_roomDimensionX(0.0), _roomDimensionY(0.0) {
 }

engines/titanic/core/room_item.h

@@ -32,6 +32,7 @@
 namespace Titanic {
 
 class CRoomItem : public CNamedItem {
+	DECLARE_MESSAGE_MAP
 private:
 	/**
 	 * Handles post-load processing

engines/titanic/core/static_image.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CStaticImage, CGameObject)
+
 void CStaticImage::save(SimpleFile *file, int indent) const {
 	file->writeNumberLine(1, indent);
 	CGameObject::save(file, indent);

engines/titanic/core/static_image.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CStaticImage : public CGameObject {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 

engines/titanic/core/tree_item.cpp

@@ -38,8 +38,7 @@
 
 namespace Titanic {
 
-BEGIN_MESSAGE_MAP(CTreeItem, CMessageTarget)
+EMPTY_MESSAGE_MAP(CTreeItem, CMessageTarget)
-END_MESSAGE_MAP()
 
 CTreeItem::CTreeItem() : _parent(nullptr), _firstChild(nullptr),
 	_nextSibling(nullptr), _priorSibling(nullptr), _field14(0) {

engines/titanic/game/arb_background.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CArbBackground, CBackground)
+
 CArbBackground::CArbBackground() : CBackground(),
 	_fieldE0(0), _fieldE4(61), _fieldE8(62), _fieldEC(118) {
 }

engines/titanic/game/arb_background.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CArbBackground : public CBackground {
+	DECLARE_MESSAGE_MAP
 public:
 	int _fieldE0;
 	int _fieldE4;

engines/titanic/game/broken_pell_base.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CBrokenPellBase, CBackground)
+
 int CBrokenPellBase::_v1;
 int CBrokenPellBase::_v2;
 

engines/titanic/game/broken_pell_base.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CBrokenPellBase : public CBackground {
+	DECLARE_MESSAGE_MAP
 private:
 	static int _v1;
 	static int _v2;

engines/titanic/game/leave_sec_class_state.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CLeaveSecClassState, CGameObject)
+
 void CLeaveSecClassState::save(SimpleFile *file, int indent) const {
 	file->writeNumberLine(1, indent);
 	CGameObject::save(file, indent);

engines/titanic/game/leave_sec_class_state.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CLeaveSecClassState : public CGameObject {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 

engines/titanic/game/music_room_phonograph.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CMusicRoomPhonograph, CRestaurantPhonograph)
+
 void CMusicRoomPhonograph::save(SimpleFile *file, int indent) const {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_field118, indent);

engines/titanic/game/music_room_phonograph.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CMusicRoomPhonograph : public CRestaurantPhonograph {
+	DECLARE_MESSAGE_MAP
 private:
 	int _field118;
 public:

engines/titanic/game/musical_instrument.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CMusicalInstrument, CBackground)
+
 void CMusicalInstrument::save(SimpleFile *file, int indent) const {
 	file->writeNumberLine(1, indent);
 	CBackground::save(file, indent);

engines/titanic/game/musical_instrument.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CMusicalInstrument : public CBackground {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 

engines/titanic/game/navigation_computer.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CNavigationComputer, CGameObject)
+
 void CNavigationComputer::save(SimpleFile *file, int indent) const {
 	file->writeNumberLine(1, indent);
 	CGameObject::save(file, indent);

engines/titanic/game/navigation_computer.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CNavigationComputer : public CGameObject {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 

engines/titanic/game/null_port_hole.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CNullPortHole, CClickResponder)
+
 CNullPortHole::CNullPortHole() : CClickResponder() {
 	_string1 = "For a better view, why not visit the Promenade Deck?";
 	_string2 = "b#48.wav";

engines/titanic/game/null_port_hole.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CNullPortHole : public CClickResponder {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 	CNullPortHole();

engines/titanic/game/parrot/parrot_lobby_object.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CParrotLobbyObject, CGameObject)
+
 int CParrotLobbyObject::_v1;
 int CParrotLobbyObject::_v2;
 int CParrotLobbyObject::_v3;

engines/titanic/game/parrot/parrot_lobby_object.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CParrotLobbyObject : public CGameObject {
+	DECLARE_MESSAGE_MAP
 public:
 	static int _v1;
 	static int _v2;

engines/titanic/game/pet/pet_class1.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CPETClass1, CGameObject)
+
 void CPETClass1::save(SimpleFile *file, int indent) const {
 	file->writeNumberLine(1, indent);
 	CGameObject::save(file, indent);

engines/titanic/game/pet/pet_class1.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CPETClass1 : public CGameObject {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 

engines/titanic/game/pet/pet_class2.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CPETClass2, CGameObject)
+
 void CPETClass2::save(SimpleFile *file, int indent) const {
 	file->writeNumberLine(1, indent);
 	CGameObject::save(file, indent);

engines/titanic/game/pet/pet_class2.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CPETClass2 : public CGameObject {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 

engines/titanic/game/pet/pet_class3.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CPETClass3, CGameObject)
+
 void CPETClass3::save(SimpleFile *file, int indent) const {
 	file->writeNumberLine(1, indent);
 	CGameObject::save(file, indent);

engines/titanic/game/pet/pet_class3.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CPETClass3 : public CGameObject {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 

engines/titanic/game/splash_animation.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CSplashAnimation, CGameObject)
+
 void CSplashAnimation::save(SimpleFile *file, int indent) const {
 	file->writeNumberLine(1, indent);
 	CGameObject::save(file, indent);

engines/titanic/game/splash_animation.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CSplashAnimation : public CGameObject {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 

engines/titanic/game/transport/transport.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CTransport, CMobile)
+
 CTransport::CTransport() : CMobile(), _string1("*.*.*") {
 }
 

engines/titanic/game/transport/transport.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CTransport : public CMobile {
+	DECLARE_MESSAGE_MAP
 public:
 	CString _string1;
 	CString _string2;

engines/titanic/gfx/chev_left_off.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CChevLeftOff, CToggleSwitch)
+
 CChevLeftOff::CChevLeftOff() : CToggleSwitch() {
 }
 

engines/titanic/gfx/chev_left_off.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CChevLeftOff : public CToggleSwitch {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 	CChevLeftOff();

engines/titanic/gfx/chev_left_on.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CChevLeftOn, CToggleSwitch)
+
 CChevLeftOn::CChevLeftOn() : CToggleSwitch() {
 }
 

engines/titanic/gfx/chev_left_on.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CChevLeftOn : public CToggleSwitch {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 	CChevLeftOn();

engines/titanic/gfx/chev_right_off.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CChevRightOff, CToggleSwitch)
+
 CChevRightOff::CChevRightOff() : CToggleSwitch() {
 }
 

engines/titanic/gfx/chev_right_off.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CChevRightOff : public CToggleSwitch {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 	CChevRightOff();

engines/titanic/gfx/chev_right_on.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CChevRightOn, CToggleSwitch)
+
 CChevRightOn::CChevRightOn() : CToggleSwitch() {
 }
 

engines/titanic/gfx/chev_right_on.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CChevRightOn : public CToggleSwitch {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 	CChevRightOn();

engines/titanic/gfx/chev_send_rec_switch.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CChevSendRecSwitch, CToggleSwitch)
+
 CChevSendRecSwitch::CChevSendRecSwitch() : CToggleSwitch() {
 }
 

engines/titanic/gfx/chev_send_rec_switch.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CChevSendRecSwitch : public CToggleSwitch {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 	CChevSendRecSwitch();

engines/titanic/gfx/elevator_button.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CElevatorButton, CSTButton)
+
 CElevatorButton::CElevatorButton() : CSTButton() {
 }
 

engines/titanic/gfx/elevator_button.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CElevatorButton : public CSTButton {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 	CElevatorButton();

engines/titanic/gfx/get_from_succ.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CGetFromSucc, CToggleSwitch)
+
 CGetFromSucc::CGetFromSucc() : CToggleSwitch() {
 }
 

engines/titanic/gfx/get_from_succ.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CGetFromSucc : public CToggleSwitch {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 	CGetFromSucc();

engines/titanic/gfx/helmet_on_off.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CHelmetOnOff, CToggleSwitch)
+
 CHelmetOnOff::CHelmetOnOff() : CToggleSwitch() {
 }
 

engines/titanic/gfx/helmet_on_off.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CHelmetOnOff : public CToggleSwitch {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 	CHelmetOnOff();

engines/titanic/gfx/home_photo.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CHomePhoto, CToggleSwitch)
+
 CHomePhoto::CHomePhoto() : CToggleSwitch() {
 }
 

engines/titanic/gfx/home_photo.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CHomePhoto : public CToggleSwitch {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 	CHomePhoto();

engines/titanic/gfx/icon_nav_action.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CIconNavAction, CToggleSwitch)
+
 CIconNavAction::CIconNavAction() : CToggleSwitch() {
 }
 

engines/titanic/gfx/icon_nav_action.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CIconNavAction : public CToggleSwitch {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 	CIconNavAction();

engines/titanic/gfx/icon_nav_butt.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CIconNavButt, CPetGraphic)
+
 void CIconNavButt::save(SimpleFile *file, int indent) const {
 	file->writeNumberLine(1, indent);
 	CPetGraphic::save(file, indent);

engines/titanic/gfx/icon_nav_butt.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CIconNavButt : public CPetGraphic {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 

engines/titanic/gfx/icon_nav_down.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CIconNavDown, CToggleSwitch)
+
 CIconNavDown::CIconNavDown() : CToggleSwitch() {
 }
 

engines/titanic/gfx/icon_nav_down.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CIconNavDown : public CToggleSwitch {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 	CIconNavDown();

engines/titanic/gfx/icon_nav_image.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CIconNavImage, CPetGraphic)
+
 void CIconNavImage::save(SimpleFile *file, int indent) const {
 	file->writeNumberLine(1, indent);
 	CPetGraphic::save(file, indent);

engines/titanic/gfx/icon_nav_image.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CIconNavImage : public CPetGraphic {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 

engines/titanic/gfx/icon_nav_left.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CIconNavLeft, CToggleSwitch)
+
 CIconNavLeft::CIconNavLeft() : CToggleSwitch() {
 }
 

engines/titanic/gfx/icon_nav_left.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CIconNavLeft : public CToggleSwitch {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 	CIconNavLeft();

engines/titanic/gfx/icon_nav_receive.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CIconNavReceive, CPetGraphic)
+
 void CIconNavReceive::save(SimpleFile *file, int indent) const {
 	file->writeNumberLine(1, indent);
 	CPetGraphic::save(file, indent);

engines/titanic/gfx/icon_nav_receive.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CIconNavReceive : public CPetGraphic {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 

engines/titanic/gfx/icon_nav_right.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CIconNavRight, CToggleSwitch)
+
 CIconNavRight::CIconNavRight() : CToggleSwitch() {
 }
 

engines/titanic/gfx/icon_nav_right.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CIconNavRight : public CToggleSwitch {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 	CIconNavRight();

engines/titanic/gfx/icon_nav_send.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CIconNavSend, CPetGraphic)
+
 void CIconNavSend::save(SimpleFile *file, int indent) const {
 	file->writeNumberLine(1, indent);
 	CPetGraphic::save(file, indent);

engines/titanic/gfx/icon_nav_send.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CIconNavSend : public CPetGraphic {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 

engines/titanic/gfx/icon_nav_up.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CIconNavUp, CToggleSwitch)
+
 CIconNavUp::CIconNavUp() : CToggleSwitch() {
 }
 

engines/titanic/gfx/icon_nav_up.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CIconNavUp : public CToggleSwitch {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 	CIconNavUp();

engines/titanic/gfx/keybrd_butt.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CKeybrdButt, CToggleSwitch)
+
 CKeybrdButt::CKeybrdButt() : CToggleSwitch() {
 }
 

engines/titanic/gfx/keybrd_butt.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CKeybrdButt : public CToggleSwitch {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 	CKeybrdButt();

engines/titanic/gfx/music_slider.cpp

@@ -0,0 +1,39 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "titanic/gfx/music_slider.h"
+
+namespace Titanic {
+
+EMPTY_MESSAGE_MAP(CMusicSlider, CMusicControl)
+
+void CMusicSlider::save(SimpleFile *file, int indent) const {
+	file->writeNumberLine(1, indent);
+	CMusicControl::save(file, indent);
+}
+
+void CMusicSlider::load(SimpleFile *file) {
+	file->readNumber();
+	CMusicControl::load(file);
+}
+
+} // End of namespace Titanic

engines/titanic/gfx/music_slider.h

@@ -28,24 +28,19 @@
 namespace Titanic {
 
 class CMusicSlider : public CMusicControl {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
 	 */
-	virtual void save(SimpleFile *file, int indent) const {
+	virtual void save(SimpleFile *file, int indent) const;
-		file->writeNumberLine(1, indent);
-		CMusicControl::save(file, indent);
-	}
 
 	/**
 	 * Load the data for the class from file
 	 */
-	virtual void load(SimpleFile *file) {
+	virtual void load(SimpleFile *file);
-		file->readNumber();
-		CMusicControl::load(file);
-	}
 };
 
 } // End of namespace Titanic

engines/titanic/gfx/music_switch.cpp

@@ -0,0 +1,39 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "titanic/gfx/music_switch.h"
+
+namespace Titanic {
+
+EMPTY_MESSAGE_MAP(CMusicSwitch, CMusicControl)
+
+void CMusicSwitch::save(SimpleFile *file, int indent) const {
+	file->writeNumberLine(1, indent);
+	CMusicControl::save(file, indent);
+}
+
+void CMusicSwitch::load(SimpleFile *file) {
+	file->readNumber();
+	CMusicControl::load(file);
+}
+
+} // End of namespace Titanic

engines/titanic/gfx/music_switch.h

@@ -28,24 +28,19 @@
 namespace Titanic {
 
 class CMusicSwitch : public CMusicControl {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 
 	/**
 	 * Save the data for the class to file
 	 */
-	virtual void save(SimpleFile *file, int indent) const {
+	virtual void save(SimpleFile *file, int indent) const;
-		file->writeNumberLine(1, indent);
-		CMusicControl::save(file, indent);
-	}
 
 	/**
 	 * Load the data for the class from file
 	 */
-	virtual void load(SimpleFile *file) {
+	virtual void load(SimpleFile *file);
-		file->readNumber();
-		CMusicControl::load(file);
-	}
 };
 
 } // End of namespace Titanic

engines/titanic/gfx/send_to_succ.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CSendToSucc, CToggleSwitch)
+
 CSendToSucc::CSendToSucc() : CToggleSwitch() {
 }
 

engines/titanic/gfx/send_to_succ.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CSendToSucc : public CToggleSwitch {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 	CSendToSucc();

engines/titanic/gfx/sgt_selector.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CSGTSelector, CPetGraphic)
+
 void CSGTSelector::save(SimpleFile *file, int indent) const {
 	file->writeNumberLine(1, indent);
 	CPetGraphic::save(file, indent);

engines/titanic/gfx/sgt_selector.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CSGTSelector : public CPetGraphic {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 

engines/titanic/gfx/small_chev_left_off.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CSmallChevLeftOff, CToggleSwitch)
+
 CSmallChevLeftOff::CSmallChevLeftOff() : CToggleSwitch() {
 }
 

engines/titanic/gfx/small_chev_left_off.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CSmallChevLeftOff : public CToggleSwitch {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 	CSmallChevLeftOff();

engines/titanic/gfx/small_chev_left_on.cpp

@@ -24,6 +24,8 @@
 
 namespace Titanic {
 
+EMPTY_MESSAGE_MAP(CSmallChevLeftOn, CToggleSwitch)
+
 CSmallChevLeftOn::CSmallChevLeftOn() : CToggleSwitch() {
 }
 

engines/titanic/gfx/small_chev_left_on.h

@@ -28,6 +28,7 @@
 namespace Titanic {
 
 class CSmallChevLeftOn : public CToggleSwitch {
+	DECLARE_MESSAGE_MAP
 public:
 	CLASSDEF
 	CSmallChevLeftOn();