aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/core
diff options
context:
space:
mode:
authorPaul Gilbert2016-07-24 20:11:49 -0400
committerPaul Gilbert2016-07-24 20:11:49 -0400
commiteb98b984fb5a630422013ab5f030d49b0aa39552 (patch)
tree92a5a6e4cad064d20a93b1229e049e477ba03139 /engines/titanic/core
parent7d554339d3e1040480c9e1105d3ce7065fc77772 (diff)
downloadscummvm-rg350-eb98b984fb5a630422013ab5f030d49b0aa39552.tar.gz
scummvm-rg350-eb98b984fb5a630422013ab5f030d49b0aa39552.tar.bz2
scummvm-rg350-eb98b984fb5a630422013ab5f030d49b0aa39552.zip
TITANIC: Add semicolon after EMPTY_MESSAGE_MAP macro usages
Diffstat (limited to 'engines/titanic/core')
-rw-r--r--engines/titanic/core/dont_save_file_item.cpp2
-rw-r--r--engines/titanic/core/file_item.cpp2
-rw-r--r--engines/titanic/core/game_object.cpp2
-rw-r--r--engines/titanic/core/link_item.cpp2
-rw-r--r--engines/titanic/core/message_target.h3
-rw-r--r--engines/titanic/core/named_item.cpp2
-rw-r--r--engines/titanic/core/node_item.cpp2
-rw-r--r--engines/titanic/core/project_item.cpp2
-rw-r--r--engines/titanic/core/room_item.cpp2
-rw-r--r--engines/titanic/core/static_image.cpp2
-rw-r--r--engines/titanic/core/tree_item.cpp2
11 files changed, 12 insertions, 11 deletions
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) {