TITANIC: Add semicolon after EMPTY_MESSAGE_MAP macro usages

70 files changed, 71 insertions, 70 deletions

diff --git a/engines/titanic/carry/feathers.cpp b/engines/titanic/carry/feathers.cpp
index c2cf369bd8..a5d2babfb1 100644
--- a/engines/titanic/carry/feathers.cpp
+++ b/engines/titanic/carry/feathers.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CFeathers, CCarry)
+EMPTY_MESSAGE_MAP(CFeathers, CCarry);
 
 CFeathers::CFeathers() : CCarry() {
 }
diff --git a/engines/titanic/carry/hose_end.cpp b/engines/titanic/carry/hose_end.cpp
index f6097c4db7..c9996437bb 100644
--- a/engines/titanic/carry/hose_end.cpp
+++ b/engines/titanic/carry/hose_end.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CHoseEnd, CHose)
+EMPTY_MESSAGE_MAP(CHoseEnd, CHose);
 
 CHoseEnd::CHoseEnd() : CHose() {
 	_string6 = "Connection refused by remote hose.";
diff --git a/engines/titanic/carry/parcel.cpp b/engines/titanic/carry/parcel.cpp
index 13e2f6dec4..2ffe8b0aac 100644
--- a/engines/titanic/carry/parcel.cpp
+++ b/engines/titanic/carry/parcel.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CParcel, CCarry)
+EMPTY_MESSAGE_MAP(CParcel, CCarry);
 
 CParcel::CParcel() : CCarry() {
 }
diff --git a/engines/titanic/core/dont_save_file_item.cpp b/engines/titanic/core/dont_save_file_item.cpp
index 87ab77e78b..b8864bb2b5 100644
--- a/engines/titanic/core/dont_save_file_item.cpp
+++ b/engines/titanic/core/dont_save_file_item.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CDontSaveFileItem, CFileItem)
+EMPTY_MESSAGE_MAP(CDontSaveFileItem, CFileItem);
 
 void CDontSaveFileItem::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(0, indent);
diff --git a/engines/titanic/core/file_item.cpp b/engines/titanic/core/file_item.cpp
index 824195d97c..b783c758df 100644
--- a/engines/titanic/core/file_item.cpp
+++ b/engines/titanic/core/file_item.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CFileItem, CTreeItem)
+EMPTY_MESSAGE_MAP(CFileItem, CTreeItem);
 
 void CFileItem::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(0, indent);
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index af4ffab1e3..39e4f8412e 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -35,7 +35,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CGameObject, CNamedItem)
+EMPTY_MESSAGE_MAP(CGameObject, CNamedItem);
 
 CCreditText *CGameObject::_credits;
 
diff --git a/engines/titanic/core/link_item.cpp b/engines/titanic/core/link_item.cpp
index 5de0d4cdeb..110218401a 100644
--- a/engines/titanic/core/link_item.cpp
+++ b/engines/titanic/core/link_item.cpp
@@ -27,7 +27,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CLinkItem, CNamedItem)
+EMPTY_MESSAGE_MAP(CLinkItem, CNamedItem);
 
 CLinkItem::CLinkItem() : CNamedItem() {
 	_roomNumber = -1;
diff --git a/engines/titanic/core/message_target.h b/engines/titanic/core/message_target.h
index 5508c47c95..cfd7ac14e7 100644
--- a/engines/titanic/core/message_target.h
+++ b/engines/titanic/core/message_target.h
@@ -80,7 +80,8 @@ protected: \
 		static const MSGMAP messageMap = \
 		{ &TheBaseClass::getThisMessageMap, &_messageEntries[0] }; \
 		return &messageMap; \
-	}
+	} \
+	static const int DUMMY
 
 class CMessageTarget: public CSaveableObject {
 	DECLARE_MESSAGE_MAP
diff --git a/engines/titanic/core/named_item.cpp b/engines/titanic/core/named_item.cpp
index 2b741f7657..6eafbf8c8b 100644
--- a/engines/titanic/core/named_item.cpp
+++ b/engines/titanic/core/named_item.cpp
@@ -27,7 +27,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CNamedItem, CTreeItem)
+EMPTY_MESSAGE_MAP(CNamedItem, CTreeItem);
 
 CString CNamedItem::dumpItem(int indent) const {
 	CString result = CTreeItem::dumpItem(indent);
diff --git a/engines/titanic/core/node_item.cpp b/engines/titanic/core/node_item.cpp
index 79188dd385..1de065a49d 100644
--- a/engines/titanic/core/node_item.cpp
+++ b/engines/titanic/core/node_item.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CNodeItem, CNamedItem)
+EMPTY_MESSAGE_MAP(CNodeItem, CNamedItem);
 
 CNodeItem::CNodeItem() : CNamedItem(), _nodeNumber(0) {
 }
