TITANIC: Cleanup and fixes for message hierarchy

49 files changed, 61 insertions, 61 deletions

diff --git a/engines/titanic/game/arboretum_gate.cpp b/engines/titanic/game/arboretum_gate.cpp
index a892e65fc8..6770430cdc 100644
--- a/engines/titanic/game/arboretum_gate.cpp
+++ b/engines/titanic/game/arboretum_gate.cpp
@@ -133,17 +133,17 @@ void CArboretumGate::load(SimpleFile *file) {
 	CBackground::load(file);
 }
 
-bool CArboretumGate::handleEvent(CActMsg &msg) { return false; }
-bool CArboretumGate::handleEvent(CLeaveViewMsg &msg) { return false; }
-bool CArboretumGate::handleEvent(CTurnOff &msg) { return false; }
-bool CArboretumGate::handleEvent(CMouseButtonDownMsg &msg) { return false; }
+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::handleEvent(CEnterViewMsg &msg) {
+bool CArboretumGate::handleMessage(CEnterViewMsg &msg) {
 	warning("CArboretumGate::handleEvent");
 	return false;
 }
 
-bool CArboretumGate::handleEvent(CTurnOn &msg) { return false; }
-bool CArboretumGate::handleEvent(CMovieEndMsg &msg) { return false; }
+bool CArboretumGate::handleMessage(CTurnOn &msg) { return false; }
+bool CArboretumGate::handleMessage(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 7432799460..34569a0fc0 100644
--- a/engines/titanic/game/arboretum_gate.h
+++ b/engines/titanic/game/arboretum_gate.h
@@ -69,13 +69,13 @@ private:
 	int _field150;
 	CString _string2;
 protected:
-	virtual bool handleEvent(CActMsg &msg);
-	virtual bool handleEvent(CLeaveViewMsg &msg);	
-	virtual bool handleEvent(CTurnOff &msg);
-	virtual bool handleEvent(CMouseButtonDownMsg &msg);
-	virtual bool handleEvent(CEnterViewMsg &msg);
-	virtual bool handleEvent(CTurnOn &msg);
-	virtual bool handleEvent(CMovieEndMsg &msg);
+	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);
 public:
 	CLASSDEF
 	CArboretumGate();
diff --git a/engines/titanic/game/auto_animate.cpp b/engines/titanic/game/auto_animate.cpp
index 958200f4cc..2a3f3719e6 100644
--- a/engines/titanic/game/auto_animate.cpp
+++ b/engines/titanic/game/auto_animate.cpp
@@ -40,7 +40,7 @@ void CAutoAnimate::load(SimpleFile *file) {
 	CBackground::load(file);
 }
 
-bool CAutoAnimate::handleEvent(CEnterViewMsg &msg) {
+bool CAutoAnimate::handleMessage(CEnterViewMsg &msg) {
 	warning("CAutoAnimate::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/game/auto_animate.h b/engines/titanic/game/auto_animate.h
index 56e40a470c..6fb85117ee 100644
--- a/engines/titanic/game/auto_animate.h
+++ b/engines/titanic/game/auto_animate.h
@@ -34,7 +34,7 @@ private:
 	int _fieldE4;
 	int _fieldE8;
 protected:
-	virtual bool handleEvent(CEnterViewMsg &msg);
+	virtual bool handleMessage(CEnterViewMsg &msg);
 public:
 	CLASSDEF
 	CAutoAnimate() : CBackground(), _fieldE0(1), _fieldE4(1), _fieldE8(0) {}
diff --git a/engines/titanic/game/bar_bell.cpp b/engines/titanic/game/bar_bell.cpp
index 1ac7568b0f..84a4d04b49 100644
--- a/engines/titanic/game/bar_bell.cpp
+++ b/engines/titanic/game/bar_bell.cpp
@@ -50,7 +50,7 @@ void CBarBell::load(SimpleFile *file) {
 	CGameObject::load(file);
 }
 
-bool CBarBell::handleEvent(CEnterRoomMsg &msg) {
+bool CBarBell::handleMessage(CEnterRoomMsg &msg) {
 	_fieldBC = 0;
 	return true;
 }
diff --git a/engines/titanic/game/bar_bell.h b/engines/titanic/game/bar_bell.h
index 111b0ac267..30d71955ec 100644
--- a/engines/titanic/game/bar_bell.h
+++ b/engines/titanic/game/bar_bell.h
@@ -36,7 +36,7 @@ public:
 	int _fieldC8;
 	int _fieldCC;
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 	CBarBell();
diff --git a/engines/titanic/game/bomb.cpp b/engines/titanic/game/bomb.cpp
index a8bf15ec33..390ac2cd4e 100644
--- a/engines/titanic/game/bomb.cpp
+++ b/engines/titanic/game/bomb.cpp
@@ -70,7 +70,7 @@ void CBomb::load(SimpleFile *file) {
 	CBackground::load(file);
 }
 
-bool CBomb::handleEvent(CEnterRoomMsg &msg) {
+bool CBomb::handleMessage(CEnterRoomMsg &msg) {
 	_fieldE8 = 12;
 	_fieldEC = 9;
 	_fieldF0 = 0;
diff --git a/engines/titanic/game/bomb.h b/engines/titanic/game/bomb.h
index 9cbdf84081..8e9dcdf826 100644
--- a/engines/titanic/game/bomb.h
+++ b/engines/titanic/game/bomb.h
@@ -41,7 +41,7 @@ private:
 	int _startingTicks;
 	int _field104;
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 	CBomb();
diff --git a/engines/titanic/game/chicken_cooler.cpp b/engines/titanic/game/chicken_cooler.cpp
index 4ece0d6d05..ff7aae7323 100644
--- a/engines/titanic/game/chicken_cooler.cpp
+++ b/engines/titanic/game/chicken_cooler.cpp
@@ -40,7 +40,7 @@ void CChickenCooler::load(SimpleFile *file) {
 	CGameObject::load(file);
 }
 
-bool CChickenCooler::handleEvent(CEnterRoomMsg &msg) {
+bool CChickenCooler::handleMessage(CEnterRoomMsg &msg) {
 	warning("CChickenCoolor::handlEvent");
 	return true;
 }
diff --git a/engines/titanic/game/chicken_cooler.h b/engines/titanic/game/chicken_cooler.h
index 210183a474..176c8c9c4d 100644
--- a/engines/titanic/game/chicken_cooler.h
+++ b/engines/titanic/game/chicken_cooler.h
@@ -33,7 +33,7 @@ private:
 	int _fieldBC;
 	int _fieldC0;
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 	CChickenCooler() : CGameObject(), _fieldBC(0), _fieldC0(0) {}
diff --git a/engines/titanic/game/doorbot_elevator_handler.cpp b/engines/titanic/game/doorbot_elevator_handler.cpp
index 718a464bf3..257b663246 100644
--- a/engines/titanic/game/doorbot_elevator_handler.cpp
+++ b/engines/titanic/game/doorbot_elevator_handler.cpp
@@ -40,7 +40,7 @@ void CDoorbotElevatorHandler::load(SimpleFile *file) {
 	CGameObject::load(file);
 }
 
-bool CDoorbotElevatorHandler::handleEvent(CEnterNodeMsg &msg) {
+bool CDoorbotElevatorHandler::handleMessage(CEnterNodeMsg &msg) {
 	warning("CDoorbotElevatorHandler::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/game/doorbot_elevator_handler.h b/engines/titanic/game/doorbot_elevator_handler.h
index 04f3a75b18..d6c5be94d6 100644
--- a/engines/titanic/game/doorbot_elevator_handler.h
+++ b/engines/titanic/game/doorbot_elevator_handler.h
@@ -33,7 +33,7 @@ private:
 	static int _v1;
 	int _value;
 protected:
-	virtual bool handleEvent(CEnterNodeMsg &msg);
+	virtual bool handleMessage(CEnterNodeMsg &msg);
 public:
 	CLASSDEF
 
diff --git a/engines/titanic/game/end_sequence_control.cpp b/engines/titanic/game/end_sequence_control.cpp
index c3f5a2a007..41bbc9d93c 100644
--- a/engines/titanic/game/end_sequence_control.cpp
+++ b/engines/titanic/game/end_sequence_control.cpp
@@ -34,7 +34,7 @@ void CEndSequenceControl::load(SimpleFile *file) {
 	CGameObject::load(file);
 }
 
-bool CEndSequenceControl::handleEvent(CEnterRoomMsg &msg) {
+bool CEndSequenceControl::handleMessage(CEnterRoomMsg &msg) {
 	warning("TODO: CEndSequenceControl::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/game/end_sequence_control.h b/engines/titanic/game/end_sequence_control.h
index d0ddd9c920..5eb36943ea 100644
--- a/engines/titanic/game/end_sequence_control.h
+++ b/engines/titanic/game/end_sequence_control.h
@@ -30,7 +30,7 @@ namespace Titanic {
 
 class CEndSequenceControl : public CGameObject, CEnterRoomMsgTarget {
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 
diff --git a/engines/titanic/game/fan_noises.cpp b/engines/titanic/game/fan_noises.cpp
index 7ec55c46f9..d7dd4e28b3 100644
--- a/engines/titanic/game/fan_noises.cpp
+++ b/engines/titanic/game/fan_noises.cpp
@@ -55,7 +55,7 @@ void CFanNoises::load(SimpleFile *file) {
 	CGameObject::load(file);
 }
 
-bool CFanNoises::handleEvent(CEnterRoomMsg &msg) {
+bool CFanNoises::handleMessage(CEnterRoomMsg &msg) {
 	warning("CFanNoises::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/game/fan_noises.h b/engines/titanic/game/fan_noises.h
index 835d853d09..6daf8020c5 100644
--- a/engines/titanic/game/fan_noises.h
+++ b/engines/titanic/game/fan_noises.h
@@ -38,7 +38,7 @@ private:
 	int _fieldD0;
 	int _fieldD4;
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 	CFanNoises();
diff --git a/engines/titanic/game/get_lift_eye2.cpp b/engines/titanic/game/get_lift_eye2.cpp
index 7894c5ef58..5f3fac315d 100644
--- a/engines/titanic/game/get_lift_eye2.cpp
+++ b/engines/titanic/game/get_lift_eye2.cpp
@@ -46,7 +46,7 @@ void CGetLiftEye2::load(SimpleFile *file) {
 	CGameObject::load(file);
 }
 
-bool CGetLiftEye2::handleEvent(CEnterRoomMsg &msg) {
+bool CGetLiftEye2::handleMessage(CEnterRoomMsg &msg) {
 	warning("CGetLiftEye2::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/game/get_lift_eye2.h b/engines/titanic/game/get_lift_eye2.h
index 5803ad03bd..8ce181f3c6 100644
--- a/engines/titanic/game/get_lift_eye2.h
+++ b/engines/titanic/game/get_lift_eye2.h
@@ -31,7 +31,7 @@ class CGetLiftEye2 : public CGameObject, CEnterRoomMsgTarget {
 private:
 	static CString *_v1;
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 	static void init();
diff --git a/engines/titanic/game/gondolier/gondolier_mixer.cpp b/engines/titanic/game/gondolier/gondolier_mixer.cpp
index 3d0a0e1f19..2bd3313d47 100644
--- a/engines/titanic/game/gondolier/gondolier_mixer.cpp
+++ b/engines/titanic/game/gondolier/gondolier_mixer.cpp
@@ -57,7 +57,7 @@ void CGondolierMixer::load(SimpleFile *file) {
 	CGondolierBase::load(file);
 }
 
-bool CGondolierMixer::handleEvent(CEnterRoomMsg &msg) {
+bool CGondolierMixer::handleMessage(CEnterRoomMsg &msg) {
 	CRoomItem *parentRoom = dynamic_cast<CRoomItem *>(getParent());
 	if (parentRoom == msg._newRoom)
 		msg.execute(parentRoom);
diff --git a/engines/titanic/game/gondolier/gondolier_mixer.h b/engines/titanic/game/gondolier/gondolier_mixer.h
index 1288290d6f..dd7288352b 100644
--- a/engines/titanic/game/gondolier/gondolier_mixer.h
+++ b/engines/titanic/game/gondolier/gondolier_mixer.h
@@ -38,7 +38,7 @@ private:
 	CString _string2;
 	int _fieldE4;
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 	CGondolierMixer();
diff --git a/engines/titanic/game/light.cpp b/engines/titanic/game/light.cpp
index 856e6a463f..c0b7df300f 100644
--- a/engines/titanic/game/light.cpp
+++ b/engines/titanic/game/light.cpp
@@ -57,7 +57,7 @@ void CLight::load(SimpleFile *file) {
 	CBackground::load(file);
 }
 
-bool CLight::handleEvent(CEnterRoomMsg &msg) {
+bool CLight::handleMessage(CEnterRoomMsg &msg) {
 	warning("CLight::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/game/light.h b/engines/titanic/game/light.h
index 42e7224a72..66d60bedf7 100644
--- a/engines/titanic/game/light.h
+++ b/engines/titanic/game/light.h
@@ -39,7 +39,7 @@ private:
 	int _fieldF8;
 	int _fieldFC;
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 	CLight();
diff --git a/engines/titanic/game/light_switch.cpp b/engines/titanic/game/light_switch.cpp
index b857bfb159..0e68dda0dc 100644
--- a/engines/titanic/game/light_switch.cpp
+++ b/engines/titanic/game/light_switch.cpp
@@ -50,7 +50,7 @@ void CLightSwitch::load(SimpleFile *file) {
 	CBackground::load(file);
 }
 
-bool CLightSwitch::handleEvent(CEnterRoomMsg &msg) {
+bool CLightSwitch::handleMessage(CEnterRoomMsg &msg) {
 	warning("CLightSwitch::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/game/light_switch.h b/engines/titanic/game/light_switch.h
index 1cda539dd0..2c43edd5b9 100644
--- a/engines/titanic/game/light_switch.h
+++ b/engines/titanic/game/light_switch.h
@@ -36,7 +36,7 @@ private:
 	int _fieldE4;
 	int _fieldE8;
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 	CLightSwitch();
diff --git a/engines/titanic/game/long_stick_dispenser.cpp b/engines/titanic/game/long_stick_dispenser.cpp
index 5d7df1df12..9511d7b017 100644
--- a/engines/titanic/game/long_stick_dispenser.cpp
+++ b/engines/titanic/game/long_stick_dispenser.cpp
@@ -42,7 +42,7 @@ void CLongStickDispenser::load(SimpleFile *file) {
 	CGameObject::load(file);
 }
 
-bool CLongStickDispenser::handleEvent(CEnterRoomMsg &msg) {
+bool CLongStickDispenser::handleMessage(CEnterRoomMsg &msg) {
 	_fieldC0 = 0;
 	_fieldC4 = 1;
 	return true;
diff --git a/engines/titanic/game/long_stick_dispenser.h b/engines/titanic/game/long_stick_dispenser.h
index 14785a785b..5e43bfa62f 100644
--- a/engines/titanic/game/long_stick_dispenser.h
+++ b/engines/titanic/game/long_stick_dispenser.h
@@ -34,7 +34,7 @@ private:
 	int _fieldC0;
 	int _fieldC4;
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 	CLongStickDispenser() : CGameObject(), _fieldBC(0),
diff --git a/engines/titanic/game/parrot/player_meets_parrot.cpp b/engines/titanic/game/parrot/player_meets_parrot.cpp
index adb2dc5d36..16c8f480dd 100644
--- a/engines/titanic/game/parrot/player_meets_parrot.cpp
+++ b/engines/titanic/game/parrot/player_meets_parrot.cpp
@@ -34,7 +34,7 @@ void CPlayerMeetsParrot::load(SimpleFile *file) {
 	CGameObject::load(file);
 }
 
-bool CPlayerMeetsParrot::handleEvent(CEnterRoomMsg &msg) {
+bool CPlayerMeetsParrot::handleMessage(CEnterRoomMsg &msg) {
 	warning("CPlayerMeetsParrot::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/game/parrot/player_meets_parrot.h b/engines/titanic/game/parrot/player_meets_parrot.h
index 9b8138f124..960b679fd4 100644
--- a/engines/titanic/game/parrot/player_meets_parrot.h
+++ b/engines/titanic/game/parrot/player_meets_parrot.h
@@ -30,7 +30,7 @@ namespace Titanic {
 
 class CPlayerMeetsParrot : public CGameObject, CEnterRoomMsgTarget {
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 
diff --git a/engines/titanic/game/pet/pet_monitor.cpp b/engines/titanic/game/pet/pet_monitor.cpp
index 44d24f264e..afe0836e65 100644
--- a/engines/titanic/game/pet/pet_monitor.cpp
+++ b/engines/titanic/game/pet/pet_monitor.cpp
@@ -34,7 +34,7 @@ void CPETMonitor::load(SimpleFile *file) {
 	CGameObject::load(file);
 }
 
-bool CPETMonitor::handleEvent(CEnterRoomMsg &msg) {
+bool CPETMonitor::handleMessage(CEnterRoomMsg &msg) {
 	warning("CPETMonitor::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/game/pet/pet_monitor.h b/engines/titanic/game/pet/pet_monitor.h
index 1d66a58d29..f8a35292fa 100644
--- a/engines/titanic/game/pet/pet_monitor.h
+++ b/engines/titanic/game/pet/pet_monitor.h
@@ -30,7 +30,7 @@ namespace Titanic {
 
 class CPETMonitor : public CGameObject, CEnterRoomMsgTarget {
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 
diff --git a/engines/titanic/game/pet/pet_position.cpp b/engines/titanic/game/pet/pet_position.cpp
index b25111f62c..e1dab2218f 100644
--- a/engines/titanic/game/pet/pet_position.cpp
+++ b/engines/titanic/game/pet/pet_position.cpp
@@ -34,7 +34,7 @@ void CPETPosition::load(SimpleFile *file) {
 	CGameObject::load(file);
 }
 
-bool CPETPosition::handleEvent(CEnterRoomMsg &msg) {
+bool CPETPosition::handleMessage(CEnterRoomMsg &msg) {
 	warning("CPETPosition::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/game/pet/pet_position.h b/engines/titanic/game/pet/pet_position.h
index 8a0623932b..fe28a13777 100644
--- a/engines/titanic/game/pet/pet_position.h
+++ b/engines/titanic/game/pet/pet_position.h
@@ -30,7 +30,7 @@ namespace Titanic {
 
 class CPETPosition : public CGameObject, CEnterRoomMsgTarget {
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 
diff --git a/engines/titanic/game/pet/pet_transport.cpp b/engines/titanic/game/pet/pet_transport.cpp
index a88b703b10..36685676ac 100644
--- a/engines/titanic/game/pet/pet_transport.cpp
+++ b/engines/titanic/game/pet/pet_transport.cpp
@@ -34,7 +34,7 @@ void CPETTransport::load(SimpleFile *file) {
 	CGameObject::load(file);
 }
 
-bool CPETTransport::handleEvent(CEnterRoomMsg &msg) {
+bool CPETTransport::handleMessage(CEnterRoomMsg &msg) {
 	warning("CPETTransport::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/game/pet/pet_transport.h b/engines/titanic/game/pet/pet_transport.h
index 3dc856d5b2..e43cbef849 100644
--- a/engines/titanic/game/pet/pet_transport.h
+++ b/engines/titanic/game/pet/pet_transport.h
@@ -30,7 +30,7 @@ namespace Titanic {
 
 class CPETTransport : public CGameObject, CEnterRoomMsgTarget {
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 
diff --git a/engines/titanic/game/phonograph.cpp b/engines/titanic/game/phonograph.cpp
index f7a696e549..749bf33b24 100644
--- a/engines/titanic/game/phonograph.cpp
+++ b/engines/titanic/game/phonograph.cpp
@@ -55,7 +55,7 @@ void CPhonograph::load(SimpleFile *file) {
 	CMusicPlayer::load(file);
 }
 
-bool CPhonograph::handleEvent(CEnterRoomMsg &msg) {
+bool CPhonograph::handleMessage(CEnterRoomMsg &msg) {
 	warning("CPhonograph::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/game/phonograph.h b/engines/titanic/game/phonograph.h
index 6efe10bab2..102edd2ace 100644
--- a/engines/titanic/game/phonograph.h
+++ b/engines/titanic/game/phonograph.h
@@ -38,7 +38,7 @@ protected:
 	int _fieldF0;
 	int _fieldF4;
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 	CPhonograph();
diff --git a/engines/titanic/game/sgt/sgt_state_room.cpp b/engines/titanic/game/sgt/sgt_state_room.cpp
index cf735dd6d0..9baae69afb 100644
--- a/engines/titanic/game/sgt/sgt_state_room.cpp
+++ b/engines/titanic/game/sgt/sgt_state_room.cpp
@@ -90,7 +90,7 @@ void CSGTStateRoom::load(SimpleFile *file) {
 	CBackground::load(file);
 }
 
-bool CSGTStateRoom::handleEvent(CEnterRoomMsg &msg) {
+bool CSGTStateRoom::handleMessage(CEnterRoomMsg &msg) {
 	warning("CSGTStateRoom::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/game/sgt/sgt_state_room.h b/engines/titanic/game/sgt/sgt_state_room.h
index 4ec1617875..a730473580 100644
--- a/engines/titanic/game/sgt/sgt_state_room.h
+++ b/engines/titanic/game/sgt/sgt_state_room.h
@@ -55,7 +55,7 @@ private:
 	int _fieldEC;
 	int _fieldF0;
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 	CSGTStateRoom();
diff --git a/engines/titanic/game/ship_setting.cpp b/engines/titanic/game/ship_setting.cpp
index 6d12e59c81..1da27923c5 100644
--- a/engines/titanic/game/ship_setting.cpp
+++ b/engines/titanic/game/ship_setting.cpp
@@ -48,7 +48,7 @@ void CShipSetting::load(SimpleFile *file) {
 	CBackground::load(file);
 }
 
-bool CShipSetting::handleEvent(CEnterRoomMsg &msg) {
+bool CShipSetting::handleMessage(CEnterRoomMsg &msg) {
 	warning("CShipSetting::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/game/ship_setting.h b/engines/titanic/game/ship_setting.h
index 2525224a28..6ea38be052 100644
--- a/engines/titanic/game/ship_setting.h
+++ b/engines/titanic/game/ship_setting.h
@@ -35,7 +35,7 @@ private:
 	CString _string4;
 	CString _string5;
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 	CShipSetting();
diff --git a/engines/titanic/game/transport/lift.cpp b/engines/titanic/game/transport/lift.cpp
index edf69fe31a..a795a15a16 100644
--- a/engines/titanic/game/transport/lift.cpp
+++ b/engines/titanic/game/transport/lift.cpp
@@ -57,7 +57,7 @@ void CLift::load(SimpleFile *file) {
 	CTransport::load(file);
 }
 
-bool CLift::handleEvent(CEnterRoomMsg &msg) {
+bool CLift::handleMessage(CEnterRoomMsg &msg) {
 	warning("CLift::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/game/transport/lift.h b/engines/titanic/game/transport/lift.h
index 439e65bb30..4f628231e8 100644
--- a/engines/titanic/game/transport/lift.h
+++ b/engines/titanic/game/transport/lift.h
@@ -39,7 +39,7 @@ private:
 
 	int _fieldF8;
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 	CLift() : CTransport(), _fieldF8(1) {}
diff --git a/engines/titanic/game/transport/lift_indicator.h b/engines/titanic/game/transport/lift_indicator.h
index 80f8b0d05b..7cc5585d3b 100644
--- a/engines/titanic/game/transport/lift_indicator.h
+++ b/engines/titanic/game/transport/lift_indicator.h
@@ -35,7 +35,7 @@ private:
 	int _field108;
 	int _field10C;
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg) { return true; }
+	virtual bool handleMessage(CEnterRoomMsg &msg) { return true; }
 public:
 	CLASSDEF
 	CLiftindicator();
diff --git a/engines/titanic/game/transport/pellerator.cpp b/engines/titanic/game/transport/pellerator.cpp
index 16f42772c3..eca1037128 100644
--- a/engines/titanic/game/transport/pellerator.cpp
+++ b/engines/titanic/game/transport/pellerator.cpp
@@ -43,7 +43,7 @@ void CPellerator::load(SimpleFile *file) {
 	CTransport::load(file);
 }
 
-bool CPellerator::handleEvent(CEnterRoomMsg &msg) {
+bool CPellerator::handleMessage(CEnterRoomMsg &msg) {
 	warning("CPellerator::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/game/transport/pellerator.h b/engines/titanic/game/transport/pellerator.h
index c997373382..03e45751b2 100644
--- a/engines/titanic/game/transport/pellerator.h
+++ b/engines/titanic/game/transport/pellerator.h
@@ -33,7 +33,7 @@ private:
 	static int _v1;
 	static int _v2;
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 
diff --git a/engines/titanic/game/up_lighter.cpp b/engines/titanic/game/up_lighter.cpp
index 817b179e3e..819dc9435a 100644
--- a/engines/titanic/game/up_lighter.cpp
+++ b/engines/titanic/game/up_lighter.cpp
@@ -48,7 +48,7 @@ void CUpLighter::load(SimpleFile *file) {
 	CDropTarget::load(file);
 }
 
-bool CUpLighter::handleEvent(CEnterRoomMsg &msg) {
+bool CUpLighter::handleMessage(CEnterRoomMsg &msg) {
 	warning("CUpLighter::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/game/up_lighter.h b/engines/titanic/game/up_lighter.h
index 6c722ddc2a..add941f325 100644
--- a/engines/titanic/game/up_lighter.h
+++ b/engines/titanic/game/up_lighter.h
@@ -35,7 +35,7 @@ private:
 	int _field120;
 	int _field124;
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 	CUpLighter();
diff --git a/engines/titanic/game/volume_control.cpp b/engines/titanic/game/volume_control.cpp
index 801dfd1b60..bb58deebce 100644
--- a/engines/titanic/game/volume_control.cpp
+++ b/engines/titanic/game/volume_control.cpp
@@ -45,7 +45,7 @@ void CVolumeControl::load(SimpleFile *file) {
 	CGameObject::load(file);
 }
 
-bool CVolumeControl::handleEvent(CEnterNodeMsg &msg) {
+bool CVolumeControl::handleMessage(CEnterNodeMsg &msg) {
 	warning("CVolumeControl::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/game/volume_control.h b/engines/titanic/game/volume_control.h
index f3f6a75278..5586c9cb45 100644
--- a/engines/titanic/game/volume_control.h
+++ b/engines/titanic/game/volume_control.h
@@ -34,7 +34,7 @@ private:
 	CString _string1;
 	int _fieldCC;
 protected:
-	virtual bool handleEvent(CEnterNodeMsg &msg);
+	virtual bool handleMessage(CEnterNodeMsg &msg);
 public:
 	CLASSDEF
 	CVolumeControl();