aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/messages
diff options
context:
space:
mode:
authorPaul Gilbert2016-07-24 20:30:56 -0400
committerPaul Gilbert2016-07-24 20:30:56 -0400
commit4d79ee16c07e2398e9058fe93947b4704cd6048a (patch)
tree50c5234e21822d777e9a989c9af918feb6654a22 /engines/titanic/messages
parenteb98b984fb5a630422013ab5f030d49b0aa39552 (diff)
downloadscummvm-rg350-4d79ee16c07e2398e9058fe93947b4704cd6048a.tar.gz
scummvm-rg350-4d79ee16c07e2398e9058fe93947b4704cd6048a.tar.bz2
scummvm-rg350-4d79ee16c07e2398e9058fe93947b4704cd6048a.zip
TITANIC: Add semicolon after CLASSDEF macro usage
Diffstat (limited to 'engines/titanic/messages')
-rw-r--r--engines/titanic/messages/auto_sound_event.h2
-rw-r--r--engines/titanic/messages/bilge_auto_sound_event.h2
-rw-r--r--engines/titanic/messages/bilge_dispensor_event.h2
-rw-r--r--engines/titanic/messages/door_auto_sound_event.h2
-rw-r--r--engines/titanic/messages/messages.h18
-rw-r--r--engines/titanic/messages/mouse_messages.h22
-rw-r--r--engines/titanic/messages/pet_messages.h2
-rw-r--r--engines/titanic/messages/service_elevator_door.h2
8 files changed, 26 insertions, 26 deletions
diff --git a/engines/titanic/messages/auto_sound_event.h b/engines/titanic/messages/auto_sound_event.h
index 599404de9e..eb1c11c4ff 100644
--- a/engines/titanic/messages/auto_sound_event.h
+++ b/engines/titanic/messages/auto_sound_event.h
@@ -32,7 +32,7 @@ public:
int _value1;
int _value2;
public:
- CLASSDEF
+ CLASSDEF;
CAutoSoundEvent();
/**
diff --git a/engines/titanic/messages/bilge_auto_sound_event.h b/engines/titanic/messages/bilge_auto_sound_event.h
index 5d322820ac..9a7fbd6261 100644
--- a/engines/titanic/messages/bilge_auto_sound_event.h
+++ b/engines/titanic/messages/bilge_auto_sound_event.h
@@ -29,7 +29,7 @@ namespace Titanic {
class CBilgeAutoSoundEvent : public CAutoSoundEvent {
public:
- CLASSDEF
+ CLASSDEF;
/**
* Save the data for the class to file
diff --git a/engines/titanic/messages/bilge_dispensor_event.h b/engines/titanic/messages/bilge_dispensor_event.h
index 8616373174..96ef92a54e 100644
--- a/engines/titanic/messages/bilge_dispensor_event.h
+++ b/engines/titanic/messages/bilge_dispensor_event.h
@@ -31,7 +31,7 @@ namespace Titanic {
class CBilgeDispensorEvent : public CAutoSoundEvent {
bool EnterRoomMsg(CEnterRoomMsg *msg);
public:
- CLASSDEF
+ CLASSDEF;
/**
* Save the data for the class to file
diff --git a/engines/titanic/messages/door_auto_sound_event.h b/engines/titanic/messages/door_auto_sound_event.h
index 9b3ebbc3bc..e6ea1b0f98 100644
--- a/engines/titanic/messages/door_auto_sound_event.h
+++ b/engines/titanic/messages/door_auto_sound_event.h
@@ -34,7 +34,7 @@ public:
int _fieldDC;
int _fieldE0;
public:
- CLASSDEF
+ CLASSDEF;
CDoorAutoSoundEvent() : CAutoSoundEvent(),
_string1("z#44.wav"), _string2("z#43.wav"), _fieldDC(25), _fieldE0(25) {
}
diff --git a/engines/titanic/messages/messages.h b/engines/titanic/messages/messages.h
index 0fe6968ed4..b7205df8b3 100644
--- a/engines/titanic/messages/messages.h
+++ b/engines/titanic/messages/messages.h
@@ -38,7 +38,7 @@ enum MessageFlag {
#define MESSAGE0(NAME) \
class NAME: public CMessage { \
public: NAME() : CMessage() {} \
- CLASSDEF \
+ CLASSDEF; \
static bool isSupportedBy(const CTreeItem *item) { \
return supports(item, _type); } \
}
@@ -47,7 +47,7 @@ enum MessageFlag {
public: F1 _##N1; \
NAME() : CMessage(), _##N1(V1) {} \
NAME(F1 N1) : CMessage(), _##N1(N1) {} \
- CLASSDEF \
+ CLASSDEF; \
static bool isSupportedBy(const CTreeItem *item) { \
return supports(item, _type); } \
}
@@ -56,7 +56,7 @@ enum MessageFlag {
public: F1 _##N1; F2 _##N2; \
NAME() : CMessage(), _##N1(V1), _##N2(V2) {} \
NAME(F1 N1, F2 N2) : CMessage(), _##N1(N1), _##N2(N2) {} \
- CLASSDEF \
+ CLASSDEF; \
static bool isSupportedBy(const CTreeItem *item) { \
return supports(item, _type); } \
}
@@ -65,7 +65,7 @@ enum MessageFlag {
public: F1 _##N1; F2 _##N2; F3 _##N3; \
NAME() : CMessage(), _##N1(V1), _##N2(V2), _##N3(V3) {} \
NAME(F1 N1, F2 N2, F3 N3) : CMessage(), _##N1(N1), _##N2(N2), _##N3(N3) {} \
- CLASSDEF \
+ CLASSDEF; \
static bool isSupportedBy(const CTreeItem *item) { \
return supports(item, _type); } \
}
@@ -74,7 +74,7 @@ enum MessageFlag {
public: F1 _##N1; F2 _##N2; F3 _##N3; F4 _##N4; \
NAME() : CMessage(), _##N1(V1), _##N2(V2), _##N3(V3), _##N4(V4) {} \
NAME(F1 N1, F2 N2, F3 N3, F4 N4) : CMessage(), _##N1(N1), _##N2(N2), _##N3(N3), _##N4(N4) {} \
- CLASSDEF \
+ CLASSDEF; \
static bool isSupportedBy(const CTreeItem *item) { \
return supports(item, _type); } \
}
@@ -93,7 +93,7 @@ private:
*/
static const MSGMAP_ENTRY *findMapEntry(const CTreeItem *treeItem, const ClassDef *classDef);
public:
- CLASSDEF
+ CLASSDEF;
CMessage();
/**
@@ -155,7 +155,7 @@ public:
int _field1C;
int _field20;
public:
- CLASSDEF
+ CLASSDEF;
CEditControlMsg() : _field4(0), _field8(0), _field18(0),
_field1C(0), _field20(0) {}
@@ -171,7 +171,7 @@ public:
int _fieldC;
int _field10;
public:
- CLASSDEF
+ CLASSDEF;
CLightsMsg() : CMessage(), _field4(0), _field8(0),
_fieldC(0), _field10(0) {}
@@ -188,7 +188,7 @@ public:
int _actionVal;
CString _action;
public:
- CLASSDEF
+ CLASSDEF;
CTimerMsg() : CTimeMsg(), _timerCtr(0), _actionVal(0) {}
CTimerMsg(uint ticks, uint timerCtr, int actionVal, const CString &action) :
CTimeMsg(ticks), _timerCtr(timerCtr), _actionVal(actionVal), _action(action) {}
diff --git a/engines/titanic/messages/mouse_messages.h b/engines/titanic/messages/mouse_messages.h
index 8d5aa8bced..d17bd51c78 100644
--- a/engines/titanic/messages/mouse_messages.h
+++ b/engines/titanic/messages/mouse_messages.h
@@ -35,7 +35,7 @@ public:
int _buttons;
Point _mousePos;
public:
- CLASSDEF
+ CLASSDEF;
static bool isSupportedBy(const CTreeItem *item) {
return supports(item, _type);
}
@@ -47,7 +47,7 @@ public:
class CMouseMoveMsg : public CMouseMsg {
public:
- CLASSDEF
+ CLASSDEF;
CMouseMoveMsg() : CMouseMsg() {}
CMouseMoveMsg(const Point &pt, int buttons) : CMouseMsg(pt, buttons) {}
@@ -60,7 +60,7 @@ class CMouseButtonMsg : public CMouseMsg {
public:
int _field10;
public:
- CLASSDEF
+ CLASSDEF;
CMouseButtonMsg() : CMouseMsg(), _field10(0) {}
CMouseButtonMsg(const Point &pt, int buttons) : CMouseMsg(pt, buttons) {}
@@ -71,7 +71,7 @@ public:
class CMouseButtonDownMsg : public CMouseButtonMsg {
public:
- CLASSDEF
+ CLASSDEF;
CMouseButtonDownMsg() : CMouseButtonMsg() {}
CMouseButtonDownMsg(const Point &pt, int buttons) : CMouseButtonMsg(pt, buttons) {}
@@ -87,7 +87,7 @@ public:
class CMouseButtonUpMsg : public CMouseButtonMsg {
public:
- CLASSDEF
+ CLASSDEF;
CMouseButtonUpMsg() : CMouseButtonMsg() {}
CMouseButtonUpMsg(const Point &pt, int buttons) : CMouseButtonMsg(pt, buttons) {}
@@ -103,7 +103,7 @@ public:
class CMouseDoubleClickMsg : public CMouseButtonMsg {
public:
- CLASSDEF
+ CLASSDEF;
CMouseDoubleClickMsg() : CMouseButtonMsg() {}
CMouseDoubleClickMsg(const Point &pt, int buttons) : CMouseButtonMsg(pt, buttons) {}
@@ -114,7 +114,7 @@ public:
class CMouseDragMsg : public CMouseMsg {
public:
- CLASSDEF
+ CLASSDEF;
CMouseDragMsg() : CMouseMsg() {}
CMouseDragMsg(const Point &pt) : CMouseMsg(pt, 0) {}
@@ -125,7 +125,7 @@ public:
class CMouseDragMoveMsg : public CMouseDragMsg {
public:
- CLASSDEF
+ CLASSDEF;
CMouseDragMoveMsg() : CMouseDragMsg() {}
CMouseDragMoveMsg(const Point &pt) : CMouseDragMsg(pt) {}
@@ -139,7 +139,7 @@ public:
CTreeItem *_dragItem;
bool _handled;
public:
- CLASSDEF
+ CLASSDEF;
CMouseDragStartMsg() : CMouseDragMsg(), _dragItem(nullptr), _handled(false) {}
CMouseDragStartMsg(const Point &pt) : CMouseDragMsg(pt),
_dragItem(nullptr), _handled(false) {}
@@ -155,7 +155,7 @@ public:
int _value3;
int _value4;
public:
- CLASSDEF
+ CLASSDEF;
CPassOnDragStartMsg() : CMessage() {}
CPassOnDragStartMsg(const Point &pt, int v3 = 0, int v4 = 0) :
CMessage(), _mousePos(pt), _value3(v3), _value4(v4) {}
@@ -169,7 +169,7 @@ class CMouseDragEndMsg : public CMouseDragMsg {
public:
CGameObject *_dropTarget;
public:
- CLASSDEF
+ CLASSDEF;
CMouseDragEndMsg() : CMouseDragMsg(), _dropTarget(nullptr) {}
CMouseDragEndMsg(const Point &pt, CGameObject *dropTarget = nullptr) :
CMouseDragMsg(pt), _dropTarget(dropTarget) {}
diff --git a/engines/titanic/messages/pet_messages.h b/engines/titanic/messages/pet_messages.h
index f7d9c301a6..48e5bab64c 100644
--- a/engines/titanic/messages/pet_messages.h
+++ b/engines/titanic/messages/pet_messages.h
@@ -47,7 +47,7 @@ MESSAGE2(CPETTargetMsg, CString, name, "", int, numValue, -1);
public: \
NAME() : CPETTargetMsg() {} \
NAME(const CString &name, int num) : CPETTargetMsg(name, num) {} \
- CLASSDEF \
+ CLASSDEF; \
static bool isSupportedBy(const CTreeItem *item) { \
return supports(item, _type); \
} \
diff --git a/engines/titanic/messages/service_elevator_door.h b/engines/titanic/messages/service_elevator_door.h
index 104b5735f1..cc8da0917d 100644
--- a/engines/titanic/messages/service_elevator_door.h
+++ b/engines/titanic/messages/service_elevator_door.h
@@ -29,7 +29,7 @@ namespace Titanic {
class CServiceElevatorDoor : public CDoorAutoSoundEvent {
public:
- CLASSDEF
+ CLASSDEF;
CServiceElevatorDoor();
/**