diff --git a/engines/titanic/core/project_item.cpp b/engines/titanic/core/project_item.cpp
index 4fd2ea2f5c..76293233b0 100644
--- a/engines/titanic/core/project_item.cpp
+++ b/engines/titanic/core/project_item.cpp
@@ -41,7 +41,7 @@ namespace Titanic {
 static const char *const SAVEGAME_STR = "TNIC";
 #define SAVEGAME_STR_SIZE 4
 
-EMPTY_MESSAGE_MAP(CProjectItem, CFileItem)
+EMPTY_MESSAGE_MAP(CProjectItem, CFileItem);
 
 void CFileListItem::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(0, indent);
diff --git a/engines/titanic/core/room_item.cpp b/engines/titanic/core/room_item.cpp
index a88238d94d..541a8e1a9e 100644
--- a/engines/titanic/core/room_item.cpp
+++ b/engines/titanic/core/room_item.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CRoomItem, CNamedItem)
+EMPTY_MESSAGE_MAP(CRoomItem, CNamedItem);
 
 CRoomItem::CRoomItem() : CNamedItem(), _roomNumber(0),
 		_roomDimensionX(0.0), _roomDimensionY(0.0) {
diff --git a/engines/titanic/core/static_image.cpp b/engines/titanic/core/static_image.cpp
index 67286108d8..977009e750 100644
--- a/engines/titanic/core/static_image.cpp
+++ b/engines/titanic/core/static_image.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CStaticImage, CGameObject)
+EMPTY_MESSAGE_MAP(CStaticImage, CGameObject);
 
 void CStaticImage::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/core/tree_item.cpp b/engines/titanic/core/tree_item.cpp
index 5fcd74bbd7..6adbbe39fa 100644
--- a/engines/titanic/core/tree_item.cpp
+++ b/engines/titanic/core/tree_item.cpp
@@ -38,7 +38,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CTreeItem, CMessageTarget)
+EMPTY_MESSAGE_MAP(CTreeItem, CMessageTarget);
 
 CTreeItem::CTreeItem() : _parent(nullptr), _firstChild(nullptr),
 	_nextSibling(nullptr), _priorSibling(nullptr), _field14(0) {
diff --git a/engines/titanic/game/arb_background.cpp b/engines/titanic/game/arb_background.cpp
index b86ecb1d85..f71bcf90d1 100644
--- a/engines/titanic/game/arb_background.cpp
+++ b/engines/titanic/game/arb_background.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CArbBackground, CBackground)
+EMPTY_MESSAGE_MAP(CArbBackground, CBackground);
 
 CArbBackground::CArbBackground() : CBackground(),
 	_fieldE0(0), _fieldE4(61), _fieldE8(62), _fieldEC(118) {
diff --git a/engines/titanic/game/broken_pell_base.cpp b/engines/titanic/game/broken_pell_base.cpp
index 77d3aee625..59e2b9bca1 100644
--- a/engines/titanic/game/broken_pell_base.cpp
+++ b/engines/titanic/game/broken_pell_base.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CBrokenPellBase, CBackground)
+EMPTY_MESSAGE_MAP(CBrokenPellBase, CBackground);
 
 int CBrokenPellBase::_v1;
 int CBrokenPellBase::_v2;
