diff options
| author | Paul Gilbert | 2016-03-24 12:51:44 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-03-24 12:51:44 -0400 |
| commit | d9cc2908f8a9a7fa2d196c82571d32b5ef20ad9b (patch) | |
| tree | 534f4a9bc978ffe51ca59673ab3bdc69fea10e81 /engines/titanic/sound | |
| parent | 66e198d665a8aacd1724848a40e6533f3d5cfebc (diff) | |
| download | scummvm-rg350-d9cc2908f8a9a7fa2d196c82571d32b5ef20ad9b.tar.gz scummvm-rg350-d9cc2908f8a9a7fa2d196c82571d32b5ef20ad9b.tar.bz2 scummvm-rg350-d9cc2908f8a9a7fa2d196c82571d32b5ef20ad9b.zip | |
TITANIC: Make all use of message targets public inheritance
Diffstat (limited to 'engines/titanic/sound')
| -rw-r--r-- | engines/titanic/sound/auto_music_player.h | 3 | ||||
| -rw-r--r-- | engines/titanic/sound/music_player.h | 3 | ||||
| -rw-r--r-- | engines/titanic/sound/node_auto_sound_player.h | 3 | ||||
| -rw-r--r-- | engines/titanic/sound/room_auto_sound_player.h | 3 |
4 files changed, 8 insertions, 4 deletions
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: |