TITANIC: In-progress converting message handling to be more like original

I currently was using multiple inheritance to define the message classes
that a class supports, but this caused problems when, for example, a
class tested to see if an object supported CMouseMsg. The class in
question supported several mouse messages, but a standard dynamic_cast
returned nullptr for the class, since it didn't directly support it

2 files changed, 2 insertions, 15 deletions

diff --git a/engines/titanic/game/gondolier/gondolier_mixer.h b/engines/titanic/game/gondolier/gondolier_mixer.h
index c6ea840ea6..1186393d04 100644
--- a/engines/titanic/game/gondolier/gondolier_mixer.h
+++ b/engines/titanic/game/gondolier/gondolier_mixer.h
@@ -28,8 +28,7 @@
 
 namespace Titanic {
 
-class CGondolierMixer : public CGondolierBase, 
-	public CEnterRoomMsgTarget {
+class CGondolierMixer : public CGondolierBase {
 private:
 	int _fieldBC;
 	int _fieldC0;
diff --git a/engines/titanic/game/television.h b/engines/titanic/game/television.h
index c6c920b74c..9fb33943c0 100644
--- a/engines/titanic/game/television.h
+++ b/engines/titanic/game/television.h
@@ -29,19 +29,7 @@
 
 namespace Titanic {
 
-class CTelevision : public CBackground,
-	public CLeaveViewMsgTarget,
-	public CChangeSeasonMsgTarget,
-	public CEnterViewMsgTarget,
-	public CPETUpMsgTarget,
-	public CPETDownMsgTarget,
-	public CActMsgTarget,
-	public CPETActivateMsgTarget,
-	public CMovieEndMsgTarget,
-	public CShipSettingMsgTarget,
-	public CTurnOffTarget,
-	public CTurnOnTarget,
-	public CLightsMsgTarget {
+class CTelevision : public CBackground {
 private:
 	static int _v1;
 	static bool _turnOn;