TITANIC: Fixes to make message handling const, adding CEnterRoomMsg handlers

2 files changed, 12 insertions, 1 deletions

diff --git a/engines/titanic/sound/auto_music_player.cpp b/engines/titanic/sound/auto_music_player.cpp
index 2040bfc20a..97c59d075d 100644
--- a/engines/titanic/sound/auto_music_player.cpp
+++ b/engines/titanic/sound/auto_music_player.cpp
@@ -41,4 +41,12 @@ void CAutoMusicPlayer::load(SimpleFile *file) {
 	CAutoMusicPlayerBase::load(file);
 }
 
+bool CAutoMusicPlayer::handleEvent(const CEnterRoomMsg &msg) {
+	if (!_fieldCC) {
+		warning("TODO");
+	}
+
+	return true;
+}
+
 } // End of namespace Titanic
diff --git a/engines/titanic/sound/auto_music_player.h b/engines/titanic/sound/auto_music_player.h
index cec8117dd9..6fdf3766c6 100644
--- a/engines/titanic/sound/auto_music_player.h
+++ b/engines/titanic/sound/auto_music_player.h
@@ -24,12 +24,15 @@
 #define TITANIC_AUTO_MUSIC_PLAYER_H
 
 #include "titanic/sound/auto_music_player_base.h"
+#include "titanic/messages/messages.h"
 
 namespace Titanic {
 
-class CAutoMusicPlayer : public CAutoMusicPlayerBase {
+class CAutoMusicPlayer : public CAutoMusicPlayerBase, CEnterRoomMsgTarget {
 private:
 	CString _string2;
+protected:
+	virtual bool handleEvent(const CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 	CAutoMusicPlayer();