aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/game
diff options
context:
space:
mode:
Diffstat (limited to 'engines/titanic/game')
-rw-r--r--engines/titanic/game/arboretum_gate.cpp24
-rw-r--r--engines/titanic/game/arboretum_gate.h24
-rw-r--r--engines/titanic/game/bar_bell.h3
-rw-r--r--engines/titanic/game/bomb.h3
-rw-r--r--engines/titanic/game/cdrom.h6
-rw-r--r--engines/titanic/game/cdrom_tray.h5
-rw-r--r--engines/titanic/game/chicken_cooler.h3
-rw-r--r--engines/titanic/game/dead_area.h4
-rw-r--r--engines/titanic/game/doorbot_elevator_handler.h3
-rw-r--r--engines/titanic/game/end_sequence_control.h3
-rw-r--r--engines/titanic/game/fan_noises.h3
-rw-r--r--engines/titanic/game/get_lift_eye2.h3
-rw-r--r--engines/titanic/game/light.h3
-rw-r--r--engines/titanic/game/light_switch.h3
-rw-r--r--engines/titanic/game/parrot/player_meets_parrot.h3
-rw-r--r--engines/titanic/game/pet/pet_monitor.h3
-rw-r--r--engines/titanic/game/pet/pet_position.h3
-rw-r--r--engines/titanic/game/pet/pet_transport.h3
-rw-r--r--engines/titanic/game/sgt/sgt_state_room.h3
-rw-r--r--engines/titanic/game/ship_setting.h3
-rw-r--r--engines/titanic/game/start_action.h4
-rw-r--r--engines/titanic/game/transport/lift.h3
-rw-r--r--engines/titanic/game/transport/pellerator.h3
-rw-r--r--engines/titanic/game/up_lighter.h3
-rw-r--r--engines/titanic/game/volume_control.h2
25 files changed, 49 insertions, 74 deletions
diff --git a/engines/titanic/game/arboretum_gate.cpp b/engines/titanic/game/arboretum_gate.cpp
index 6770430cdc..f3e3301136 100644
--- a/engines/titanic/game/arboretum_gate.cpp
+++ b/engines/titanic/game/arboretum_gate.cpp
@@ -24,6 +24,16 @@
namespace Titanic {
+BEGIN_MESSAGE_MAP(CArboretumGate, CBackground)
+ ON_MESSAGE(ActMsg)
+ ON_MESSAGE(LeaveViewMsg)
+ ON_MESSAGE(TurnOff)
+ ON_MESSAGE(MouseButtonDownMsg)
+ ON_MESSAGE(EnterViewMsg)
+ ON_MESSAGE(TurnOn)
+ ON_MESSAGE(MovieEndMsg)
+END_MESSAGE_MAP()
+
int CArboretumGate::_v1;
int CArboretumGate::_v2;
int CArboretumGate::_v3;
@@ -133,17 +143,17 @@ void CArboretumGate::load(SimpleFile *file) {
CBackground::load(file);
}
-bool CArboretumGate::handleMessage(CActMsg &msg) { return false; }
-bool CArboretumGate::handleMessage(CLeaveViewMsg &msg) { return false; }
-bool CArboretumGate::handleMessage(CTurnOff &msg) { return false; }
-bool CArboretumGate::handleMessage(CMouseButtonDownMsg &msg) { return false; }
+bool CArboretumGate::ActMsg(CActMsg *msg) { return false; }
+bool CArboretumGate::LeaveViewMsg(CLeaveViewMsg *msg) { return false; }
+bool CArboretumGate::TurnOff(CTurnOff *msg) { return false; }
+bool CArboretumGate::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { return false; }
-bool CArboretumGate::handleMessage(CEnterViewMsg &msg) {
+bool CArboretumGate::EnterViewMsg(CEnterViewMsg *msg) {
warning("CArboretumGate::handleEvent");
return false;
}
-bool CArboretumGate::handleMessage(CTurnOn &msg) { return false; }
-bool CArboretumGate::handleMessage(CMovieEndMsg &msg) { return false; }
+bool CArboretumGate::TurnOn(CTurnOn *msg) { return false; }
+bool CArboretumGate::MovieEndMsg(CMovieEndMsg *msg) { return false; }
} // End of namespace Titanic
diff --git a/engines/titanic/game/arboretum_gate.h b/engines/titanic/game/arboretum_gate.h
index a176e93ed9..9b0674fe75 100644
--- a/engines/titanic/game/arboretum_gate.h
+++ b/engines/titanic/game/arboretum_gate.h
@@ -29,14 +29,8 @@
namespace Titanic {
-class CArboretumGate : public CBackground,
- public CActMsgTarget,
- public CLeaveViewMsgTarget,
- public CTurnOffTarget,
- public CMouseButtonDownMsgTarget,
- public CEnterViewMsgTarget,
- public CTurnOnTarget,
- public CMovieEndMsgTarget {
+class CArboretumGate : public CBackground {
+ DECLARE_MESSAGE_MAP
private:
static int _v1;
static int _v2;
@@ -73,13 +67,13 @@ private:
int _field150;
CString _string2;
protected:
- virtual bool handleMessage(CActMsg &msg);
- virtual bool handleMessage(CLeaveViewMsg &msg);
- virtual bool handleMessage(CTurnOff &msg);
- virtual bool handleMessage(CMouseButtonDownMsg &msg);
- virtual bool handleMessage(CEnterViewMsg &msg);
- virtual bool handleMessage(CTurnOn &msg);
- virtual bool handleMessage(CMovieEndMsg &msg);
+ virtual bool ActMsg(CActMsg *msg);
+ virtual bool LeaveViewMsg(CLeaveViewMsg *msg);
+ virtual bool TurnOff(CTurnOff *msg);
+ virtual bool MouseButtonDownMsg(CMouseButtonDownMsg *msg);
+ virtual bool EnterViewMsg(CEnterViewMsg *msg);
+ virtual bool TurnOn(CTurnOn *msg);
+ virtual bool MovieEndMsg(CMovieEndMsg *msg);
public:
CLASSDEF
CArboretumGate();
diff --git a/engines/titanic/game/bar_bell.h b/engines/titanic/game/bar_bell.h
index 865e446cc5..2d8a36b61a 100644
--- a/engines/titanic/game/bar_bell.h
+++ b/engines/titanic/game/bar_bell.h
@@ -28,8 +28,7 @@
namespace Titanic {
-class CBarBell : public CGameObject,
- public CEnterRoomMsgTarget {
+class CBarBell : public CGameObject {
public:
int _fieldBC;
int _fieldC0;
diff --git a/engines/titanic/game/bomb.h b/engines/titanic/game/bomb.h
index 9f33189d56..bd3852ef17 100644
--- a/engines/titanic/game/bomb.h
+++ b/engines/titanic/game/bomb.h
@@ -28,8 +28,7 @@
namespace Titanic {
-class CBomb : public CBackground,
- public CEnterRoomMsgTarget {
+class CBomb : public CBackground {
private:
int _fieldE0;
int _fieldE4;
diff --git a/engines/titanic/game/cdrom.h b/engines/titanic/game/cdrom.h
index 61bada0b74..fa1c80335a 100644
--- a/engines/titanic/game/cdrom.h
+++ b/engines/titanic/game/cdrom.h
@@ -29,11 +29,7 @@
namespace Titanic {
-class CCDROM : public CGameObject,
- public CMouseDragStartMsgTarget,
- public CMouseDragEndMsgTarget,
- public CMouseDragMoveMsgTarget,
- public CActMsgTarget {
+class CCDROM : public CGameObject {
private:
Point _tempPos;
protected:
diff --git a/engines/titanic/game/cdrom_tray.h b/engines/titanic/game/cdrom_tray.h
index b1893c548e..0833847530 100644
--- a/engines/titanic/game/cdrom_tray.h
+++ b/engines/titanic/game/cdrom_tray.h
@@ -28,10 +28,7 @@
namespace Titanic {
-class CCDROMTray : public CGameObject,
- public CActMsgTarget,
- public CMovieEndMsgTarget,
- public CStatusChangeMsgTarget {
+class CCDROMTray : public CGameObject {
public:
int _state;
CString _string1;
diff --git a/engines/titanic/game/chicken_cooler.h b/engines/titanic/game/chicken_cooler.h
index 6f57cddb9c..f15bba4983 100644
--- a/engines/titanic/game/chicken_cooler.h
+++ b/engines/titanic/game/chicken_cooler.h
@@ -28,8 +28,7 @@
namespace Titanic {
-class CChickenCooler : public CGameObject,
- public CEnterRoomMsgTarget {
+class CChickenCooler : public CGameObject {
private:
int _fieldBC;
int _fieldC0;
diff --git a/engines/titanic/game/dead_area.h b/engines/titanic/game/dead_area.h
index c696c841c2..6390475d4e 100644
--- a/engines/titanic/game/dead_area.h
+++ b/engines/titanic/game/dead_area.h
@@ -31,9 +31,7 @@ namespace Titanic {
/**
* Implements a non-responsive screen area
*/
-class CDeadArea : public CGameObject,
- public CMouseButtonDownMsgTarget,
- public CMouseButtonUpMsgTarget {
+class CDeadArea : public CGameObject {
protected:
virtual bool handleMessage(CMouseButtonDownMsg &msg) { return true; }
virtual bool handleMessage(CMouseButtonUpMsg &msg) { return true; }
diff --git a/engines/titanic/game/doorbot_elevator_handler.h b/engines/titanic/game/doorbot_elevator_handler.h
index bd33747239..351fb1f13b 100644
--- a/engines/titanic/game/doorbot_elevator_handler.h
+++ b/engines/titanic/game/doorbot_elevator_handler.h
@@ -28,8 +28,7 @@
namespace Titanic {
-class CDoorbotElevatorHandler : public CGameObject,
- public CEnterNodeMsgTarget {
+class CDoorbotElevatorHandler : public CGameObject {
private:
static int _v1;
int _value;
diff --git a/engines/titanic/game/end_sequence_control.h b/engines/titanic/game/end_sequence_control.h
index 87eaf17c0e..61165e3ba5 100644
--- a/engines/titanic/game/end_sequence_control.h
+++ b/engines/titanic/game/end_sequence_control.h
@@ -28,8 +28,7 @@
namespace Titanic {
-class CEndSequenceControl : public CGameObject,
- public CEnterRoomMsgTarget {
+class CEndSequenceControl : public CGameObject {
protected:
virtual bool handleMessage(CEnterRoomMsg &msg);
public:
diff --git a/engines/titanic/game/fan_noises.h b/engines/titanic/game/fan_noises.h
index 495ac39f8e..778891e6e1 100644
--- a/engines/titanic/game/fan_noises.h
+++ b/engines/titanic/game/fan_noises.h
@@ -28,8 +28,7 @@
namespace Titanic {
-class CFanNoises : public CGameObject,
- public CEnterRoomMsgTarget {
+class CFanNoises : public CGameObject {
private:
int _fieldBC;
int _fieldC0;
diff --git a/engines/titanic/game/get_lift_eye2.h b/engines/titanic/game/get_lift_eye2.h
index 7ca0b4d32e..f7195878e0 100644
--- a/engines/titanic/game/get_lift_eye2.h
+++ b/engines/titanic/game/get_lift_eye2.h
@@ -27,8 +27,7 @@
#include "titanic/messages/messages.h"
namespace Titanic {
-class CGetLiftEye2 : public CGameObject,
- public CEnterRoomMsgTarget {
+class CGetLiftEye2 : public CGameObject {
private:
static CString *_v1;
protected:
diff --git a/engines/titanic/game/light.h b/engines/titanic/game/light.h
index a2e562c573..e419a3bcd6 100644
--- a/engines/titanic/game/light.h
+++ b/engines/titanic/game/light.h
@@ -28,8 +28,7 @@
namespace Titanic {
-class CLight : public CBackground,
- public CEnterRoomMsgTarget {
+class CLight : public CBackground {
private:
int _fieldE0;
int _fieldE4;
diff --git a/engines/titanic/game/light_switch.h b/engines/titanic/game/light_switch.h
index 3e44590390..f2132c9bdf 100644
--- a/engines/titanic/game/light_switch.h
+++ b/engines/titanic/game/light_switch.h
@@ -28,8 +28,7 @@
namespace Titanic {
-class CLightSwitch : public CBackground,
- public CEnterRoomMsgTarget {
+class CLightSwitch : public CBackground {
public:
static int _v1;
private:
diff --git a/engines/titanic/game/parrot/player_meets_parrot.h b/engines/titanic/game/parrot/player_meets_parrot.h
index 9e47a0a932..bc96cb84f7 100644
--- a/engines/titanic/game/parrot/player_meets_parrot.h
+++ b/engines/titanic/game/parrot/player_meets_parrot.h
@@ -28,8 +28,7 @@
namespace Titanic {
-class CPlayerMeetsParrot : public CGameObject,
- public CEnterRoomMsgTarget {
+class CPlayerMeetsParrot : public CGameObject {
protected:
virtual bool handleMessage(CEnterRoomMsg &msg);
public:
diff --git a/engines/titanic/game/pet/pet_monitor.h b/engines/titanic/game/pet/pet_monitor.h
index 5cf14f38cb..56116d8313 100644
--- a/engines/titanic/game/pet/pet_monitor.h
+++ b/engines/titanic/game/pet/pet_monitor.h
@@ -28,8 +28,7 @@
namespace Titanic {
-class CPETMonitor : public CGameObject,
- public CEnterRoomMsgTarget {
+class CPETMonitor : public CGameObject {
protected:
virtual bool handleMessage(CEnterRoomMsg &msg);
public:
diff --git a/engines/titanic/game/pet/pet_position.h b/engines/titanic/game/pet/pet_position.h
index 820df41c50..589f2b60b1 100644
--- a/engines/titanic/game/pet/pet_position.h
+++ b/engines/titanic/game/pet/pet_position.h
@@ -28,8 +28,7 @@
namespace Titanic {
-class CPETPosition : public CGameObject,
- public CEnterRoomMsgTarget {
+class CPETPosition : public CGameObject {
protected:
virtual bool handleMessage(CEnterRoomMsg &msg);
public:
diff --git a/engines/titanic/game/pet/pet_transport.h b/engines/titanic/game/pet/pet_transport.h
index 8dd3f3aac5..2c94bb6fe7 100644
--- a/engines/titanic/game/pet/pet_transport.h
+++ b/engines/titanic/game/pet/pet_transport.h
@@ -28,8 +28,7 @@
namespace Titanic {
-class CPETTransport : public CGameObject,
- public CEnterRoomMsgTarget {
+class CPETTransport : public CGameObject {
protected:
virtual bool handleMessage(CEnterRoomMsg &msg);
public:
diff --git a/engines/titanic/game/sgt/sgt_state_room.h b/engines/titanic/game/sgt/sgt_state_room.h
index 6e53ad39da..7ae961145f 100644
--- a/engines/titanic/game/sgt/sgt_state_room.h
+++ b/engines/titanic/game/sgt/sgt_state_room.h
@@ -45,8 +45,7 @@ struct CSGTStateRoomStatics {
int _v14;
};
-class CSGTStateRoom : public CBackground,
- public CEnterRoomMsgTarget {
+class CSGTStateRoom : public CBackground {
private:
static CSGTStateRoomStatics *_statics;
private:
diff --git a/engines/titanic/game/ship_setting.h b/engines/titanic/game/ship_setting.h
index 878feba8ba..5b5ea68719 100644
--- a/engines/titanic/game/ship_setting.h
+++ b/engines/titanic/game/ship_setting.h
@@ -28,8 +28,7 @@
namespace Titanic {
-class CShipSetting : public CBackground,
- public CEnterRoomMsgTarget {
+class CShipSetting : public CBackground {
private:
CString _string3;
Point _pos1;
diff --git a/engines/titanic/game/start_action.h b/engines/titanic/game/start_action.h
index 2b19e77fe2..ebdc4abf25 100644
--- a/engines/titanic/game/start_action.h
+++ b/engines/titanic/game/start_action.h
@@ -28,9 +28,7 @@
namespace Titanic {
-class CStartAction : public CBackground,
- public CMouseButtonDownMsgTarget,
- public CMouseButtonUpMsgTarget {
+class CStartAction : public CBackground {
protected:
CString _msgTarget;
CString _msgAction;
diff --git a/engines/titanic/game/transport/lift.h b/engines/titanic/game/transport/lift.h
index c2a18df4dd..dc324e10c0 100644
--- a/engines/titanic/game/transport/lift.h
+++ b/engines/titanic/game/transport/lift.h
@@ -28,8 +28,7 @@
namespace Titanic {
-class CLift : public CTransport,
- public CEnterRoomMsgTarget {
+class CLift : public CTransport {
private:
static int _v1;
static int _v2;
diff --git a/engines/titanic/game/transport/pellerator.h b/engines/titanic/game/transport/pellerator.h
index b97d17ff88..82809a0717 100644
--- a/engines/titanic/game/transport/pellerator.h
+++ b/engines/titanic/game/transport/pellerator.h
@@ -28,8 +28,7 @@
namespace Titanic {
-class CPellerator : public CTransport,
- public CEnterRoomMsgTarget {
+class CPellerator : public CTransport {
private:
static int _v1;
static int _v2;
diff --git a/engines/titanic/game/up_lighter.h b/engines/titanic/game/up_lighter.h
index 589e279d6b..27b1d7b8fd 100644
--- a/engines/titanic/game/up_lighter.h
+++ b/engines/titanic/game/up_lighter.h
@@ -28,8 +28,7 @@
namespace Titanic {
-class CUpLighter : public CDropTarget,
- public CEnterRoomMsgTarget {
+class CUpLighter : public CDropTarget {
private:
int _field118;
int _field11C;
diff --git a/engines/titanic/game/volume_control.h b/engines/titanic/game/volume_control.h
index 5586c9cb45..ae10d975e2 100644
--- a/engines/titanic/game/volume_control.h
+++ b/engines/titanic/game/volume_control.h
@@ -28,7 +28,7 @@
namespace Titanic {
-class CVolumeControl : public CGameObject, CEnterNodeMsgTarget {
+class CVolumeControl : public CGameObject {
private:
int _fieldBC;
CString _string1;
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-17 10:02:38 +0000