diff --git a/engines/titanic/game/leave_sec_class_state.cpp b/engines/titanic/game/leave_sec_class_state.cpp
index 014306220c..3e23e3ad1c 100644
--- a/engines/titanic/game/leave_sec_class_state.cpp
+++ b/engines/titanic/game/leave_sec_class_state.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CLeaveSecClassState, CGameObject)
+EMPTY_MESSAGE_MAP(CLeaveSecClassState, CGameObject);
 
 void CLeaveSecClassState::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/game/music_room_phonograph.cpp b/engines/titanic/game/music_room_phonograph.cpp
index 2fceca2e2f..06a35dc4d5 100644
--- a/engines/titanic/game/music_room_phonograph.cpp
+++ b/engines/titanic/game/music_room_phonograph.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CMusicRoomPhonograph, CRestaurantPhonograph)
+EMPTY_MESSAGE_MAP(CMusicRoomPhonograph, CRestaurantPhonograph);
 
 void CMusicRoomPhonograph::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/game/musical_instrument.cpp b/engines/titanic/game/musical_instrument.cpp
index aea58b4472..3bd2e37ccc 100644
--- a/engines/titanic/game/musical_instrument.cpp
+++ b/engines/titanic/game/musical_instrument.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CMusicalInstrument, CBackground)
+EMPTY_MESSAGE_MAP(CMusicalInstrument, CBackground);
 
 void CMusicalInstrument::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/game/navigation_computer.cpp b/engines/titanic/game/navigation_computer.cpp
index 042901c07a..49bd252988 100644
--- a/engines/titanic/game/navigation_computer.cpp
+++ b/engines/titanic/game/navigation_computer.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CNavigationComputer, CGameObject)
+EMPTY_MESSAGE_MAP(CNavigationComputer, CGameObject);
 
 void CNavigationComputer::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/game/null_port_hole.cpp b/engines/titanic/game/null_port_hole.cpp
index 060e5f04ca..e651b1b59f 100644
--- a/engines/titanic/game/null_port_hole.cpp
+++ b/engines/titanic/game/null_port_hole.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CNullPortHole, CClickResponder)
+EMPTY_MESSAGE_MAP(CNullPortHole, CClickResponder);
 
 CNullPortHole::CNullPortHole() : CClickResponder() {
 	_string1 = "For a better view, why not visit the Promenade Deck?";
diff --git a/engines/titanic/game/parrot/parrot_lobby_object.cpp b/engines/titanic/game/parrot/parrot_lobby_object.cpp
index 9d556b5b91..a78ab2b6d9 100644
--- a/engines/titanic/game/parrot/parrot_lobby_object.cpp
+++ b/engines/titanic/game/parrot/parrot_lobby_object.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CParrotLobbyObject, CGameObject)
+EMPTY_MESSAGE_MAP(CParrotLobbyObject, CGameObject);
 
 int CParrotLobbyObject::_v1;
 int CParrotLobbyObject::_v2;
diff --git a/engines/titanic/game/pet/pet_class1.cpp b/engines/titanic/game/pet/pet_class1.cpp
index 096977e26f..651a8f9ed3 100644
--- a/engines/titanic/game/pet/pet_class1.cpp
+++ b/engines/titanic/game/pet/pet_class1.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CPETClass1, CGameObject)
+EMPTY_MESSAGE_MAP(CPETClass1, CGameObject);
 
 void CPETClass1::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/game/pet/pet_class2.cpp b/engines/titanic/game/pet/pet_class2.cpp
index d13ed66fbd..e3e23f62ed 100644
--- a/engines/titanic/game/pet/pet_class2.cpp
+++ b/engines/titanic/game/pet/pet_class2.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CPETClass2, CGameObject)
+EMPTY_MESSAGE_MAP(CPETClass2, CGameObject);
 
 void CPETClass2::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/game/pet/pet_class3.cpp b/engines/titanic/game/pet/pet_class3.cpp
index 0c0adf2090..7751b994ab 100644
--- a/engines/titanic/game/pet/pet_class3.cpp
+++ b/engines/titanic/game/pet/pet_class3.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CPETClass3, CGameObject)
+EMPTY_MESSAGE_MAP(CPETClass3, CGameObject);
 
 void CPETClass3::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/game/splash_animation.cpp b/engines/titanic/game/splash_animation.cpp
