diff options
Diffstat (limited to 'engines/titanic/gfx')
57 files changed, 58 insertions, 264 deletions
diff --git a/engines/titanic/gfx/act_button.h b/engines/titanic/gfx/act_button.h index 0ae2d4d92e..b8f8f21173 100644 --- a/engines/titanic/gfx/act_button.h +++ b/engines/titanic/gfx/act_button.h @@ -29,14 +29,10 @@ namespace Titanic { class CActButton : public CSTButton { public: + CLASSDEF CActButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CActButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/changes_season_button.h b/engines/titanic/gfx/changes_season_button.h index 8a756341fd..f39cfdc647 100644 --- a/engines/titanic/gfx/changes_season_button.h +++ b/engines/titanic/gfx/changes_season_button.h @@ -29,14 +29,10 @@ namespace Titanic { class CChangesSeasonButton : public CSTButton { public: + CLASSDEF CChangesSeasonButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CChangesSeasonButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/chev_left_off.h b/engines/titanic/gfx/chev_left_off.h index c3ea05dabc..753aba3be0 100644 --- a/engines/titanic/gfx/chev_left_off.h +++ b/engines/titanic/gfx/chev_left_off.h @@ -29,14 +29,10 @@ namespace Titanic { class CChevLeftOff : public CToggleSwitch { public: + CLASSDEF CChevLeftOff(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CChevLeftOff"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/chev_left_on.h b/engines/titanic/gfx/chev_left_on.h index c2f23c30c7..99126d792c 100644 --- a/engines/titanic/gfx/chev_left_on.h +++ b/engines/titanic/gfx/chev_left_on.h @@ -29,14 +29,10 @@ namespace Titanic { class CChevLeftOn : public CToggleSwitch { public: + CLASSDEF CChevLeftOn(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CChevLeftOn"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/chev_right_off.h b/engines/titanic/gfx/chev_right_off.h index da28759abf..1a31007f19 100644 --- a/engines/titanic/gfx/chev_right_off.h +++ b/engines/titanic/gfx/chev_right_off.h @@ -29,14 +29,10 @@ namespace Titanic { class CChevRightOff : public CToggleSwitch { public: + CLASSDEF CChevRightOff(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CChevRightOff"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/chev_right_on.h b/engines/titanic/gfx/chev_right_on.h index eb307c16f7..084b02ea08 100644 --- a/engines/titanic/gfx/chev_right_on.h +++ b/engines/titanic/gfx/chev_right_on.h @@ -29,14 +29,10 @@ namespace Titanic { class CChevRightOn : public CToggleSwitch { public: + CLASSDEF CChevRightOn(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CChevRightOn"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/chev_send_rec_switch.h b/engines/titanic/gfx/chev_send_rec_switch.h index 8cd06e6ab0..29d6e7ab82 100644 --- a/engines/titanic/gfx/chev_send_rec_switch.h +++ b/engines/titanic/gfx/chev_send_rec_switch.h @@ -29,14 +29,10 @@ namespace Titanic { class CChevSendRecSwitch : public CToggleSwitch { public: + CLASSDEF CChevSendRecSwitch(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSendRecSwitch"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/chev_switch.h b/engines/titanic/gfx/chev_switch.h index e7b43c3805..6c0314be4c 100644 --- a/engines/titanic/gfx/chev_switch.h +++ b/engines/titanic/gfx/chev_switch.h @@ -29,14 +29,10 @@ namespace Titanic { class CChevSwitch : public CToggleSwitch { public: + CLASSDEF CChevSwitch(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CChevSwitch"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/edit_control.h b/engines/titanic/gfx/edit_control.h index 79b20f7108..d782b72669 100644 --- a/engines/titanic/gfx/edit_control.h +++ b/engines/titanic/gfx/edit_control.h @@ -43,14 +43,10 @@ protected: int _fieldF0; int _fieldF4; public: + CLASSDEF CEditControl(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEditControl"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/elevator_button.h b/engines/titanic/gfx/elevator_button.h index 1090ea800a..dddb7077b3 100644 --- a/engines/titanic/gfx/elevator_button.h +++ b/engines/titanic/gfx/elevator_button.h @@ -29,14 +29,10 @@ namespace Titanic { class CElevatorButton : public CSTButton { public: + CLASSDEF CElevatorButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CElevatorButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/get_from_succ.h b/engines/titanic/gfx/get_from_succ.h index 810eb3117c..f0b028afa0 100644 --- a/engines/titanic/gfx/get_from_succ.h +++ b/engines/titanic/gfx/get_from_succ.h @@ -29,14 +29,10 @@ namespace Titanic { class CGetFromSucc : public CToggleSwitch { public: + CLASSDEF CGetFromSucc(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGetFromSucc"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/helmet_on_off.h b/engines/titanic/gfx/helmet_on_off.h index 839c2a533f..41621f340e 100644 --- a/engines/titanic/gfx/helmet_on_off.h +++ b/engines/titanic/gfx/helmet_on_off.h @@ -29,14 +29,10 @@ namespace Titanic { class CHelmetOnOff : public CToggleSwitch { public: + CLASSDEF CHelmetOnOff(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHelmetOnOff"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/home_photo.h b/engines/titanic/gfx/home_photo.h index f8ad297534..6e6f4976a2 100644 --- a/engines/titanic/gfx/home_photo.h +++ b/engines/titanic/gfx/home_photo.h @@ -29,14 +29,10 @@ namespace Titanic { class CHomePhoto : public CToggleSwitch { public: + CLASSDEF CHomePhoto(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHomePhoto"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/icon_nav_action.h b/engines/titanic/gfx/icon_nav_action.h index 812930bfdb..cb8fae932a 100644 --- a/engines/titanic/gfx/icon_nav_action.h +++ b/engines/titanic/gfx/icon_nav_action.h @@ -29,14 +29,10 @@ namespace Titanic { class CIconNavAction : public CToggleSwitch { public: + CLASSDEF CIconNavAction(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CIconNavAction"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/icon_nav_butt.h b/engines/titanic/gfx/icon_nav_butt.h index 018904eb73..36d3eb0890 100644 --- a/engines/titanic/gfx/icon_nav_butt.h +++ b/engines/titanic/gfx/icon_nav_butt.h @@ -29,10 +29,7 @@ namespace Titanic { class CIconNavButt : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CIconNavButt"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/icon_nav_down.h b/engines/titanic/gfx/icon_nav_down.h index c6acfa04a3..b7759e059d 100644 --- a/engines/titanic/gfx/icon_nav_down.h +++ b/engines/titanic/gfx/icon_nav_down.h @@ -29,14 +29,10 @@ namespace Titanic { class CIconNavDown : public CToggleSwitch { public: + CLASSDEF CIconNavDown(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CIconNavDown"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/icon_nav_image.h b/engines/titanic/gfx/icon_nav_image.h index 403936d06e..61febfd2a4 100644 --- a/engines/titanic/gfx/icon_nav_image.h +++ b/engines/titanic/gfx/icon_nav_image.h @@ -29,10 +29,7 @@ namespace Titanic { class CIconNavImage : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CIconNavImage"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/icon_nav_left.h b/engines/titanic/gfx/icon_nav_left.h index 006056babd..e507d2c2dd 100644 --- a/engines/titanic/gfx/icon_nav_left.h +++ b/engines/titanic/gfx/icon_nav_left.h @@ -29,14 +29,10 @@ namespace Titanic { class CIconNavLeft : public CToggleSwitch { public: + CLASSDEF CIconNavLeft(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CIconNavLeft"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/icon_nav_receive.h b/engines/titanic/gfx/icon_nav_receive.h index b158fdaf87..cce1df2279 100644 --- a/engines/titanic/gfx/icon_nav_receive.h +++ b/engines/titanic/gfx/icon_nav_receive.h @@ -29,10 +29,7 @@ namespace Titanic { class CIconNavReceive : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CIconNavReceive"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/icon_nav_right.h b/engines/titanic/gfx/icon_nav_right.h index 9f319d1065..db3bab4bb8 100644 --- a/engines/titanic/gfx/icon_nav_right.h +++ b/engines/titanic/gfx/icon_nav_right.h @@ -29,14 +29,10 @@ namespace Titanic { class CIconNavRight : public CToggleSwitch { public: + CLASSDEF CIconNavRight(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CIconNavRight"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/icon_nav_send.h b/engines/titanic/gfx/icon_nav_send.h index 59cb670687..1ffb8e9e15 100644 --- a/engines/titanic/gfx/icon_nav_send.h +++ b/engines/titanic/gfx/icon_nav_send.h @@ -29,10 +29,7 @@ namespace Titanic { class CIconNavSend : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CIconNavSend"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/icon_nav_up.h b/engines/titanic/gfx/icon_nav_up.h index 010b6093a3..7eeeb773b1 100644 --- a/engines/titanic/gfx/icon_nav_up.h +++ b/engines/titanic/gfx/icon_nav_up.h @@ -29,14 +29,10 @@ namespace Titanic { class CIconNavUp : public CToggleSwitch { public: + CLASSDEF CIconNavUp(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CIconNavUp"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/keybrd_butt.h b/engines/titanic/gfx/keybrd_butt.h index 52fff7700f..a4f233b209 100644 --- a/engines/titanic/gfx/keybrd_butt.h +++ b/engines/titanic/gfx/keybrd_butt.h @@ -29,14 +29,10 @@ namespace Titanic { class CKeybrdButt : public CToggleSwitch { public: + CLASSDEF CKeybrdButt(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CKeybrdButt"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/move_object_button.h b/engines/titanic/gfx/move_object_button.h index b00ba7b00f..70df8f6a7f 100644 --- a/engines/titanic/gfx/move_object_button.h +++ b/engines/titanic/gfx/move_object_button.h @@ -32,14 +32,10 @@ private: Common::Point _pos1; int _field11C; public: + CLASSDEF CMoveObjectButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMoveObjectButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/music_control.h b/engines/titanic/gfx/music_control.h index a6063f4f9e..97a0077c18 100644 --- a/engines/titanic/gfx/music_control.h +++ b/engines/titanic/gfx/music_control.h @@ -34,14 +34,10 @@ public: int _fieldE8; int _fieldEC; public: + CLASSDEF CMusicControl(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicControl"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/music_slider.h b/engines/titanic/gfx/music_slider.h index 911698656d..3fd0ab341e 100644 --- a/engines/titanic/gfx/music_slider.h +++ b/engines/titanic/gfx/music_slider.h @@ -29,10 +29,7 @@ namespace Titanic { class CMusicSlider : public CMusicControl { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicSlider"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/music_slider_pitch.h b/engines/titanic/gfx/music_slider_pitch.h index ba2514bf28..f50958bdcd 100644 --- a/engines/titanic/gfx/music_slider_pitch.h +++ b/engines/titanic/gfx/music_slider_pitch.h @@ -29,10 +29,7 @@ namespace Titanic { class CMusicSliderPitch : public CMusicSlider { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicSliderPitch"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/music_slider_speed.h b/engines/titanic/gfx/music_slider_speed.h index fb3e7e1d41..8ed18625ff 100644 --- a/engines/titanic/gfx/music_slider_speed.h +++ b/engines/titanic/gfx/music_slider_speed.h @@ -29,10 +29,7 @@ namespace Titanic { class CMusicSliderSpeed : public CMusicSlider { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicSliderSpeed"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/music_switch.h b/engines/titanic/gfx/music_switch.h index 0f277c5905..534eb251de 100644 --- a/engines/titanic/gfx/music_switch.h +++ b/engines/titanic/gfx/music_switch.h @@ -29,10 +29,7 @@ namespace Titanic { class CMusicSwitch : public CMusicControl { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicSwitch"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/music_switch_inversion.h b/engines/titanic/gfx/music_switch_inversion.h index 23562482e0..6aea692f61 100644 --- a/engines/titanic/gfx/music_switch_inversion.h +++ b/engines/titanic/gfx/music_switch_inversion.h @@ -29,10 +29,7 @@ namespace Titanic { class CMusicSwitchInversion : public CMusicSwitch { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicSwitchInversion"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/music_switch_reverse.h b/engines/titanic/gfx/music_switch_reverse.h index 5467ededb7..99460f1845 100644 --- a/engines/titanic/gfx/music_switch_reverse.h +++ b/engines/titanic/gfx/music_switch_reverse.h @@ -29,10 +29,7 @@ namespace Titanic { class CMusicSwitchReverse : public CMusicSwitch { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicSwitchReverse"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/music_voice_mute.h b/engines/titanic/gfx/music_voice_mute.h index 2a2acdedaa..2198b96e42 100644 --- a/engines/titanic/gfx/music_voice_mute.h +++ b/engines/titanic/gfx/music_voice_mute.h @@ -29,10 +29,7 @@ namespace Titanic { class CMusicVoiceMute : public CMusicControl { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicVoiceMute"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/pet_drag_chev.h b/engines/titanic/gfx/pet_drag_chev.h index 72f83dddf8..e82afd0a1b 100644 --- a/engines/titanic/gfx/pet_drag_chev.h +++ b/engines/titanic/gfx/pet_drag_chev.h @@ -29,10 +29,7 @@ namespace Titanic { class CPetDragChev : public CPetGraphic2 { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPetDragChev"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/pet_graphic.h b/engines/titanic/gfx/pet_graphic.h index 28b5d9aeca..112d75a870 100644 --- a/engines/titanic/gfx/pet_graphic.h +++ b/engines/titanic/gfx/pet_graphic.h @@ -29,10 +29,7 @@ namespace Titanic { class CPetGraphic : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPetGraphic"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/pet_graphic2.h b/engines/titanic/gfx/pet_graphic2.h index aabf058cf6..d9bb514915 100644 --- a/engines/titanic/gfx/pet_graphic2.h +++ b/engines/titanic/gfx/pet_graphic2.h @@ -29,10 +29,7 @@ namespace Titanic { class CPetGraphic2 : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNutReplacer"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/pet_leaf.h b/engines/titanic/gfx/pet_leaf.h index 95fe1e6062..073374970c 100644 --- a/engines/titanic/gfx/pet_leaf.h +++ b/engines/titanic/gfx/pet_leaf.h @@ -29,10 +29,7 @@ namespace Titanic { class PETLeaf : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "PETLeaf"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/pet_mode_off.h b/engines/titanic/gfx/pet_mode_off.h index 45b1010e45..ea88255b93 100644 --- a/engines/titanic/gfx/pet_mode_off.h +++ b/engines/titanic/gfx/pet_mode_off.h @@ -29,14 +29,10 @@ namespace Titanic { class CPetModeOff : public CToggleSwitch { public: + CLASSDEF CPetModeOff(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPetModeOff"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/pet_mode_on.h b/engines/titanic/gfx/pet_mode_on.h index 8ebfd8de3e..1434fb20db 100644 --- a/engines/titanic/gfx/pet_mode_on.h +++ b/engines/titanic/gfx/pet_mode_on.h @@ -29,14 +29,10 @@ namespace Titanic { class CPetModeOn : public CToggleSwitch { public: + CLASSDEF CPetModeOn(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPetModeOn"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/pet_mode_panel.h b/engines/titanic/gfx/pet_mode_panel.h index 3a394dfe05..ef68ca8b06 100644 --- a/engines/titanic/gfx/pet_mode_panel.h +++ b/engines/titanic/gfx/pet_mode_panel.h @@ -29,14 +29,10 @@ namespace Titanic { class CPetModePanel : public CToggleSwitch { public: + CLASSDEF CPetModePanel(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPetModePanel"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/pet_pannel1.h b/engines/titanic/gfx/pet_pannel1.h index 3d9b4068db..9261af9077 100644 --- a/engines/titanic/gfx/pet_pannel1.h +++ b/engines/titanic/gfx/pet_pannel1.h @@ -29,10 +29,7 @@ namespace Titanic { class CPetPannel1 : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPetPannel1"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/pet_pannel2.h b/engines/titanic/gfx/pet_pannel2.h index 6fdad872ba..561c0d74a2 100644 --- a/engines/titanic/gfx/pet_pannel2.h +++ b/engines/titanic/gfx/pet_pannel2.h @@ -29,10 +29,7 @@ namespace Titanic { class CPetPannel2 : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPetPannel2"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/pet_pannel3.h b/engines/titanic/gfx/pet_pannel3.h index 521d5179c2..590818406a 100644 --- a/engines/titanic/gfx/pet_pannel3.h +++ b/engines/titanic/gfx/pet_pannel3.h @@ -29,10 +29,7 @@ namespace Titanic { class CPetPannel3 : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPetPannel3"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/send_to_succ.h b/engines/titanic/gfx/send_to_succ.h index 971c2e7f3f..fb237f206d 100644 --- a/engines/titanic/gfx/send_to_succ.h +++ b/engines/titanic/gfx/send_to_succ.h @@ -29,13 +29,9 @@ namespace Titanic { class CSendToSucc : public CToggleSwitch { public: + CLASSDEF CSendToSucc(); - - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSendToSucc"; } - + /** * Save the data for the class to file */ diff --git a/engines/titanic/gfx/sgt_selector.h b/engines/titanic/gfx/sgt_selector.h index 92832889d4..678ee77b06 100644 --- a/engines/titanic/gfx/sgt_selector.h +++ b/engines/titanic/gfx/sgt_selector.h @@ -29,10 +29,7 @@ namespace Titanic { class CSGTSelector : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSGTSelector"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/slider_button.h b/engines/titanic/gfx/slider_button.h index e39a5f8c41..afb96dbd70 100644 --- a/engines/titanic/gfx/slider_button.h +++ b/engines/titanic/gfx/slider_button.h @@ -34,14 +34,10 @@ private: int _field11C; Common::Point _pos1; public: + CLASSDEF CSliderButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSliderButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/small_chev_left_off.h b/engines/titanic/gfx/small_chev_left_off.h index bf73c7425b..fc500cee69 100644 --- a/engines/titanic/gfx/small_chev_left_off.h +++ b/engines/titanic/gfx/small_chev_left_off.h @@ -29,14 +29,10 @@ namespace Titanic { class CSmallChevLeftOff : public CToggleSwitch { public: + CLASSDEF CSmallChevLeftOff(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSmallChevLeftOff"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/small_chev_left_on.h b/engines/titanic/gfx/small_chev_left_on.h index c98108bec1..8ab9417468 100644 --- a/engines/titanic/gfx/small_chev_left_on.h +++ b/engines/titanic/gfx/small_chev_left_on.h @@ -29,14 +29,10 @@ namespace Titanic { class CSmallChevLeftOn : public CToggleSwitch { public: + CLASSDEF CSmallChevLeftOn(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSmallChevLeftOn"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/small_chev_right_off.h b/engines/titanic/gfx/small_chev_right_off.h index 5a6f3cc3ce..fae9c3c674 100644 --- a/engines/titanic/gfx/small_chev_right_off.h +++ b/engines/titanic/gfx/small_chev_right_off.h @@ -29,14 +29,10 @@ namespace Titanic { class CSmallChevRightOff : public CToggleSwitch { public: + CLASSDEF CSmallChevRightOff(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSmallChevRightOff"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/small_chev_right_on.h b/engines/titanic/gfx/small_chev_right_on.h index f0100109f2..c5cb4d792d 100644 --- a/engines/titanic/gfx/small_chev_right_on.h +++ b/engines/titanic/gfx/small_chev_right_on.h @@ -29,14 +29,10 @@ namespace Titanic { class CSmallChevRightOn : public CToggleSwitch { public: + CLASSDEF CSmallChevRightOn(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSmallChevRightOn"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/st_button.h b/engines/titanic/gfx/st_button.h index 39b3765848..e63d1c831c 100644 --- a/engines/titanic/gfx/st_button.h +++ b/engines/titanic/gfx/st_button.h @@ -37,14 +37,10 @@ private: CString _string5; int _field110; public: + CLASSDEF CSTButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSTButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/status_change_button.h b/engines/titanic/gfx/status_change_button.h index b3b41254b3..be0d9985b2 100644 --- a/engines/titanic/gfx/status_change_button.h +++ b/engines/titanic/gfx/status_change_button.h @@ -29,14 +29,10 @@ namespace Titanic { class CStatusChangeButton : public CSTButton { public: + CLASSDEF CStatusChangeButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CStatusChangeButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/text_down.h b/engines/titanic/gfx/text_down.h index 8fc16d8aee..6fc55bb647 100644 --- a/engines/titanic/gfx/text_down.h +++ b/engines/titanic/gfx/text_down.h @@ -29,10 +29,7 @@ namespace Titanic { class CTextDown : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTextDown"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/text_skrew.h b/engines/titanic/gfx/text_skrew.h index 88a6a9ab81..6d7e714963 100644 --- a/engines/titanic/gfx/text_skrew.h +++ b/engines/titanic/gfx/text_skrew.h @@ -29,10 +29,7 @@ namespace Titanic { class CTextSkrew : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTextSkrew"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/text_up.h b/engines/titanic/gfx/text_up.h index cce4c6c6b4..328aeee0ee 100644 --- a/engines/titanic/gfx/text_up.h +++ b/engines/titanic/gfx/text_up.h @@ -29,10 +29,7 @@ namespace Titanic { class CTextUp : public CPetGraphic { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTextUp"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/gfx/toggle_button.h b/engines/titanic/gfx/toggle_button.h index b5113d7f95..a98a94df9e 100644 --- a/engines/titanic/gfx/toggle_button.h +++ b/engines/titanic/gfx/toggle_button.h @@ -31,14 +31,10 @@ class CToggleButton : public CBackground { private: int _fieldE0; public: + CLASSDEF CToggleButton() : CBackground(), _fieldE0(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CToggleButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/toggle_switch.h b/engines/titanic/gfx/toggle_switch.h index 977661df53..9b4fc4219b 100644 --- a/engines/titanic/gfx/toggle_switch.h +++ b/engines/titanic/gfx/toggle_switch.h @@ -32,14 +32,10 @@ private: int _fieldBC; Common::Point _pos1; public: + CLASSDEF CToggleSwitch(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CToggleSwitch"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/gfx/volume_control.h b/engines/titanic/gfx/volume_control.h index 5ff5c732b1..7778bb8c52 100644 --- a/engines/titanic/gfx/volume_control.h +++ b/engines/titanic/gfx/volume_control.h @@ -33,14 +33,10 @@ private: CString _string1; int _fieldCC; public: + CLASSDEF CVolumeControl(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CVolumeControl"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; |