diff options
| author | Paul Gilbert | 2016-04-06 23:28:42 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-04-06 23:28:42 -0400 |
| commit | 51dc36a9a52f95815b4b1109b080d070247bf247 (patch) | |
| tree | d53d8c288a593fd897536f943debbd2d7b46275e /engines/titanic/sound | |
| parent | 51df4d98d3a066e092f34cf7968c436a3e430df2 (diff) | |
| download | scummvm-rg350-51dc36a9a52f95815b4b1109b080d070247bf247.tar.gz scummvm-rg350-51dc36a9a52f95815b4b1109b080d070247bf247.tar.bz2 scummvm-rg350-51dc36a9a52f95815b4b1109b080d070247bf247.zip | |
TITANIC: Furhter in-progress message handling conversion
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 | ||||
| -rw-r--r-- | engines/titanic/sound/room_trigger_auto_music_player.h | 2 |
5 files changed, 5 insertions, 9 deletions
diff --git a/engines/titanic/sound/auto_music_player.h b/engines/titanic/sound/auto_music_player.h index da8a386cb1..0848439d49 100644 --- a/engines/titanic/sound/auto_music_player.h +++ b/engines/titanic/sound/auto_music_player.h @@ -28,8 +28,7 @@ namespace Titanic { -class CAutoMusicPlayer : public CAutoMusicPlayerBase, - public CEnterRoomMsgTarget { +class CAutoMusicPlayer : public CAutoMusicPlayerBase { private: CString _string2; protected: diff --git a/engines/titanic/sound/music_player.h b/engines/titanic/sound/music_player.h index 4cc510c42f..614fa375cd 100644 --- a/engines/titanic/sound/music_player.h +++ b/engines/titanic/sound/music_player.h @@ -28,8 +28,7 @@ namespace Titanic { -class CMusicPlayer : public CGameObject, - public CEnterRoomMsgTarget { +class CMusicPlayer : public CGameObject { 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 fee4d3dae3..451b94688d 100644 --- a/engines/titanic/sound/node_auto_sound_player.h +++ b/engines/titanic/sound/node_auto_sound_player.h @@ -28,8 +28,7 @@ namespace Titanic { -class CNodeAutoSoundPlayer : public CAutoSoundPlayer, - public CEnterNodeMsgTarget { +class CNodeAutoSoundPlayer : public CAutoSoundPlayer { 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 c72aff1763..70d3dfee88 100644 --- a/engines/titanic/sound/room_auto_sound_player.h +++ b/engines/titanic/sound/room_auto_sound_player.h @@ -28,8 +28,7 @@ namespace Titanic { -class CRoomAutoSoundPlayer : public CAutoSoundPlayer, - public CEnterRoomMsgTarget { +class CRoomAutoSoundPlayer : public CAutoSoundPlayer { protected: virtual bool handleMessage(CEnterRoomMsg &msg); public: diff --git a/engines/titanic/sound/room_trigger_auto_music_player.h b/engines/titanic/sound/room_trigger_auto_music_player.h index 4ce4bae7fa..c3e4d0f6a4 100644 --- a/engines/titanic/sound/room_trigger_auto_music_player.h +++ b/engines/titanic/sound/room_trigger_auto_music_player.h @@ -28,7 +28,7 @@ namespace Titanic { -class CRoomTriggerAutoMusicPlayer : public CTriggerAutoMusicPlayer, CEnterRoomMsgTarget { +class CRoomTriggerAutoMusicPlayer : public CTriggerAutoMusicPlayer { protected: virtual bool handleMessage(CEnterRoomMsg &msg); public: |