From d9cc2908f8a9a7fa2d196c82571d32b5ef20ad9b Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Thu, 24 Mar 2016 12:51:44 -0400 Subject: TITANIC: Make all use of message targets public inheritance --- engines/titanic/core/view_item.h | 7 +++++-- engines/titanic/game/arboretum_gate.h | 12 ++++++++---- engines/titanic/game/bar_bell.h | 3 ++- engines/titanic/game/bomb.h | 3 ++- engines/titanic/game/chicken_cooler.h | 3 ++- engines/titanic/game/doorbot_elevator_handler.h | 3 ++- engines/titanic/game/end_sequence_control.h | 3 ++- engines/titanic/game/fan_noises.h | 3 ++- engines/titanic/game/get_lift_eye2.h | 3 ++- engines/titanic/game/gondolier/gondolier_mixer.h | 3 ++- engines/titanic/game/light.h | 3 ++- engines/titanic/game/light_switch.h | 3 ++- engines/titanic/game/parrot/player_meets_parrot.h | 3 ++- engines/titanic/game/pet/pet_monitor.h | 3 ++- engines/titanic/game/pet/pet_position.h | 3 ++- engines/titanic/game/pet/pet_transport.h | 3 ++- engines/titanic/game/sgt/sgt_state_room.h | 3 ++- engines/titanic/game/ship_setting.h | 3 ++- engines/titanic/game/transport/lift.h | 3 ++- engines/titanic/game/transport/pellerator.h | 3 ++- engines/titanic/game/up_lighter.h | 3 ++- engines/titanic/moves/enter_bridge.h | 3 ++- engines/titanic/npcs/barbot.h | 3 ++- engines/titanic/npcs/liftbot.h | 3 ++- engines/titanic/sound/auto_music_player.h | 3 ++- engines/titanic/sound/music_player.h | 3 ++- engines/titanic/sound/node_auto_sound_player.h | 3 ++- engines/titanic/sound/room_auto_sound_player.h | 3 ++- 28 files changed, 65 insertions(+), 32 deletions(-) diff --git a/engines/titanic/core/view_item.h b/engines/titanic/core/view_item.h index 3b071e53a5..fc4089f924 100644 --- a/engines/titanic/core/view_item.h +++ b/engines/titanic/core/view_item.h @@ -29,8 +29,11 @@ namespace Titanic { -class CViewItem : public CNamedItem, CMouseButtonDownMsgTarget, - CMouseButtonUpMsgTarget, CMouseMoveMsgTarget, CMouseDoubleClickMsgTarget { +class CViewItem : public CNamedItem, + public CMouseButtonDownMsgTarget, + public CMouseButtonUpMsgTarget, + public CMouseMoveMsgTarget, + public CMouseDoubleClickMsgTarget { private: CTreeItem *_buttonUpTargets[4]; private: diff --git a/engines/titanic/game/arboretum_gate.h b/engines/titanic/game/arboretum_gate.h index 34569a0fc0..a176e93ed9 100644 --- a/engines/titanic/game/arboretum_gate.h +++ b/engines/titanic/game/arboretum_gate.h @@ -29,10 +29,14 @@ namespace Titanic { -class CArboretumGate : public CBackground, public CActMsgTarget, - public CLeaveViewMsgTarget, public CTurnOffTarget, - public CMouseButtonDownMsgTarget, public CEnterViewMsgTarget, - public CTurnOnTarget, public CMovieEndMsgTarget { +class CArboretumGate : public CBackground, + public CActMsgTarget, + public CLeaveViewMsgTarget, + public CTurnOffTarget, + public CMouseButtonDownMsgTarget, + public CEnterViewMsgTarget, + public CTurnOnTarget, + public CMovieEndMsgTarget { private: static int _v1; static int _v2; diff --git a/engines/titanic/game/bar_bell.h b/engines/titanic/game/bar_bell.h index 30d71955ec..865e446cc5 100644 --- a/engines/titanic/game/bar_bell.h +++ b/engines/titanic/game/bar_bell.h @@ -28,7 +28,8 @@ namespace Titanic { -class CBarBell : public CGameObject, CEnterRoomMsgTarget { +class CBarBell : public CGameObject, + public CEnterRoomMsgTarget { public: int _fieldBC; int _fieldC0; diff --git a/engines/titanic/game/bomb.h b/engines/titanic/game/bomb.h index 8e9dcdf826..9f33189d56 100644 --- a/engines/titanic/game/bomb.h +++ b/engines/titanic/game/bomb.h @@ -28,7 +28,8 @@ namespace Titanic { -class CBomb : public CBackground, CEnterRoomMsgTarget { +class CBomb : public CBackground, + public CEnterRoomMsgTarget { private: int _fieldE0; int _fieldE4; diff --git a/engines/titanic/game/chicken_cooler.h b/engines/titanic/game/chicken_cooler.h index 176c8c9c4d..6f57cddb9c 100644 --- a/engines/titanic/game/chicken_cooler.h +++ b/engines/titanic/game/chicken_cooler.h @@ -28,7 +28,8 @@ namespace Titanic { -class CChickenCooler : public CGameObject, CEnterRoomMsgTarget { +class CChickenCooler : public CGameObject, + public CEnterRoomMsgTarget { private: int _fieldBC; int _fieldC0; diff --git a/engines/titanic/game/doorbot_elevator_handler.h b/engines/titanic/game/doorbot_elevator_handler.h index d6c5be94d6..bd33747239 100644 --- a/engines/titanic/game/doorbot_elevator_handler.h +++ b/engines/titanic/game/doorbot_elevator_handler.h @@ -28,7 +28,8 @@ namespace Titanic { -class CDoorbotElevatorHandler : public CGameObject, CEnterNodeMsgTarget { +class CDoorbotElevatorHandler : public CGameObject, + public CEnterNodeMsgTarget { private: static int _v1; int _value; diff --git a/engines/titanic/game/end_sequence_control.h b/engines/titanic/game/end_sequence_control.h index 5eb36943ea..87eaf17c0e 100644 --- a/engines/titanic/game/end_sequence_control.h +++ b/engines/titanic/game/end_sequence_control.h @@ -28,7 +28,8 @@ namespace Titanic { -class CEndSequenceControl : public CGameObject, CEnterRoomMsgTarget { +class CEndSequenceControl : public CGameObject, + public CEnterRoomMsgTarget { protected: virtual bool handleMessage(CEnterRoomMsg &msg); public: diff --git a/engines/titanic/game/fan_noises.h b/engines/titanic/game/fan_noises.h index 6daf8020c5..495ac39f8e 100644 --- a/engines/titanic/game/fan_noises.h +++ b/engines/titanic/game/fan_noises.h @@ -28,7 +28,8 @@ namespace Titanic { -class CFanNoises : public CGameObject, CEnterRoomMsgTarget { +class CFanNoises : public CGameObject, + public CEnterRoomMsgTarget { private: int _fieldBC; int _fieldC0; diff --git a/engines/titanic/game/get_lift_eye2.h b/engines/titanic/game/get_lift_eye2.h index 8ce181f3c6..7ca0b4d32e 100644 --- a/engines/titanic/game/get_lift_eye2.h +++ b/engines/titanic/game/get_lift_eye2.h @@ -27,7 +27,8 @@ #include "titanic/messages/messages.h" namespace Titanic { -class CGetLiftEye2 : public CGameObject, CEnterRoomMsgTarget { +class CGetLiftEye2 : public CGameObject, + public CEnterRoomMsgTarget { private: static CString *_v1; protected: diff --git a/engines/titanic/game/gondolier/gondolier_mixer.h b/engines/titanic/game/gondolier/gondolier_mixer.h index dd7288352b..c6ea840ea6 100644 --- a/engines/titanic/game/gondolier/gondolier_mixer.h +++ b/engines/titanic/game/gondolier/gondolier_mixer.h @@ -28,7 +28,8 @@ namespace Titanic { -class CGondolierMixer : public CGondolierBase, CEnterRoomMsgTarget { +class CGondolierMixer : public CGondolierBase, + public CEnterRoomMsgTarget { private: int _fieldBC; int _fieldC0; diff --git a/engines/titanic/game/light.h b/engines/titanic/game/light.h index 66d60bedf7..a2e562c573 100644 --- a/engines/titanic/game/light.h +++ b/engines/titanic/game/light.h @@ -28,7 +28,8 @@ namespace Titanic { -class CLight : public CBackground, CEnterRoomMsgTarget { +class CLight : public CBackground, + public CEnterRoomMsgTarget { private: int _fieldE0; int _fieldE4; diff --git a/engines/titanic/game/light_switch.h b/engines/titanic/game/light_switch.h index 2c43edd5b9..3e44590390 100644 --- a/engines/titanic/game/light_switch.h +++ b/engines/titanic/game/light_switch.h @@ -28,7 +28,8 @@ namespace Titanic { -class CLightSwitch : public CBackground, CEnterRoomMsgTarget { +class CLightSwitch : public CBackground, + public CEnterRoomMsgTarget { public: static int _v1; private: diff --git a/engines/titanic/game/parrot/player_meets_parrot.h b/engines/titanic/game/parrot/player_meets_parrot.h index 960b679fd4..9e47a0a932 100644 --- a/engines/titanic/game/parrot/player_meets_parrot.h +++ b/engines/titanic/game/parrot/player_meets_parrot.h @@ -28,7 +28,8 @@ namespace Titanic { -class CPlayerMeetsParrot : public CGameObject, CEnterRoomMsgTarget { +class CPlayerMeetsParrot : public CGameObject, + public CEnterRoomMsgTarget { protected: virtual bool handleMessage(CEnterRoomMsg &msg); public: diff --git a/engines/titanic/game/pet/pet_monitor.h b/engines/titanic/game/pet/pet_monitor.h index f8a35292fa..5cf14f38cb 100644 --- a/engines/titanic/game/pet/pet_monitor.h +++ b/engines/titanic/game/pet/pet_monitor.h @@ -28,7 +28,8 @@ namespace Titanic { -class CPETMonitor : public CGameObject, CEnterRoomMsgTarget { +class CPETMonitor : public CGameObject, + public CEnterRoomMsgTarget { protected: virtual bool handleMessage(CEnterRoomMsg &msg); public: diff --git a/engines/titanic/game/pet/pet_position.h b/engines/titanic/game/pet/pet_position.h index fe28a13777..820df41c50 100644 --- a/engines/titanic/game/pet/pet_position.h +++ b/engines/titanic/game/pet/pet_position.h @@ -28,7 +28,8 @@ namespace Titanic { -class CPETPosition : public CGameObject, CEnterRoomMsgTarget { +class CPETPosition : public CGameObject, + public CEnterRoomMsgTarget { protected: virtual bool handleMessage(CEnterRoomMsg &msg); public: diff --git a/engines/titanic/game/pet/pet_transport.h b/engines/titanic/game/pet/pet_transport.h index e43cbef849..8dd3f3aac5 100644 --- a/engines/titanic/game/pet/pet_transport.h +++ b/engines/titanic/game/pet/pet_transport.h @@ -28,7 +28,8 @@ namespace Titanic { -class CPETTransport : public CGameObject, CEnterRoomMsgTarget { +class CPETTransport : public CGameObject, + public CEnterRoomMsgTarget { protected: virtual bool handleMessage(CEnterRoomMsg &msg); public: diff --git a/engines/titanic/game/sgt/sgt_state_room.h b/engines/titanic/game/sgt/sgt_state_room.h index a730473580..6e53ad39da 100644 --- a/engines/titanic/game/sgt/sgt_state_room.h +++ b/engines/titanic/game/sgt/sgt_state_room.h @@ -45,7 +45,8 @@ struct CSGTStateRoomStatics { int _v14; }; -class CSGTStateRoom : public CBackground, CEnterRoomMsgTarget { +class CSGTStateRoom : public CBackground, + public CEnterRoomMsgTarget { private: static CSGTStateRoomStatics *_statics; private: diff --git a/engines/titanic/game/ship_setting.h b/engines/titanic/game/ship_setting.h index 6ea38be052..878feba8ba 100644 --- a/engines/titanic/game/ship_setting.h +++ b/engines/titanic/game/ship_setting.h @@ -28,7 +28,8 @@ namespace Titanic { -class CShipSetting : public CBackground, CEnterRoomMsgTarget { +class CShipSetting : public CBackground, + public CEnterRoomMsgTarget { private: CString _string3; Point _pos1; diff --git a/engines/titanic/game/transport/lift.h b/engines/titanic/game/transport/lift.h index 4f628231e8..c2a18df4dd 100644 --- a/engines/titanic/game/transport/lift.h +++ b/engines/titanic/game/transport/lift.h @@ -28,7 +28,8 @@ namespace Titanic { -class CLift : public CTransport, CEnterRoomMsgTarget { +class CLift : public CTransport, + public CEnterRoomMsgTarget { private: static int _v1; static int _v2; diff --git a/engines/titanic/game/transport/pellerator.h b/engines/titanic/game/transport/pellerator.h index 03e45751b2..b97d17ff88 100644 --- a/engines/titanic/game/transport/pellerator.h +++ b/engines/titanic/game/transport/pellerator.h @@ -28,7 +28,8 @@ namespace Titanic { -class CPellerator : public CTransport, CEnterRoomMsgTarget { +class CPellerator : public CTransport, + public CEnterRoomMsgTarget { private: static int _v1; static int _v2; diff --git a/engines/titanic/game/up_lighter.h b/engines/titanic/game/up_lighter.h index add941f325..589e279d6b 100644 --- a/engines/titanic/game/up_lighter.h +++ b/engines/titanic/game/up_lighter.h @@ -28,7 +28,8 @@ namespace Titanic { -class CUpLighter : public CDropTarget, CEnterRoomMsgTarget { +class CUpLighter : public CDropTarget, + public CEnterRoomMsgTarget { private: int _field118; int _field11C; diff --git a/engines/titanic/moves/enter_bridge.h b/engines/titanic/moves/enter_bridge.h index 9f7a64cf73..743960d30e 100644 --- a/engines/titanic/moves/enter_bridge.h +++ b/engines/titanic/moves/enter_bridge.h @@ -28,7 +28,8 @@ namespace Titanic { -class CEnterBridge : public CGameObject, CEnterRoomMsgTarget { +class CEnterBridge : public CGameObject, + public CEnterRoomMsgTarget { private: int _value; protected: diff --git a/engines/titanic/npcs/barbot.h b/engines/titanic/npcs/barbot.h index d407ef74c8..0cad69a758 100644 --- a/engines/titanic/npcs/barbot.h +++ b/engines/titanic/npcs/barbot.h @@ -28,7 +28,8 @@ namespace Titanic { -class CBarbot : public CTrueTalkNPC, CEnterRoomMsgTarget { +class CBarbot : public CTrueTalkNPC, + public CEnterRoomMsgTarget { private: static int _v0; private: diff --git a/engines/titanic/npcs/liftbot.h b/engines/titanic/npcs/liftbot.h index 373147bdb7..03867cc6f3 100644 --- a/engines/titanic/npcs/liftbot.h +++ b/engines/titanic/npcs/liftbot.h @@ -28,7 +28,8 @@ namespace Titanic { -class CLiftBot : public CTrueTalkNPC, CEnterRoomMsgTarget { +class CLiftBot : public CTrueTalkNPC, + public CEnterRoomMsgTarget { private: static int _v1; static int _v2; diff --git a/engines/titanic/sound/auto_music_player.h b/engines/titanic/sound/auto_music_player.h index bcf4126264..da8a386cb1 100644 --- a/engines/titanic/sound/auto_music_player.h +++ b/engines/titanic/sound/auto_music_player.h @@ -28,7 +28,8 @@ namespace Titanic { -class CAutoMusicPlayer : public CAutoMusicPlayerBase, CEnterRoomMsgTarget { +class CAutoMusicPlayer : public CAutoMusicPlayerBase, + public CEnterRoomMsgTarget { private: CString _string2; protected: diff --git a/engines/titanic/sound/music_player.h b/engines/titanic/sound/music_player.h index 6b8bc83b05..4cc510c42f 100644 --- a/engines/titanic/sound/music_player.h +++ b/engines/titanic/sound/music_player.h @@ -28,7 +28,8 @@ namespace Titanic { -class CMusicPlayer : public CGameObject, CEnterRoomMsgTarget { +class CMusicPlayer : public CGameObject, + public CEnterRoomMsgTarget { protected: int _fieldBC; CString _string1; diff --git a/engines/titanic/sound/node_auto_sound_player.h b/engines/titanic/sound/node_auto_sound_player.h index acc766abec..fee4d3dae3 100644 --- a/engines/titanic/sound/node_auto_sound_player.h +++ b/engines/titanic/sound/node_auto_sound_player.h @@ -28,7 +28,8 @@ namespace Titanic { -class CNodeAutoSoundPlayer : public CAutoSoundPlayer, CEnterNodeMsgTarget { +class CNodeAutoSoundPlayer : public CAutoSoundPlayer, + public CEnterNodeMsgTarget { private: int _fieldEC; protected: diff --git a/engines/titanic/sound/room_auto_sound_player.h b/engines/titanic/sound/room_auto_sound_player.h index 82d23a79c3..c72aff1763 100644 --- a/engines/titanic/sound/room_auto_sound_player.h +++ b/engines/titanic/sound/room_auto_sound_player.h @@ -28,7 +28,8 @@ namespace Titanic { -class CRoomAutoSoundPlayer : public CAutoSoundPlayer, CEnterRoomMsgTarget { +class CRoomAutoSoundPlayer : public CAutoSoundPlayer, + public CEnterRoomMsgTarget { protected: virtual bool handleMessage(CEnterRoomMsg &msg); public: -- cgit v1.2.3