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

2 files changed, 12 insertions, 1 deletions

diff --git a/engines/titanic/game/gondolier/gondolier_mixer.cpp b/engines/titanic/game/gondolier/gondolier_mixer.cpp
index e81ad34c87..391c513ccc 100644
--- a/engines/titanic/game/gondolier/gondolier_mixer.cpp
+++ b/engines/titanic/game/gondolier/gondolier_mixer.cpp
@@ -56,4 +56,12 @@ void CGondolierMixer::load(SimpleFile *file) {
 	CGondolierBase::load(file);
 }
 
+bool CGondolierMixer::handleEvent(const CEnterRoomMsg &msg) {
+	CTreeItem *parent = getParent();
+	if (parent == msg._room)
+		msg.execute(parent);
+	
+	return true;
+}
+
 } // End of namespace Titanic
diff --git a/engines/titanic/game/gondolier/gondolier_mixer.h b/engines/titanic/game/gondolier/gondolier_mixer.h
index 173bcd8ac2..ce8959b77a 100644
--- a/engines/titanic/game/gondolier/gondolier_mixer.h
+++ b/engines/titanic/game/gondolier/gondolier_mixer.h
@@ -24,10 +24,11 @@
 #define TITANIC_GONDOLIER_MIXER_H
 
 #include "titanic/game/gondolier/gondolier_base.h"
+#include "titanic/messages/messages.h"
 
 namespace Titanic {
 
-class CGondolierMixer : public CGondolierBase {
+class CGondolierMixer : public CGondolierBase, CEnterRoomMsgTarget {
 private:
 	int _fieldBC;
 	int _fieldC0;
@@ -36,6 +37,8 @@ private:
 	CString _string1;
 	CString _string2;
 	int _fieldE4;
+protected:
+	virtual bool handleEvent(const CEnterRoomMsg &msg);
 public:
 	CLASSDEF
 	CGondolierMixer();