diff options
Diffstat (limited to 'engines/titanic/sound')
20 files changed, 20 insertions, 95 deletions
diff --git a/engines/titanic/sound/auto_music_player.h b/engines/titanic/sound/auto_music_player.h index 11e46b0478..cec8117dd9 100644 --- a/engines/titanic/sound/auto_music_player.h +++ b/engines/titanic/sound/auto_music_player.h @@ -31,14 +31,10 @@ class CAutoMusicPlayer : public CAutoMusicPlayerBase { private: CString _string2; public: + CLASSDEF CAutoMusicPlayer(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CAutoMusicPlayer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/auto_music_player_base.h b/engines/titanic/sound/auto_music_player_base.h index 66ffabb61c..e762ef40b9 100644 --- a/engines/titanic/sound/auto_music_player_base.h +++ b/engines/titanic/sound/auto_music_player_base.h @@ -35,14 +35,10 @@ protected: int _fieldD0; int _fieldD4; public: + CLASSDEF CAutoMusicPlayerBase(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CAutoMusicPlayerBase"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/auto_sound_player.h b/engines/titanic/sound/auto_sound_player.h index bc849341df..15f1325e06 100644 --- a/engines/titanic/sound/auto_sound_player.h +++ b/engines/titanic/sound/auto_sound_player.h @@ -40,14 +40,10 @@ public: int _fieldE4; int _fieldE8; public: + CLASSDEF CAutoSoundPlayer(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CAutoSoundPlayer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/auto_sound_player_adsr.h b/engines/titanic/sound/auto_sound_player_adsr.h index 9c2a082ba5..c88a861f9b 100644 --- a/engines/titanic/sound/auto_sound_player_adsr.h +++ b/engines/titanic/sound/auto_sound_player_adsr.h @@ -33,10 +33,7 @@ private: CString _string3; CString _string4; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CAutoSoundPlayerADSR"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/sound/background_sound_maker.h b/engines/titanic/sound/background_sound_maker.h index 5a234ae048..68c1d7d1a9 100644 --- a/engines/titanic/sound/background_sound_maker.h +++ b/engines/titanic/sound/background_sound_maker.h @@ -31,14 +31,10 @@ class CBackgroundSoundMaker : public CGameObject { public: int _value; public: + CLASSDEF CBackgroundSoundMaker() : CGameObject(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBackgroundSoundMaker"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/bird_song.h b/engines/titanic/sound/bird_song.h index 50c1f2b722..d932cfde7d 100644 --- a/engines/titanic/sound/bird_song.h +++ b/engines/titanic/sound/bird_song.h @@ -31,14 +31,10 @@ class CBirdSong : public CRoomAutoSoundPlayer { public: int _value; public: + CLASSDEF CBirdSong() : CRoomAutoSoundPlayer(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBirdSong"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/dome_from_top_of_well.h b/engines/titanic/sound/dome_from_top_of_well.h index faea805b1a..bb8ab6372a 100644 --- a/engines/titanic/sound/dome_from_top_of_well.h +++ b/engines/titanic/sound/dome_from_top_of_well.h @@ -29,10 +29,7 @@ namespace Titanic { class CDomeFromTopOfWell : public CViewAutoSoundPlayer { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CDomeFromTopOfWell"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/sound/enter_view_toggles_other_music.h b/engines/titanic/sound/enter_view_toggles_other_music.h index 3e7976e877..991a6ad2bc 100644 --- a/engines/titanic/sound/enter_view_toggles_other_music.h +++ b/engines/titanic/sound/enter_view_toggles_other_music.h @@ -31,14 +31,10 @@ class CEnterViewTogglesOtherMusic : public CTriggerAutoMusicPlayer { protected: int _fieldC8; public: + CLASSDEF CEnterViewTogglesOtherMusic(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEnterViewTogglesOtherMusic"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/gondolier_song.h b/engines/titanic/sound/gondolier_song.h index 38f7e867f8..6377279c04 100644 --- a/engines/titanic/sound/gondolier_song.h +++ b/engines/titanic/sound/gondolier_song.h @@ -31,14 +31,10 @@ class CGondolierSong : public CRoomAutoSoundPlayer { public: int _value; public: + CLASSDEF CGondolierSong() : CRoomAutoSoundPlayer(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGondolierSong"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/music_player.h b/engines/titanic/sound/music_player.h index 19539c89f7..0a750cc538 100644 --- a/engines/titanic/sound/music_player.h +++ b/engines/titanic/sound/music_player.h @@ -34,15 +34,11 @@ public: int _fieldCC; int _fieldD0; public: + CLASSDEF CMusicPlayer() : CGameObject(), _fieldBC(0), _fieldCC(0), _fieldD0(100) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicPlayer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/node_auto_sound_player.h b/engines/titanic/sound/node_auto_sound_player.h index 5f4b70b93d..6fc56098f8 100644 --- a/engines/titanic/sound/node_auto_sound_player.h +++ b/engines/titanic/sound/node_auto_sound_player.h @@ -31,14 +31,10 @@ class CNodeAutoSoundPlayer : public CAutoSoundPlayer { private: int _fieldEC; public: + CLASSDEF CNodeAutoSoundPlayer() : CAutoSoundPlayer(), _fieldEC(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CViewAutoSoundPlayer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/restricted_auto_music_player.h b/engines/titanic/sound/restricted_auto_music_player.h index ab8e26e9da..cb6220cbc7 100644 --- a/engines/titanic/sound/restricted_auto_music_player.h +++ b/engines/titanic/sound/restricted_auto_music_player.h @@ -34,10 +34,7 @@ private: CString _string5; CString _string6; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CRestrictedAutoMusicPlayer"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/sound/room_auto_sound_player.h b/engines/titanic/sound/room_auto_sound_player.h index 719eddcb84..ebee0165f6 100644 --- a/engines/titanic/sound/room_auto_sound_player.h +++ b/engines/titanic/sound/room_auto_sound_player.h @@ -29,10 +29,7 @@ namespace Titanic { class CRoomAutoSoundPlayer : public CAutoSoundPlayer { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CRoomAutoSoundPlayer"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/sound/season_noises.h b/engines/titanic/sound/season_noises.h index def709c536..7746c164e8 100644 --- a/engines/titanic/sound/season_noises.h +++ b/engines/titanic/sound/season_noises.h @@ -35,14 +35,10 @@ private: CString _string4; CString _string5; public: + CLASSDEF CSeasonNoises(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSeasonNoises"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/seasonal_music_player.h b/engines/titanic/sound/seasonal_music_player.h index fe3a60be9d..da19e1f0b0 100644 --- a/engines/titanic/sound/seasonal_music_player.h +++ b/engines/titanic/sound/seasonal_music_player.h @@ -38,14 +38,10 @@ private: int _fieldF0; int _fieldF4; public: + CLASSDEF CSeasonalMusicPlayer(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSeasonalMusicPlayer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/titania_speech.h b/engines/titanic/sound/titania_speech.h index a81544a903..fc55c20af5 100644 --- a/engines/titanic/sound/titania_speech.h +++ b/engines/titanic/sound/titania_speech.h @@ -31,14 +31,10 @@ class CTitaniaSpeech : public CGameObject { public: int _value1, _value2; public: + CLASSDEF CTitaniaSpeech() : CGameObject(), _value1(1), _value2(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTitaniaSpeech"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/trigger_auto_music_player.h b/engines/titanic/sound/trigger_auto_music_player.h index 8f7a42c5c2..6387236181 100644 --- a/engines/titanic/sound/trigger_auto_music_player.h +++ b/engines/titanic/sound/trigger_auto_music_player.h @@ -31,10 +31,7 @@ class CTriggerAutoMusicPlayer : public CGameObject { protected: CString _fieldBC; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTriggerAutoMusicPlayer"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/sound/view_auto_sound_player.h b/engines/titanic/sound/view_auto_sound_player.h index 9e87d74d8d..60de391ecb 100644 --- a/engines/titanic/sound/view_auto_sound_player.h +++ b/engines/titanic/sound/view_auto_sound_player.h @@ -31,14 +31,10 @@ class CViewAutoSoundPlayer : public CAutoSoundPlayer { private: int _fieldEC; public: + CLASSDEF CViewAutoSoundPlayer() : CAutoSoundPlayer(), _fieldEC(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CViewAutoSoundPlayer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/view_toggles_other_music.h b/engines/titanic/sound/view_toggles_other_music.h index e0da2437cc..68fa47b2be 100644 --- a/engines/titanic/sound/view_toggles_other_music.h +++ b/engines/titanic/sound/view_toggles_other_music.h @@ -31,14 +31,10 @@ class CViewTogglesOtherMusic : public CEnterViewTogglesOtherMusic { private: int _fieldCC; public: + CLASSDEF CViewTogglesOtherMusic(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CViewTogglesOtherMusic"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/sound/water_lapping_sounds.h b/engines/titanic/sound/water_lapping_sounds.h index 3dd72b5250..0d885bedd4 100644 --- a/engines/titanic/sound/water_lapping_sounds.h +++ b/engines/titanic/sound/water_lapping_sounds.h @@ -31,14 +31,10 @@ class CWaterLappingSounds : public CRoomAutoSoundPlayer { public: int _value; public: + CLASSDEF CWaterLappingSounds() : CRoomAutoSoundPlayer(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CWaterLappingSounds"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; |