TITANIC: Cleanup and fixes for message hierarchy

14 files changed, 14 insertions, 14 deletions

diff --git a/engines/titanic/sound/auto_music_player.cpp b/engines/titanic/sound/auto_music_player.cpp
index 638cac8c26..5981a707bd 100644
--- a/engines/titanic/sound/auto_music_player.cpp
+++ b/engines/titanic/sound/auto_music_player.cpp
@@ -41,7 +41,7 @@ void CAutoMusicPlayer::load(SimpleFile *file) {
 	CAutoMusicPlayerBase::load(file);
 }
 
-bool CAutoMusicPlayer::handleEvent(CEnterRoomMsg &msg) {
+bool CAutoMusicPlayer::handleMessage(CEnterRoomMsg &msg) {
 	if (!_fieldCC) {
 		warning("TODO");
 	}
diff --git a/engines/titanic/sound/auto_music_player.h b/engines/titanic/sound/auto_music_player.h
index d2f42ac5c5..bcf4126264 100644
--- a/engines/titanic/sound/auto_music_player.h
+++ b/engines/titanic/sound/auto_music_player.h
@@ -32,7 +32,7 @@ class CAutoMusicPlayer : public CAutoMusicPlayerBase, CEnterRoomMsgTarget {
 private:
 	CString _string2;
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 	CAutoMusicPlayer();
diff --git a/engines/titanic/sound/music_player.cpp b/engines/titanic/sound/music_player.cpp
index 25f73b0dc5..eaad635dd3 100644
--- a/engines/titanic/sound/music_player.cpp
+++ b/engines/titanic/sound/music_player.cpp
@@ -44,7 +44,7 @@ void CMusicPlayer::load(SimpleFile *file) {
 	CGameObject::load(file);
 }
 
-bool CMusicPlayer::handleEvent(CEnterRoomMsg &msg) {
+bool CMusicPlayer::handleMessage(CEnterRoomMsg &msg) {
 	warning("TODO: CMusicPlayer::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/sound/music_player.h b/engines/titanic/sound/music_player.h
index 96a6968c6d..6b8bc83b05 100644
--- a/engines/titanic/sound/music_player.h
+++ b/engines/titanic/sound/music_player.h
@@ -35,7 +35,7 @@ protected:
 	int _fieldCC;
 	int _fieldD0;
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 	CMusicPlayer() : CGameObject(),
diff --git a/engines/titanic/sound/node_auto_sound_player.cpp b/engines/titanic/sound/node_auto_sound_player.cpp
index 0ef6c8d2ac..5af8ca25d3 100644
--- a/engines/titanic/sound/node_auto_sound_player.cpp
+++ b/engines/titanic/sound/node_auto_sound_player.cpp
@@ -36,7 +36,7 @@ void CNodeAutoSoundPlayer::load(SimpleFile *file) {
 	CAutoSoundPlayer::load(file);
 }
 
-bool CNodeAutoSoundPlayer::handleEvent(CEnterNodeMsg &msg) {
+bool CNodeAutoSoundPlayer::handleMessage(CEnterNodeMsg &msg) {
 	warning("CNodeAutoSoundPlayer::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/sound/node_auto_sound_player.h b/engines/titanic/sound/node_auto_sound_player.h
index 258aa47eea..acc766abec 100644
--- a/engines/titanic/sound/node_auto_sound_player.h
+++ b/engines/titanic/sound/node_auto_sound_player.h
@@ -32,7 +32,7 @@ class CNodeAutoSoundPlayer : public CAutoSoundPlayer, CEnterNodeMsgTarget {
 private:
 	int _fieldEC;
 protected:
-	virtual bool handleEvent(CEnterNodeMsg &msg);
+	virtual bool handleMessage(CEnterNodeMsg &msg);
 public:
 	CLASSDEF
 	CNodeAutoSoundPlayer() : CAutoSoundPlayer(), _fieldEC(1) {}
diff --git a/engines/titanic/sound/restricted_auto_music_player.cpp b/engines/titanic/sound/restricted_auto_music_player.cpp
index 2ee8f2d082..7b5ba707c2 100644
--- a/engines/titanic/sound/restricted_auto_music_player.cpp
+++ b/engines/titanic/sound/restricted_auto_music_player.cpp
@@ -44,7 +44,7 @@ void CRestrictedAutoMusicPlayer::load(SimpleFile *file) {
 	CAutoMusicPlayer::load(file);
 }
 
-bool CRestrictedAutoMusicPlayer::handleEvent(CEnterRoomMsg &msg) {
+bool CRestrictedAutoMusicPlayer::handleMessage(CEnterRoomMsg &msg) {
 	warning("CRestrictedAutoMusicPlayer::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/sound/restricted_auto_music_player.h b/engines/titanic/sound/restricted_auto_music_player.h
index efb3dc2892..3553d1c63b 100644
--- a/engines/titanic/sound/restricted_auto_music_player.h
+++ b/engines/titanic/sound/restricted_auto_music_player.h
@@ -35,7 +35,7 @@ private:
 	CString _string5;
 	CString _string6;
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 
diff --git a/engines/titanic/sound/room_auto_sound_player.cpp b/engines/titanic/sound/room_auto_sound_player.cpp
index 549f27be63..c24ef2a211 100644
--- a/engines/titanic/sound/room_auto_sound_player.cpp
+++ b/engines/titanic/sound/room_auto_sound_player.cpp
@@ -34,7 +34,7 @@ void CRoomAutoSoundPlayer::load(SimpleFile *file) {
 	CAutoSoundPlayer::load(file);
 }
 
-bool CRoomAutoSoundPlayer::handleEvent(CEnterRoomMsg &msg) {
+bool CRoomAutoSoundPlayer::handleMessage(CEnterRoomMsg &msg) {
 	warning("CRoomAutoSoundPlayer::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/sound/room_auto_sound_player.h b/engines/titanic/sound/room_auto_sound_player.h
index a3ec35cb04..82d23a79c3 100644
--- a/engines/titanic/sound/room_auto_sound_player.h
+++ b/engines/titanic/sound/room_auto_sound_player.h
@@ -30,7 +30,7 @@ namespace Titanic {
 
 class CRoomAutoSoundPlayer : public CAutoSoundPlayer, CEnterRoomMsgTarget {
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 
diff --git a/engines/titanic/sound/room_trigger_auto_music_player.cpp b/engines/titanic/sound/room_trigger_auto_music_player.cpp
index 3c0ac0536b..5ec35c3903 100644
--- a/engines/titanic/sound/room_trigger_auto_music_player.cpp
+++ b/engines/titanic/sound/room_trigger_auto_music_player.cpp
@@ -34,7 +34,7 @@ void CRoomTriggerAutoMusicPlayer::load(SimpleFile *file) {
 	CTriggerAutoMusicPlayer::load(file);
 }
 
-bool CRoomTriggerAutoMusicPlayer::handleEvent(CEnterRoomMsg &msg) {
+bool CRoomTriggerAutoMusicPlayer::handleMessage(CEnterRoomMsg &msg) {
 	warning("CRoomTriggerAutoMusicPlayer::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/sound/room_trigger_auto_music_player.h b/engines/titanic/sound/room_trigger_auto_music_player.h
index 9a478a0a08..4ce4bae7fa 100644
--- a/engines/titanic/sound/room_trigger_auto_music_player.h
+++ b/engines/titanic/sound/room_trigger_auto_music_player.h
@@ -30,7 +30,7 @@ namespace Titanic {
 
 class CRoomTriggerAutoMusicPlayer : public CTriggerAutoMusicPlayer, CEnterRoomMsgTarget {
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 
diff --git a/engines/titanic/sound/titania_speech.cpp b/engines/titanic/sound/titania_speech.cpp
index 16a88e40ec..c530a9ac70 100644
--- a/engines/titanic/sound/titania_speech.cpp
+++ b/engines/titanic/sound/titania_speech.cpp
@@ -40,7 +40,7 @@ void CTitaniaSpeech::load(SimpleFile *file) {
 	CGameObject::load(file);
 }
 
-bool CTitaniaSpeech::handleEvent(CEnterRoomMsg &msg) {
+bool CTitaniaSpeech::handleMessage(CEnterRoomMsg &msg) {
 	warning("CTitaniaSpeech::handleEvent");
 	return true;
 }
diff --git a/engines/titanic/sound/titania_speech.h b/engines/titanic/sound/titania_speech.h
index 09a8495fef..b894eeead1 100644
--- a/engines/titanic/sound/titania_speech.h
+++ b/engines/titanic/sound/titania_speech.h
@@ -32,7 +32,7 @@ class CTitaniaSpeech : public CGameObject {
 private:
 	int _value1, _value2;
 protected:
-	virtual bool handleEvent(CEnterRoomMsg &msg);
+	virtual bool handleMessage(CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 	CTitaniaSpeech() : CGameObject(), _value1(1), _value2(0) {}