index cfaf697d25..2094ec14fa 100644
--- a/engines/titanic/game/splash_animation.cpp
+++ b/engines/titanic/game/splash_animation.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CSplashAnimation, CGameObject)
+EMPTY_MESSAGE_MAP(CSplashAnimation, CGameObject);
 
 void CSplashAnimation::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/game/transport/transport.cpp b/engines/titanic/game/transport/transport.cpp
index f9598c7b7b..6fe45c2fc8 100644
--- a/engines/titanic/game/transport/transport.cpp
+++ b/engines/titanic/game/transport/transport.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CTransport, CMobile)
+EMPTY_MESSAGE_MAP(CTransport, CMobile);
 
 CTransport::CTransport() : CMobile(), _string1("*.*.*") {
 }
diff --git a/engines/titanic/gfx/chev_left_off.cpp b/engines/titanic/gfx/chev_left_off.cpp
index 51583992c2..d5c7dcffd6 100644
--- a/engines/titanic/gfx/chev_left_off.cpp
+++ b/engines/titanic/gfx/chev_left_off.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CChevLeftOff, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CChevLeftOff, CToggleSwitch);
 
 CChevLeftOff::CChevLeftOff() : CToggleSwitch() {
 }
diff --git a/engines/titanic/gfx/chev_left_on.cpp b/engines/titanic/gfx/chev_left_on.cpp
index 5b3f6a8dcf..9b4a5b6d58 100644
--- a/engines/titanic/gfx/chev_left_on.cpp
+++ b/engines/titanic/gfx/chev_left_on.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CChevLeftOn, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CChevLeftOn, CToggleSwitch);
 
 CChevLeftOn::CChevLeftOn() : CToggleSwitch() {
 }
diff --git a/engines/titanic/gfx/chev_right_off.cpp b/engines/titanic/gfx/chev_right_off.cpp
index 4cab0708b3..c4ff3628a0 100644
--- a/engines/titanic/gfx/chev_right_off.cpp
+++ b/engines/titanic/gfx/chev_right_off.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CChevRightOff, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CChevRightOff, CToggleSwitch);
 
 CChevRightOff::CChevRightOff() : CToggleSwitch() {
 }
diff --git a/engines/titanic/gfx/chev_right_on.cpp b/engines/titanic/gfx/chev_right_on.cpp
index 29a07f0d41..0351c105d2 100644
--- a/engines/titanic/gfx/chev_right_on.cpp
+++ b/engines/titanic/gfx/chev_right_on.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CChevRightOn, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CChevRightOn, CToggleSwitch);
 
 CChevRightOn::CChevRightOn() : CToggleSwitch() {
 }
diff --git a/engines/titanic/gfx/chev_send_rec_switch.cpp b/engines/titanic/gfx/chev_send_rec_switch.cpp
index 92b551852e..6e30280315 100644
--- a/engines/titanic/gfx/chev_send_rec_switch.cpp
+++ b/engines/titanic/gfx/chev_send_rec_switch.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CChevSendRecSwitch, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CChevSendRecSwitch, CToggleSwitch);
 
 CChevSendRecSwitch::CChevSendRecSwitch() : CToggleSwitch() {
 }
diff --git a/engines/titanic/gfx/elevator_button.cpp b/engines/titanic/gfx/elevator_button.cpp
index 3c61869677..e66ee19af3 100644
--- a/engines/titanic/gfx/elevator_button.cpp
+++ b/engines/titanic/gfx/elevator_button.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CElevatorButton, CSTButton)
+EMPTY_MESSAGE_MAP(CElevatorButton, CSTButton);
 
 CElevatorButton::CElevatorButton() : CSTButton() {
 }
diff --git a/engines/titanic/gfx/get_from_succ.cpp b/engines/titanic/gfx/get_from_succ.cpp
index 0f3f4ba412..d701f73537 100644
--- a/engines/titanic/gfx/get_from_succ.cpp
+++ b/engines/titanic/gfx/get_from_succ.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CGetFromSucc, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CGetFromSucc, CToggleSwitch);
 
 CGetFromSucc::CGetFromSucc() : CToggleSwitch() {
 }
