aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/game/television.h
diff options
context:
space:
mode:
authorPaul Gilbert2016-04-06 22:17:26 -0400
committerPaul Gilbert2016-04-06 22:17:26 -0400
commit51df4d98d3a066e092f34cf7968c436a3e430df2 (patch)
tree9e35582d31b834dff272da7fd27de03633990017 /engines/titanic/game/television.h
parente728e901d02aca51858f91ac29b1a177e5e80a07 (diff)
downloadscummvm-rg350-51df4d98d3a066e092f34cf7968c436a3e430df2.tar.gz
scummvm-rg350-51df4d98d3a066e092f34cf7968c436a3e430df2.tar.bz2
scummvm-rg350-51df4d98d3a066e092f34cf7968c436a3e430df2.zip
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
Diffstat (limited to 'engines/titanic/game/television.h')
-rw-r--r--engines/titanic/game/television.h14
1 files changed, 1 insertions, 13 deletions
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;