diff --git a/engines/titanic/gfx/helmet_on_off.cpp b/engines/titanic/gfx/helmet_on_off.cpp
index c72c795994..06e7d43d32 100644
--- a/engines/titanic/gfx/helmet_on_off.cpp
+++ b/engines/titanic/gfx/helmet_on_off.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CHelmetOnOff, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CHelmetOnOff, CToggleSwitch);
 
 CHelmetOnOff::CHelmetOnOff() : CToggleSwitch() {
 }
diff --git a/engines/titanic/gfx/home_photo.cpp b/engines/titanic/gfx/home_photo.cpp
index 1c3b064955..758a5caa75 100644
--- a/engines/titanic/gfx/home_photo.cpp
+++ b/engines/titanic/gfx/home_photo.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CHomePhoto, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CHomePhoto, CToggleSwitch);
 
 CHomePhoto::CHomePhoto() : CToggleSwitch() {
 }
diff --git a/engines/titanic/gfx/icon_nav_action.cpp b/engines/titanic/gfx/icon_nav_action.cpp
index bd32c937fb..4d32f46571 100644
--- a/engines/titanic/gfx/icon_nav_action.cpp
+++ b/engines/titanic/gfx/icon_nav_action.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CIconNavAction, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CIconNavAction, CToggleSwitch);
 
 CIconNavAction::CIconNavAction() : CToggleSwitch() {
 }
diff --git a/engines/titanic/gfx/icon_nav_butt.cpp b/engines/titanic/gfx/icon_nav_butt.cpp
index cc9a217cbf..951c2f5e7b 100644
--- a/engines/titanic/gfx/icon_nav_butt.cpp
+++ b/engines/titanic/gfx/icon_nav_butt.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CIconNavButt, CPetGraphic)
+EMPTY_MESSAGE_MAP(CIconNavButt, CPetGraphic);
 
 void CIconNavButt::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/gfx/icon_nav_down.cpp b/engines/titanic/gfx/icon_nav_down.cpp
index 09a0332828..efa2124b14 100644
--- a/engines/titanic/gfx/icon_nav_down.cpp
+++ b/engines/titanic/gfx/icon_nav_down.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CIconNavDown, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CIconNavDown, CToggleSwitch);
 
 CIconNavDown::CIconNavDown() : CToggleSwitch() {
 }
diff --git a/engines/titanic/gfx/icon_nav_image.cpp b/engines/titanic/gfx/icon_nav_image.cpp
index 59a50bb8a6..403ae44b17 100644
--- a/engines/titanic/gfx/icon_nav_image.cpp
+++ b/engines/titanic/gfx/icon_nav_image.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CIconNavImage, CPetGraphic)
+EMPTY_MESSAGE_MAP(CIconNavImage, CPetGraphic);
 
 void CIconNavImage::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/gfx/icon_nav_left.cpp b/engines/titanic/gfx/icon_nav_left.cpp
index 272e2a63af..8d98f3724c 100644
--- a/engines/titanic/gfx/icon_nav_left.cpp
+++ b/engines/titanic/gfx/icon_nav_left.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CIconNavLeft, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CIconNavLeft, CToggleSwitch);
 
 CIconNavLeft::CIconNavLeft() : CToggleSwitch() {
 }
diff --git a/engines/titanic/gfx/icon_nav_receive.cpp b/engines/titanic/gfx/icon_nav_receive.cpp
index ba5d8eaafa..e3e0986690 100644
--- a/engines/titanic/gfx/icon_nav_receive.cpp
+++ b/engines/titanic/gfx/icon_nav_receive.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CIconNavReceive, CPetGraphic)
+EMPTY_MESSAGE_MAP(CIconNavReceive, CPetGraphic);
 
 void CIconNavReceive::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/gfx/icon_nav_right.cpp b/engines/titanic/gfx/icon_nav_right.cpp
index a661e0d8dc..de827918e9 100644
--- a/engines/titanic/gfx/icon_nav_right.cpp
+++ b/engines/titanic/gfx/icon_nav_right.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CIconNavRight, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CIconNavRight, CToggleSwitch);
 
 CIconNavRight::CIconNavRight() : CToggleSwitch() {
 }
diff --git a/engines/titanic/gfx/icon_nav_send.cpp b/engines/titanic/gfx/icon_nav_send.cpp
index 067e44847f..9baa9e8f33 100644
--- a/engines/titanic/gfx/icon_nav_send.cpp
+++ b/engines/titanic/gfx/icon_nav_send.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CIconNavSend, CPetGraphic)
+EMPTY_MESSAGE_MAP(CIconNavSend, CPetGraphic);
 
 void CIconNavSend::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/gfx/icon_nav_up.cpp b/engines/titanic/gfx/icon_nav_up.cpp
index 5671dee9cf..4268d97868 100644
--- a/engines/titanic/gfx/icon_nav_up.cpp
+++ b/engines/titanic/gfx/icon_nav_up.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CIconNavUp, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CIconNavUp, CToggleSwitch);
 
 CIconNavUp::CIconNavUp() : CToggleSwitch() {
 }
diff --git a/engines/titanic/gfx/keybrd_butt.cpp b/engines/titanic/gfx/keybrd_butt.cpp
index 1a0a927e54..063e709a7b 100644
--- a/engines/titanic/gfx/keybrd_butt.cpp
+++ b/engines/titanic/gfx/keybrd_butt.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CKeybrdButt, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CKeybrdButt, CToggleSwitch);
 
 CKeybrdButt::CKeybrdButt() : CToggleSwitch() {
 }
diff --git a/engines/titanic/gfx/music_slider.cpp b/engines/titanic/gfx/music_slider.cpp
index fcf4d4bc76..ec7ff5e3f6 100644
--- a/engines/titanic/gfx/music_slider.cpp
+++ b/engines/titanic/gfx/music_slider.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CMusicSlider, CMusicControl)
+EMPTY_MESSAGE_MAP(CMusicSlider, CMusicControl);
 
 void CMusicSlider::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/gfx/music_switch.cpp b/engines/titanic/gfx/music_switch.cpp
index fb1c6de9f7..1c2ced0b4e 100644
--- a/engines/titanic/gfx/music_switch.cpp
+++ b/engines/titanic/gfx/music_switch.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CMusicSwitch, CMusicControl)
+EMPTY_MESSAGE_MAP(CMusicSwitch, CMusicControl);
 
 void CMusicSwitch::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/gfx/send_to_succ.cpp b/engines/titanic/gfx/send_to_succ.cpp
index 3054191e94..0e2b83361b 100644
--- a/engines/titanic/gfx/send_to_succ.cpp
+++ b/engines/titanic/gfx/send_to_succ.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CSendToSucc, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CSendToSucc, CToggleSwitch);
 
 CSendToSucc::CSendToSucc() : CToggleSwitch() {
 }
diff --git a/engines/titanic/gfx/sgt_selector.cpp b/engines/titanic/gfx/sgt_selector.cpp
index c7b52f8b03..81cccb72ce 100644
--- a/engines/titanic/gfx/sgt_selector.cpp
+++ b/engines/titanic/gfx/sgt_selector.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CSGTSelector, CPetGraphic)
+EMPTY_MESSAGE_MAP(CSGTSelector, CPetGraphic);
 
 void CSGTSelector::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/gfx/small_chev_left_off.cpp b/engines/titanic/gfx/small_chev_left_off.cpp
index b0b22e9928..f7c27f9036 100644
--- a/engines/titanic/gfx/small_chev_left_off.cpp
+++ b/engines/titanic/gfx/small_chev_left_off.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CSmallChevLeftOff, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CSmallChevLeftOff, CToggleSwitch);
 
 CSmallChevLeftOff::CSmallChevLeftOff() : CToggleSwitch() {
 }
diff --git a/engines/titanic/gfx/small_chev_left_on.cpp b/engines/titanic/gfx/small_chev_left_on.cpp
index a2df2b524c..7a82c1878e 100644
--- a/engines/titanic/gfx/small_chev_left_on.cpp
+++ b/engines/titanic/gfx/small_chev_left_on.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CSmallChevLeftOn, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CSmallChevLeftOn, CToggleSwitch);
 
 CSmallChevLeftOn::CSmallChevLeftOn() : CToggleSwitch() {
 }
diff --git a/engines/titanic/gfx/small_chev_right_off.cpp b/engines/titanic/gfx/small_chev_right_off.cpp
index 48f0941c95..f07c5a3d00 100644
--- a/engines/titanic/gfx/small_chev_right_off.cpp
+++ b/engines/titanic/gfx/small_chev_right_off.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CSmallChevRightOff, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CSmallChevRightOff, CToggleSwitch);
 
 CSmallChevRightOff::CSmallChevRightOff() : CToggleSwitch() {
 }
diff --git a/engines/titanic/gfx/small_chev_right_on.cpp b/engines/titanic/gfx/small_chev_right_on.cpp
index af794fa428..18aba4a91f 100644
--- a/engines/titanic/gfx/small_chev_right_on.cpp
+++ b/engines/titanic/gfx/small_chev_right_on.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CSmallChevRightOn, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CSmallChevRightOn, CToggleSwitch);
 
 CSmallChevRightOn::CSmallChevRightOn() : CToggleSwitch() {
 }
diff --git a/engines/titanic/gfx/text_down.cpp b/engines/titanic/gfx/text_down.cpp
index 4a68752922..4d9bb0b077 100644
--- a/engines/titanic/gfx/text_down.cpp
+++ b/engines/titanic/gfx/text_down.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CTextDown, CPetGraphic)
+EMPTY_MESSAGE_MAP(CTextDown, CPetGraphic);
 
 void CTextDown::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/gfx/text_skrew.cpp b/engines/titanic/gfx/text_skrew.cpp
index 391ed3796f..6d403eabfb 100644
--- a/engines/titanic/gfx/text_skrew.cpp
+++ b/engines/titanic/gfx/text_skrew.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CTextSkrew, CPetGraphic)
+EMPTY_MESSAGE_MAP(CTextSkrew, CPetGraphic);
 
 void CTextSkrew::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/gfx/text_up.cpp b/engines/titanic/gfx/text_up.cpp
index d5e2b1bab3..842be63ee6 100644
--- a/engines/titanic/gfx/text_up.cpp
+++ b/engines/titanic/gfx/text_up.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CTextUp, CPetGraphic)
+EMPTY_MESSAGE_MAP(CTextUp, CPetGraphic);
 
 void CTextUp::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/gfx/toggle_button.cpp b/engines/titanic/gfx/toggle_button.cpp
index 78e53569de..2b7c80d3df 100644
--- a/engines/titanic/gfx/toggle_button.cpp
+++ b/engines/titanic/gfx/toggle_button.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CToggleButton, CBackground)
+EMPTY_MESSAGE_MAP(CToggleButton, CBackground);
 
 void CToggleButton::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/npcs/mobile.cpp b/engines/titanic/npcs/mobile.cpp
index 83f886ed21..8a45f9e3cf 100644
--- a/engines/titanic/npcs/mobile.cpp
+++ b/engines/titanic/npcs/mobile.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CMobile, CCharacter)
+EMPTY_MESSAGE_MAP(CMobile, CCharacter);
 
 CMobile::CMobile() : CCharacter(), _fieldDC(0) {
 }
diff --git a/engines/titanic/pet_control/pet_graphic.cpp b/engines/titanic/pet_control/pet_graphic.cpp
index c4e184990a..bc7d86142d 100644
--- a/engines/titanic/pet_control/pet_graphic.cpp
+++ b/engines/titanic/pet_control/pet_graphic.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CPetGraphic, CGameObject)
+EMPTY_MESSAGE_MAP(CPetGraphic, CGameObject);
 
 void CPetGraphic::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/pet_control/pet_graphic2.cpp b/engines/titanic/pet_control/pet_graphic2.cpp
index 79cf42eeb0..36c4d0f55a 100644
--- a/engines/titanic/pet_control/pet_graphic2.cpp
+++ b/engines/titanic/pet_control/pet_graphic2.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CPetGraphic2, CGameObject)
+EMPTY_MESSAGE_MAP(CPetGraphic2, CGameObject);
 
 void CPetGraphic2::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/pet_control/pet_leaf.cpp b/engines/titanic/pet_control/pet_leaf.cpp
index bf40b6ca5c..718ffe5e6e 100644
--- a/engines/titanic/pet_control/pet_leaf.cpp
+++ b/engines/titanic/pet_control/pet_leaf.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(PETLeaf, CGameObject)
+EMPTY_MESSAGE_MAP(PETLeaf, CGameObject);
 
 void PETLeaf::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/pet_control/pet_mode_off.cpp b/engines/titanic/pet_control/pet_mode_off.cpp
index 277b8e5eac..119c15a65c 100644
--- a/engines/titanic/pet_control/pet_mode_off.cpp
+++ b/engines/titanic/pet_control/pet_mode_off.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CPetModeOff, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CPetModeOff, CToggleSwitch);
 
 CPetModeOff::CPetModeOff() : CToggleSwitch() {
 }
diff --git a/engines/titanic/pet_control/pet_mode_on.cpp b/engines/titanic/pet_control/pet_mode_on.cpp
index 89845dc49a..2b61461a24 100644
--- a/engines/titanic/pet_control/pet_mode_on.cpp
+++ b/engines/titanic/pet_control/pet_mode_on.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CPetModeOn, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CPetModeOn, CToggleSwitch);
 
 CPetModeOn::CPetModeOn() : CToggleSwitch() {
 }
diff --git a/engines/titanic/pet_control/pet_mode_panel.cpp b/engines/titanic/pet_control/pet_mode_panel.cpp
index 1384602183..8579c31cea 100644
--- a/engines/titanic/pet_control/pet_mode_panel.cpp
+++ b/engines/titanic/pet_control/pet_mode_panel.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CPetModePanel, CToggleSwitch)
+EMPTY_MESSAGE_MAP(CPetModePanel, CToggleSwitch);
 
 CPetModePanel::CPetModePanel() : CToggleSwitch() {
 }
diff --git a/engines/titanic/pet_control/pet_pannel1.cpp b/engines/titanic/pet_control/pet_pannel1.cpp
index 9906212b4b..7a757bfe57 100644
--- a/engines/titanic/pet_control/pet_pannel1.cpp
+++ b/engines/titanic/pet_control/pet_pannel1.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CPetPannel1, CPetGraphic)
+EMPTY_MESSAGE_MAP(CPetPannel1, CPetGraphic);
 
 void CPetPannel1::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/pet_control/pet_pannel2.cpp b/engines/titanic/pet_control/pet_pannel2.cpp
index b67e0edfcd..096a39afbf 100644
--- a/engines/titanic/pet_control/pet_pannel2.cpp
+++ b/engines/titanic/pet_control/pet_pannel2.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CPetPannel2, CPetGraphic)
+EMPTY_MESSAGE_MAP(CPetPannel2, CPetGraphic);
 
 void CPetPannel2::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/pet_control/pet_pannel3.cpp b/engines/titanic/pet_control/pet_pannel3.cpp
index a2a1fbedf9..0d095a62c5 100644
--- a/engines/titanic/pet_control/pet_pannel3.cpp
+++ b/engines/titanic/pet_control/pet_pannel3.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CPetPannel3, CPetGraphic)
+EMPTY_MESSAGE_MAP(CPetPannel3, CPetGraphic);
 
 void CPetPannel3::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/sound/dome_from_top_of_well.cpp b/engines/titanic/sound/dome_from_top_of_well.cpp
index 778f016a4e..3721b9f3b7 100644
--- a/engines/titanic/sound/dome_from_top_of_well.cpp
+++ b/engines/titanic/sound/dome_from_top_of_well.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CDomeFromTopOfWell, CViewAutoSoundPlayer)
+EMPTY_MESSAGE_MAP(CDomeFromTopOfWell, CViewAutoSoundPlayer);
 
 void CDomeFromTopOfWell::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
diff --git a/engines/titanic/sound/water_lapping_sounds.cpp b/engines/titanic/sound/water_lapping_sounds.cpp
index 74af78736c..c33db412e1 100644
--- a/engines/titanic/sound/water_lapping_sounds.cpp
+++ b/engines/titanic/sound/water_lapping_sounds.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-EMPTY_MESSAGE_MAP(CWaterLappingSounds, CRoomAutoSoundPlayer)
+EMPTY_MESSAGE_MAP(CWaterLappingSounds, CRoomAutoSoundPlayer);
 
 void CWaterLappingSounds::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);