diff options
Diffstat (limited to 'engines/titanic/game')
197 files changed, 198 insertions, 909 deletions
diff --git a/engines/titanic/game/announce.h b/engines/titanic/game/announce.h index baa5f1a55a..18702c3baf 100644 --- a/engines/titanic/game/announce.h +++ b/engines/titanic/game/announce.h @@ -34,14 +34,10 @@ private: int _fieldC4; int _fieldC8; public: + CLASSDEF CAnnounce(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CAnnounce"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/annoy_barbot.h b/engines/titanic/game/annoy_barbot.h index c1598e100d..c15b41dc85 100644 --- a/engines/titanic/game/annoy_barbot.h +++ b/engines/titanic/game/annoy_barbot.h @@ -31,10 +31,7 @@ class CAnnoyBarbot : public CGameObject { private: static int _v1; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CAnnoyBarbot"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/arb_background.h b/engines/titanic/game/arb_background.h index e443c4b41c..50a9075750 100644 --- a/engines/titanic/game/arb_background.h +++ b/engines/titanic/game/arb_background.h @@ -34,14 +34,10 @@ public: int _fieldE8; int _fieldEC; public: + CLASSDEF CArbBackground(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CArbBackground"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/arboretum_gate.h b/engines/titanic/game/arboretum_gate.h index 8cbe49be14..eb82333f8f 100644 --- a/engines/titanic/game/arboretum_gate.h +++ b/engines/titanic/game/arboretum_gate.h @@ -64,14 +64,10 @@ public: int _field150; CString _string2; public: + CLASSDEF CArboretumGate(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CArboretumGate"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/auto_animate.h b/engines/titanic/game/auto_animate.h index 2afb85b9d5..0fd4ad768f 100644 --- a/engines/titanic/game/auto_animate.h +++ b/engines/titanic/game/auto_animate.h @@ -33,11 +33,8 @@ public: int _fieldE4; int _fieldE8; public: + CLASSDEF CAutoAnimate() : CBackground(), _fieldE0(1), _fieldE4(1), _fieldE8(0) {} - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CAutoAnimate"; } /** * Save the data for the class to file diff --git a/engines/titanic/game/bar_bell.h b/engines/titanic/game/bar_bell.h index 87c244d9bf..279379feaf 100644 --- a/engines/titanic/game/bar_bell.h +++ b/engines/titanic/game/bar_bell.h @@ -35,14 +35,10 @@ public: int _fieldC8; int _fieldCC; public: + CLASSDEF CBarBell(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBarBell"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/bar_menu.h b/engines/titanic/game/bar_menu.h index 69ba0aa3e3..ac253fc747 100644 --- a/engines/titanic/game/bar_menu.h +++ b/engines/titanic/game/bar_menu.h @@ -33,14 +33,10 @@ public: int _fieldC0; int _fieldC4; public: + CLASSDEF CBarMenu(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBarMenu"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/bar_menu_button.h b/engines/titanic/game/bar_menu_button.h index 56b618dd1e..1a9d42c5d2 100644 --- a/engines/titanic/game/bar_menu_button.h +++ b/engines/titanic/game/bar_menu_button.h @@ -31,14 +31,10 @@ class CBarMenuButton : public CGameObject { public: int _value; public: + CLASSDEF CBarMenuButton() : CGameObject(), _value(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBarMenuButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/belbot_get_light.h b/engines/titanic/game/belbot_get_light.h index 2c2d547dcc..05c14f5b45 100644 --- a/engines/titanic/game/belbot_get_light.h +++ b/engines/titanic/game/belbot_get_light.h @@ -31,10 +31,7 @@ class CBelbotGetLight : public CGameObject { private: CString _value; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBelbotGetLight"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/bilge_succubus.h b/engines/titanic/game/bilge_succubus.h index 795fe865c2..4ff72a57c7 100644 --- a/engines/titanic/game/bilge_succubus.h +++ b/engines/titanic/game/bilge_succubus.h @@ -34,14 +34,10 @@ public: int _field1E4; int _field1E8; public: + CLASSDEF CBilgeSuccUBus(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBilgeSuccUBus"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/bomb.h b/engines/titanic/game/bomb.h index a7294f422a..2e7ba4658e 100644 --- a/engines/titanic/game/bomb.h +++ b/engines/titanic/game/bomb.h @@ -40,14 +40,10 @@ public: int _field100; int _field104; public: + CLASSDEF CBomb(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBomb"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/bottom_of_well_monitor.h b/engines/titanic/game/bottom_of_well_monitor.h index f1a9f5d710..e063579056 100644 --- a/engines/titanic/game/bottom_of_well_monitor.h +++ b/engines/titanic/game/bottom_of_well_monitor.h @@ -32,14 +32,10 @@ public: static int _v1, _v2; int _value; public: + CLASSDEF CBottomOfWellMonitor() : _value(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBottomOfWellMonitor"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/bowl_unlocker.h b/engines/titanic/game/bowl_unlocker.h index 455b0a7fd8..7b886c406a 100644 --- a/engines/titanic/game/bowl_unlocker.h +++ b/engines/titanic/game/bowl_unlocker.h @@ -31,14 +31,10 @@ class CBowlUnlocker : public CGameObject { public: int _value; public: + CLASSDEF CBowlUnlocker() : CGameObject(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBowlUnlocker"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/brain_slot.h b/engines/titanic/game/brain_slot.h index fa197a85d7..ae797ebb2f 100644 --- a/engines/titanic/game/brain_slot.h +++ b/engines/titanic/game/brain_slot.h @@ -34,14 +34,10 @@ public: int _value1; CString _value2; public: + CLASSDEF CBrainSlot() : CGameObject(), _value1(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBrainSlot"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/bridge_door.h b/engines/titanic/game/bridge_door.h index 96703c1c6f..828562dfa3 100644 --- a/engines/titanic/game/bridge_door.h +++ b/engines/titanic/game/bridge_door.h @@ -29,10 +29,7 @@ namespace Titanic { class CBridgeDoor : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBridgeDoor"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/bridge_view.h b/engines/titanic/game/bridge_view.h index 7a765cf21a..35de076573 100644 --- a/engines/titanic/game/bridge_view.h +++ b/engines/titanic/game/bridge_view.h @@ -31,14 +31,10 @@ class CBridgeView : public CBackground { public: int _fieldE0; public: + CLASSDEF CBridgeView() : CBackground(), _fieldE0(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBridgeView"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/broken_pell_base.h b/engines/titanic/game/broken_pell_base.h index 8e77501aa5..46e7a70581 100644 --- a/engines/titanic/game/broken_pell_base.h +++ b/engines/titanic/game/broken_pell_base.h @@ -34,14 +34,10 @@ private: int _fieldE0; public: + CLASSDEF CBrokenPellBase() : CBackground(), _fieldE0(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBrokenPellBase"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/broken_pellerator.h b/engines/titanic/game/broken_pellerator.h index 71bae32e17..974d5d21b4 100644 --- a/engines/titanic/game/broken_pellerator.h +++ b/engines/titanic/game/broken_pellerator.h @@ -34,10 +34,7 @@ private: CString _string4; CString _string5; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBrokenPellerator"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/broken_pellerator_froz.h b/engines/titanic/game/broken_pellerator_froz.h index 1fded7c09f..c3674f0af7 100644 --- a/engines/titanic/game/broken_pellerator_froz.h +++ b/engines/titanic/game/broken_pellerator_froz.h @@ -34,10 +34,7 @@ private: CString _string4; CString _string5; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBrokenPelleratorFroz"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/cage.h b/engines/titanic/game/cage.h index 4c097f3b93..08fc8c8c43 100644 --- a/engines/titanic/game/cage.h +++ b/engines/titanic/game/cage.h @@ -32,10 +32,7 @@ public: static int _v1; static int _v2; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCage"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/call_pellerator.h b/engines/titanic/game/call_pellerator.h index a6e8ded2a2..dc9afe0a1a 100644 --- a/engines/titanic/game/call_pellerator.h +++ b/engines/titanic/game/call_pellerator.h @@ -29,10 +29,7 @@ namespace Titanic { class CCallPellerator : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCallPellerator"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/captains_wheel.h b/engines/titanic/game/captains_wheel.h index 3d35b9b041..bcfc5136e7 100644 --- a/engines/titanic/game/captains_wheel.h +++ b/engines/titanic/game/captains_wheel.h @@ -36,14 +36,10 @@ public: int _fieldF0; int _fieldF4; public: + CLASSDEF CCaptainsWheel(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCaptainsWheel"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/cdrom.h b/engines/titanic/game/cdrom.h index cd05c79d0a..f810056e4f 100644 --- a/engines/titanic/game/cdrom.h +++ b/engines/titanic/game/cdrom.h @@ -31,14 +31,10 @@ class CCDROM : public CGameObject { private: Common::Point _pos1; public: + CLASSDEF CCDROM(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCDROM"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/cdrom_computer.h b/engines/titanic/game/cdrom_computer.h index 368c45f266..de070b007b 100644 --- a/engines/titanic/game/cdrom_computer.h +++ b/engines/titanic/game/cdrom_computer.h @@ -34,14 +34,10 @@ private: int _fieldC4; int _fieldC8; public: + CLASSDEF CCDROMComputer(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCDROMComputer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/cdrom_tray.h b/engines/titanic/game/cdrom_tray.h index 371187e946..85d26c5a1d 100644 --- a/engines/titanic/game/cdrom_tray.h +++ b/engines/titanic/game/cdrom_tray.h @@ -32,14 +32,10 @@ private: int _fieldBC; CString _string1; public: + CLASSDEF CCDROMTray(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCDROMTray"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/cell_point_button.h b/engines/titanic/game/cell_point_button.h index a16e7ae705..02710f6ce5 100644 --- a/engines/titanic/game/cell_point_button.h +++ b/engines/titanic/game/cell_point_button.h @@ -43,14 +43,10 @@ public: CString _string3; int _field118; public: + CLASSDEF CCellPointButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCellPointButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/chev_code.h b/engines/titanic/game/chev_code.h index 6bd624258e..3d5347bd05 100644 --- a/engines/titanic/game/chev_code.h +++ b/engines/titanic/game/chev_code.h @@ -31,14 +31,10 @@ class CChevCode : public CGameObject { public: int _value; public: + CLASSDEF CChevCode() : CGameObject(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CChevCode"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/chev_panel.h b/engines/titanic/game/chev_panel.h index 39ad43628d..9ddca37dc3 100644 --- a/engines/titanic/game/chev_panel.h +++ b/engines/titanic/game/chev_panel.h @@ -33,14 +33,10 @@ public: int _fieldC0; int _fieldC4; public: + CLASSDEF CChevPanel() : _fieldBC(0), _fieldC0(0), _fieldC4(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CChevPanel"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/chicken_cooler.h b/engines/titanic/game/chicken_cooler.h index 42e8a2724e..9e150572f4 100644 --- a/engines/titanic/game/chicken_cooler.h +++ b/engines/titanic/game/chicken_cooler.h @@ -32,14 +32,10 @@ public: int _fieldBC; int _fieldC0; public: + CLASSDEF CChickenCooler() : CGameObject(), _fieldBC(0), _fieldC0(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CChickenCooler"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/chicken_dispensor.h b/engines/titanic/game/chicken_dispensor.h index 10fcba1d17..97e5f864f6 100644 --- a/engines/titanic/game/chicken_dispensor.h +++ b/engines/titanic/game/chicken_dispensor.h @@ -33,14 +33,10 @@ public: int _fieldE4; int _fieldE8; public: + CLASSDEF CChickenDispensor(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNoNutBowl"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/close_broken_pel.h b/engines/titanic/game/close_broken_pel.h index ea174a4f1c..ecf38d904c 100644 --- a/engines/titanic/game/close_broken_pel.h +++ b/engines/titanic/game/close_broken_pel.h @@ -31,10 +31,7 @@ class CCloseBrokenPel : public CBackground { public: CString _string3; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCloseBrokenPel"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/code_wheel.h b/engines/titanic/game/code_wheel.h index 70879826e9..6080e92041 100644 --- a/engines/titanic/game/code_wheel.h +++ b/engines/titanic/game/code_wheel.h @@ -33,14 +33,10 @@ private: int _field10C; int _field110; public: + CLASSDEF CodeWheel(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CodeWheel"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/computer.h b/engines/titanic/game/computer.h index 074d17c0fa..793fecc491 100644 --- a/engines/titanic/game/computer.h +++ b/engines/titanic/game/computer.h @@ -32,14 +32,10 @@ public: CString _string3; int _fieldEC; public: + CLASSDEF CComputer() : CBackground(), _string3("None"), _fieldEC(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CComputer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/computer_screen.h b/engines/titanic/game/computer_screen.h index adb8b99093..aa47482207 100644 --- a/engines/titanic/game/computer_screen.h +++ b/engines/titanic/game/computer_screen.h @@ -29,14 +29,10 @@ namespace Titanic { class CComputerScreen : public CGameObject { public: + CLASSDEF CComputerScreen(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CComputerScreen"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/cookie.h b/engines/titanic/game/cookie.h index a1a72c96c8..bd9d1fff04 100644 --- a/engines/titanic/game/cookie.h +++ b/engines/titanic/game/cookie.h @@ -32,14 +32,10 @@ public: int _value1; int _value2; public: + CLASSDEF CCookie() : CGameObject(), _value1(0), _value2(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCookie"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/credits.h b/engines/titanic/game/credits.h index 0e35a58174..dc229127c8 100644 --- a/engines/titanic/game/credits.h +++ b/engines/titanic/game/credits.h @@ -31,14 +31,10 @@ class CCredits : public CGameObject { public: int _fieldBC, _fieldC0; public: + CLASSDEF CCredits(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCredits"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/credits_button.h b/engines/titanic/game/credits_button.h index b22ce79a3b..fd7a8ad0c2 100644 --- a/engines/titanic/game/credits_button.h +++ b/engines/titanic/game/credits_button.h @@ -31,14 +31,10 @@ class CCreditsButton : public CBackground { public: int _fieldE0; public: + CLASSDEF CCreditsButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CCreditsButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/dead_area.h b/engines/titanic/game/dead_area.h index 374e45e9d3..4abcd58dd9 100644 --- a/engines/titanic/game/dead_area.h +++ b/engines/titanic/game/dead_area.h @@ -29,14 +29,10 @@ namespace Titanic { class CDeadArea : public CGameObject { public: + CLASSDEF CDeadArea(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CDeadArea"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/desk_click_responder.h b/engines/titanic/game/desk_click_responder.h index 94afece266..a11d7ae328 100644 --- a/engines/titanic/game/desk_click_responder.h +++ b/engines/titanic/game/desk_click_responder.h @@ -32,10 +32,7 @@ protected: int _fieldD4; int _fieldD8; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CDeskClickResponder"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/doorbot_elevator_handler.h b/engines/titanic/game/doorbot_elevator_handler.h index 41d6068f1b..e46929dfed 100644 --- a/engines/titanic/game/doorbot_elevator_handler.h +++ b/engines/titanic/game/doorbot_elevator_handler.h @@ -32,10 +32,7 @@ private: static int _v1; int _value; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CDoorbotElevatorHandler"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/doorbot_home_handler.h b/engines/titanic/game/doorbot_home_handler.h index 1557dbf91d..1e5d128a7d 100644 --- a/engines/titanic/game/doorbot_home_handler.h +++ b/engines/titanic/game/doorbot_home_handler.h @@ -29,14 +29,10 @@ namespace Titanic { class CDoorbotHomeHandler : public CGameObject { public: + CLASSDEF CDoorbotHomeHandler(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CDoorbotHomeHandler"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/ear_sweet_bowl.h b/engines/titanic/game/ear_sweet_bowl.h index 3e27516a60..aa276f82a7 100644 --- a/engines/titanic/game/ear_sweet_bowl.h +++ b/engines/titanic/game/ear_sweet_bowl.h @@ -29,10 +29,7 @@ namespace Titanic { class CEarSweetBowl : public CSweetBowl { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEarSweetBowl"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/eject_phonograph_button.h b/engines/titanic/game/eject_phonograph_button.h index e37a061bd4..d3e8a50618 100644 --- a/engines/titanic/game/eject_phonograph_button.h +++ b/engines/titanic/game/eject_phonograph_button.h @@ -34,14 +34,10 @@ public: CString _string3; CString _string4; public: + CLASSDEF CEjectPhonographButton() : CBackground(), _fieldE0(0), _fieldE4(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEjectPhonographButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/elevator_action_area.h b/engines/titanic/game/elevator_action_area.h index 07c4f13990..570ee808ed 100644 --- a/engines/titanic/game/elevator_action_area.h +++ b/engines/titanic/game/elevator_action_area.h @@ -31,14 +31,10 @@ class CElevatorActionArea : public CGameObject { public: int _value; public: + CLASSDEF CElevatorActionArea() : CGameObject(), _value(4) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CElevatorActionArea"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/emma_control.h b/engines/titanic/game/emma_control.h index 590c6f7fcf..ea30c52279 100644 --- a/engines/titanic/game/emma_control.h +++ b/engines/titanic/game/emma_control.h @@ -33,14 +33,10 @@ private: CString _wavFile1, _wavFile2; public: + CLASSDEF CEmmaControl() : CBackground(), _wavFile1("b#39.wav"), _wavFile2("b#38.wav") {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEmmaControl"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/empty_nut_bowl.h b/engines/titanic/game/empty_nut_bowl.h index 57668ca49d..9645284e1b 100644 --- a/engines/titanic/game/empty_nut_bowl.h +++ b/engines/titanic/game/empty_nut_bowl.h @@ -31,14 +31,10 @@ class CEmptyNutBowl : public CGameObject { public: int _value; public: + CLASSDEF CEmptyNutBowl() : CGameObject(), _value(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEmptyNutBowl"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/end_credit_text.h b/engines/titanic/game/end_credit_text.h index de0e54d7e0..0003a8b4e3 100644 --- a/engines/titanic/game/end_credit_text.h +++ b/engines/titanic/game/end_credit_text.h @@ -31,14 +31,10 @@ class CEndCreditText : public CGameObject { private: int _value; public: + CLASSDEF CEndCreditText() : CGameObject(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEndCreditText"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/end_credits.h b/engines/titanic/game/end_credits.h index cf5c45ae45..a259a215a4 100644 --- a/engines/titanic/game/end_credits.h +++ b/engines/titanic/game/end_credits.h @@ -31,14 +31,10 @@ class CEndCredits : public CGameObject { public: int _value; public: + CLASSDEF CEndCredits() : CGameObject(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEndCredits"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/end_explode_ship.h b/engines/titanic/game/end_explode_ship.h index df2e0b1b8c..a6b053fe55 100644 --- a/engines/titanic/game/end_explode_ship.h +++ b/engines/titanic/game/end_explode_ship.h @@ -31,14 +31,10 @@ class CEndExplodeShip : public CGameObject { public: int _value1, _value2; public: + CLASSDEF CEndExplodeShip() : CGameObject(), _value1(0), _value2(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEndExplodeShip"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/end_game_credits.h b/engines/titanic/game/end_game_credits.h index f8ec6b00a7..68e86c6220 100644 --- a/engines/titanic/game/end_game_credits.h +++ b/engines/titanic/game/end_game_credits.h @@ -32,14 +32,10 @@ private: int _fieldBC; Common::Point _pos1; public: + CLASSDEF CEndGameCredits(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEndGameCredits"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/end_sequence_control.h b/engines/titanic/game/end_sequence_control.h index dc849295ec..5e2ba30611 100644 --- a/engines/titanic/game/end_sequence_control.h +++ b/engines/titanic/game/end_sequence_control.h @@ -29,10 +29,7 @@ namespace Titanic { class CEndSequenceControl : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEndSequenceControl"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/fan.h b/engines/titanic/game/fan.h index 75bdea5b6c..6f234074f5 100644 --- a/engines/titanic/game/fan.h +++ b/engines/titanic/game/fan.h @@ -31,14 +31,10 @@ class CFan : public CGameObject { public: int _value1, _value2; public: + CLASSDEF CFan() : CGameObject(), _value1(0), _value2(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CFan"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/fan_control.h b/engines/titanic/game/fan_control.h index dfb1ccc6a4..54ebbe27f3 100644 --- a/engines/titanic/game/fan_control.h +++ b/engines/titanic/game/fan_control.h @@ -35,14 +35,10 @@ public: int _fieldC8; int _fieldCC; public: + CLASSDEF CFanControl(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CFanControl"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/fan_decrease.h b/engines/titanic/game/fan_decrease.h index 9831873829..bac102823d 100644 --- a/engines/titanic/game/fan_decrease.h +++ b/engines/titanic/game/fan_decrease.h @@ -29,10 +29,7 @@ namespace Titanic { class CFanDecrease : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CFanDecrease"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/fan_increase.h b/engines/titanic/game/fan_increase.h index 1b9a0fd191..62561f1c54 100644 --- a/engines/titanic/game/fan_increase.h +++ b/engines/titanic/game/fan_increase.h @@ -29,10 +29,7 @@ namespace Titanic { class CFanIncrease : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CFanIncrease"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/fan_noises.h b/engines/titanic/game/fan_noises.h index 5e817a3a5b..ba35edcf76 100644 --- a/engines/titanic/game/fan_noises.h +++ b/engines/titanic/game/fan_noises.h @@ -37,14 +37,10 @@ public: int _fieldD0; int _fieldD4; public: + CLASSDEF CFanNoises(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CFanNoises"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/floor_indicator.h b/engines/titanic/game/floor_indicator.h index 86a7125aa2..a3511fb622 100644 --- a/engines/titanic/game/floor_indicator.h +++ b/engines/titanic/game/floor_indicator.h @@ -29,10 +29,7 @@ namespace Titanic { class CFloorIndicator : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CFloorIndicator"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/games_console.h b/engines/titanic/game/games_console.h index 4caeda8715..67634d8d41 100644 --- a/engines/titanic/game/games_console.h +++ b/engines/titanic/game/games_console.h @@ -31,14 +31,10 @@ class CGamesConsole : public CBackground { public: int _fieldE0; public: + CLASSDEF CGamesConsole() : CBackground(), _fieldE0(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGamesConsole"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/get_lift_eye2.h b/engines/titanic/game/get_lift_eye2.h index e8149cacae..6782a56f11 100644 --- a/engines/titanic/game/get_lift_eye2.h +++ b/engines/titanic/game/get_lift_eye2.h @@ -31,15 +31,11 @@ class CGetLiftEye2 : public CGameObject { private: static CString *_v1; public: + CLASSDEF static void init(); static void deinit(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGetLiftEye2"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/glass_smasher.h b/engines/titanic/game/glass_smasher.h index c2b7ee6c5b..9c25065ecf 100644 --- a/engines/titanic/game/glass_smasher.h +++ b/engines/titanic/game/glass_smasher.h @@ -29,10 +29,7 @@ namespace Titanic { class CGlassSmasher : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGlassSmasher"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/gondolier/gondolier_base.h b/engines/titanic/game/gondolier/gondolier_base.h index 3f0cede70d..c45e3e2283 100644 --- a/engines/titanic/game/gondolier/gondolier_base.h +++ b/engines/titanic/game/gondolier/gondolier_base.h @@ -40,10 +40,7 @@ private: static int _v9; static int _v10; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGondolierBase"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/gondolier/gondolier_chest.h b/engines/titanic/game/gondolier/gondolier_chest.h index 277faf994f..d2c13812f4 100644 --- a/engines/titanic/game/gondolier/gondolier_chest.h +++ b/engines/titanic/game/gondolier/gondolier_chest.h @@ -29,10 +29,7 @@ namespace Titanic { class CGondolierChest : public CGondolierBase { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGondolierChest"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/gondolier/gondolier_face.h b/engines/titanic/game/gondolier/gondolier_face.h index 5007431337..334cab143f 100644 --- a/engines/titanic/game/gondolier/gondolier_face.h +++ b/engines/titanic/game/gondolier/gondolier_face.h @@ -31,14 +31,10 @@ class CGondolierFace : public CGondolierBase { private: int _fieldBC; public: + CLASSDEF CGondolierFace() : CGondolierBase(), _fieldBC(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGondolierMixer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/gondolier/gondolier_mixer.h b/engines/titanic/game/gondolier/gondolier_mixer.h index 5b92bc2fb8..173bcd8ac2 100644 --- a/engines/titanic/game/gondolier/gondolier_mixer.h +++ b/engines/titanic/game/gondolier/gondolier_mixer.h @@ -37,14 +37,10 @@ private: CString _string2; int _fieldE4; public: + CLASSDEF CGondolierMixer(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGondolierMixer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/gondolier/gondolier_slider.h b/engines/titanic/game/gondolier/gondolier_slider.h index 9522483dc0..eef4a58089 100644 --- a/engines/titanic/game/gondolier/gondolier_slider.h +++ b/engines/titanic/game/gondolier/gondolier_slider.h @@ -48,14 +48,10 @@ private: CString _string3; int _field118; public: + CLASSDEF CGondolierSlider(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGondolierSlider"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/hammer_clip.h b/engines/titanic/game/hammer_clip.h index 70abae5d7e..d1891d8c09 100644 --- a/engines/titanic/game/hammer_clip.h +++ b/engines/titanic/game/hammer_clip.h @@ -31,14 +31,10 @@ class CHammerClip : public CGameObject { public: int _value; public: + CLASSDEF CHammerClip() : CGameObject(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHammerClip"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/hammer_dispensor.h b/engines/titanic/game/hammer_dispensor.h index 60b70546fd..b99045dcb5 100644 --- a/engines/titanic/game/hammer_dispensor.h +++ b/engines/titanic/game/hammer_dispensor.h @@ -33,14 +33,10 @@ private: int _fieldE4; int _fieldE8; public: + CLASSDEF CHammerDispensor(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHammerDispensor"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/hammer_dispensor_button.h b/engines/titanic/game/hammer_dispensor_button.h index 978c1d3c9f..3f28360a8f 100644 --- a/engines/titanic/game/hammer_dispensor_button.h +++ b/engines/titanic/game/hammer_dispensor_button.h @@ -37,14 +37,10 @@ private: int _field10C; int _field110; public: + CLASSDEF CHammerDispensorButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHammerDispensorButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/head_slot.h b/engines/titanic/game/head_slot.h index 210546a2d4..3ba94a6669 100644 --- a/engines/titanic/game/head_slot.h +++ b/engines/titanic/game/head_slot.h @@ -41,14 +41,10 @@ public: int _fieldE8; int _fieldEC; public: + CLASSDEF CHeadSlot(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHeadSlot"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/head_smash_event.h b/engines/titanic/game/head_smash_event.h index 4032098817..847e86eeba 100644 --- a/engines/titanic/game/head_smash_event.h +++ b/engines/titanic/game/head_smash_event.h @@ -29,10 +29,7 @@ namespace Titanic { class CHeadSmashEvent : public CBackground { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHeadSmashEvent"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/head_smash_lever.h b/engines/titanic/game/head_smash_lever.h index 7268cb8a4a..8a67f56c67 100644 --- a/engines/titanic/game/head_smash_lever.h +++ b/engines/titanic/game/head_smash_lever.h @@ -33,14 +33,10 @@ public: int _fieldE4; int _fieldE8; public: + CLASSDEF CHeadSmashLever(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHeadSmashLever"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/head_spinner.h b/engines/titanic/game/head_spinner.h index 8d3de61f07..3ed3e1f01a 100644 --- a/engines/titanic/game/head_spinner.h +++ b/engines/titanic/game/head_spinner.h @@ -32,11 +32,7 @@ public: int _value1, _value2; public: CHeadSpinner() : CGameObject(), _value1(0), _value2(0) {} - - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CHeadSpinner"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/idle_summoner.h b/engines/titanic/game/idle_summoner.h index 8f251b842b..a983684a15 100644 --- a/engines/titanic/game/idle_summoner.h +++ b/engines/titanic/game/idle_summoner.h @@ -40,11 +40,7 @@ public: int _fieldDC; public: CIdleSummoner(); - - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CIdleSummoner"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/leave_sec_class_state.h b/engines/titanic/game/leave_sec_class_state.h index 3bcfe812df..34ba31b6c0 100644 --- a/engines/titanic/game/leave_sec_class_state.h +++ b/engines/titanic/game/leave_sec_class_state.h @@ -29,10 +29,7 @@ namespace Titanic { class CLeaveSecClassState : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CLeaveSecClassState"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/lemon_dispensor.h b/engines/titanic/game/lemon_dispensor.h index c2c76eac6a..091c6d7b27 100644 --- a/engines/titanic/game/lemon_dispensor.h +++ b/engines/titanic/game/lemon_dispensor.h @@ -38,14 +38,10 @@ private: int _fieldE8; int _fieldEC; public: + CLASSDEF CLemonDispensor(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CLemonDispensor"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/light.h b/engines/titanic/game/light.h index 482d1be65b..ea6073d038 100644 --- a/engines/titanic/game/light.h +++ b/engines/titanic/game/light.h @@ -38,14 +38,10 @@ private: int _fieldF8; int _fieldFC; public: + CLASSDEF CLight(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CLight"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/light_switch.h b/engines/titanic/game/light_switch.h index 0228b1009b..334cba75a6 100644 --- a/engines/titanic/game/light_switch.h +++ b/engines/titanic/game/light_switch.h @@ -35,14 +35,10 @@ private: int _fieldE4; int _fieldE8; public: + CLASSDEF CLightSwitch(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CLightSwitch"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/little_lift_button.h b/engines/titanic/game/little_lift_button.h index 475b8435d5..92f084aba1 100644 --- a/engines/titanic/game/little_lift_button.h +++ b/engines/titanic/game/little_lift_button.h @@ -31,14 +31,10 @@ class CLittleLiftButton : public CBackground { private: int _value; public: + CLASSDEF CLittleLiftButton() : CBackground(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CLittleLiftButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/long_stick_dispenser.h b/engines/titanic/game/long_stick_dispenser.h index 4912ea384b..30e3541087 100644 --- a/engines/titanic/game/long_stick_dispenser.h +++ b/engines/titanic/game/long_stick_dispenser.h @@ -33,15 +33,11 @@ public: int _fieldC0; int _fieldC4; public: + CLASSDEF CLongStickDispenser() : CGameObject(), _fieldBC(0), _fieldC0(0), _fieldC4(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CLongStickDispenser"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/mail_man.h b/engines/titanic/game/mail_man.h index 29ca165935..a75d75a865 100644 --- a/engines/titanic/game/mail_man.h +++ b/engines/titanic/game/mail_man.h @@ -31,14 +31,10 @@ class CMailMan : public CGameObject { public: int _value; public: + CLASSDEF CMailMan() : CGameObject(), _value(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMailMan"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/maitred/maitred_arm_holder.h b/engines/titanic/game/maitred/maitred_arm_holder.h index b838109fa3..e329157837 100644 --- a/engines/titanic/game/maitred/maitred_arm_holder.h +++ b/engines/titanic/game/maitred/maitred_arm_holder.h @@ -29,10 +29,7 @@ namespace Titanic { class CMaitreDArmHolder : public CDropTarget { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMaitreDArmHolder"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/maitred/maitred_body.h b/engines/titanic/game/maitred/maitred_body.h index 29e528b1f6..9dcc2af4ea 100644 --- a/engines/titanic/game/maitred/maitred_body.h +++ b/engines/titanic/game/maitred/maitred_body.h @@ -31,14 +31,10 @@ class CMaitreDBody : public CMaitreDProdReceptor { private: int _fieldC8; public: + CLASSDEF CMaitreDBody() : CMaitreDProdReceptor(), _fieldC8(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMaitreDBody"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/maitred/maitred_legs.h b/engines/titanic/game/maitred/maitred_legs.h index e3ac93c870..0dc1b34143 100644 --- a/engines/titanic/game/maitred/maitred_legs.h +++ b/engines/titanic/game/maitred/maitred_legs.h @@ -31,14 +31,10 @@ class CMaitreDLegs : public CMaitreDProdReceptor { private: int _fieldC8; public: + CLASSDEF CMaitreDLegs() : CMaitreDProdReceptor(), _fieldC8(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMaitreDLegs"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/maitred/maitred_prod_receptor.h b/engines/titanic/game/maitred/maitred_prod_receptor.h index 130bc547b2..b82c95b9b5 100644 --- a/engines/titanic/game/maitred/maitred_prod_receptor.h +++ b/engines/titanic/game/maitred/maitred_prod_receptor.h @@ -33,15 +33,11 @@ protected: int _fieldC0; int _fieldC4; public: + CLASSDEF CMaitreDProdReceptor() : CGameObject(), _fieldBC(0), _fieldC0(0), _fieldC4(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMaitreDProdReceptor"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/missiveomat.h b/engines/titanic/game/missiveomat.h index 77ba4cb574..a58c928497 100644 --- a/engines/titanic/game/missiveomat.h +++ b/engines/titanic/game/missiveomat.h @@ -36,14 +36,10 @@ public: CString _string2; int _fieldE0; public: + CLASSDEF CMissiveOMat(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMissiveOMat"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/missiveomat_button.h b/engines/titanic/game/missiveomat_button.h index f383e88798..603d2f5955 100644 --- a/engines/titanic/game/missiveomat_button.h +++ b/engines/titanic/game/missiveomat_button.h @@ -31,14 +31,10 @@ class CMissiveOMatButton : public CEditControl { public: int _fieldFC; public: + CLASSDEF CMissiveOMatButton() : CEditControl(), _fieldFC(2) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMissiveOMatButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/movie_tester.h b/engines/titanic/game/movie_tester.h index b5e4032be9..2fffd5d2c0 100644 --- a/engines/titanic/game/movie_tester.h +++ b/engines/titanic/game/movie_tester.h @@ -31,14 +31,10 @@ class CMovieTester : public CGameObject { public: int _value1, _value2; public: + CLASSDEF CMovieTester() : CGameObject(), _value1(0), _value2(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMovieTester"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/music_console_button.h b/engines/titanic/game/music_console_button.h index 84a7452b28..f6c33a91c5 100644 --- a/engines/titanic/game/music_console_button.h +++ b/engines/titanic/game/music_console_button.h @@ -29,10 +29,7 @@ namespace Titanic { class CMusicConsoleButton : public CMusicPlayer { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicConsoleButton"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/music_room_phonograph.h b/engines/titanic/game/music_room_phonograph.h index 2d34b160c9..6660503616 100644 --- a/engines/titanic/game/music_room_phonograph.h +++ b/engines/titanic/game/music_room_phonograph.h @@ -31,14 +31,10 @@ class CMusicRoomPhonograph : public CRestaurantPhonograph { private: int _field118; public: + CLASSDEF CMusicRoomPhonograph() : CRestaurantPhonograph(), _field118(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicRoomPhonograph"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/music_room_stop_phonograph_button.h b/engines/titanic/game/music_room_stop_phonograph_button.h index 4fd4aa6535..c37065fde4 100644 --- a/engines/titanic/game/music_room_stop_phonograph_button.h +++ b/engines/titanic/game/music_room_stop_phonograph_button.h @@ -31,14 +31,10 @@ class CMusicRoomStopPhonographButton : public CEjectPhonographButton { private: int _field100; public: + CLASSDEF CMusicRoomStopPhonographButton() : CEjectPhonographButton(), _field100(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicRoomStopPhonographButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/music_system_lock.h b/engines/titanic/game/music_system_lock.h index 98dc68b0dd..b5f4da55d6 100644 --- a/engines/titanic/game/music_system_lock.h +++ b/engines/titanic/game/music_system_lock.h @@ -31,14 +31,10 @@ class CMusicSystemLock : public CDropTarget { private: int _value; public: + CLASSDEF CMusicSystemLock() : CDropTarget(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicSystemLock"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/musical_instrument.h b/engines/titanic/game/musical_instrument.h index 8eafca5e3b..b4abe4fdb2 100644 --- a/engines/titanic/game/musical_instrument.h +++ b/engines/titanic/game/musical_instrument.h @@ -29,10 +29,7 @@ namespace Titanic { class CMusicalInstrument : public CBackground { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMusicalInstrument"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/nav_helmet.h b/engines/titanic/game/nav_helmet.h index 31eee9977a..ff39280e5b 100644 --- a/engines/titanic/game/nav_helmet.h +++ b/engines/titanic/game/nav_helmet.h @@ -31,14 +31,10 @@ class CNavHelmet : public CGameObject { private: int _value; public: + CLASSDEF CNavHelmet() : CGameObject(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNavHelmet"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/navigation_computer.h b/engines/titanic/game/navigation_computer.h index 49e382a14c..a7077f7dcd 100644 --- a/engines/titanic/game/navigation_computer.h +++ b/engines/titanic/game/navigation_computer.h @@ -29,10 +29,7 @@ namespace Titanic { class CNavigationComputer : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNavigationComputer"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/no_nut_bowl.h b/engines/titanic/game/no_nut_bowl.h index 40e8fd15f1..7557491b68 100644 --- a/engines/titanic/game/no_nut_bowl.h +++ b/engines/titanic/game/no_nut_bowl.h @@ -29,10 +29,7 @@ namespace Titanic { class CNoNutBowl : public CBackground { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNoNutBowl"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/nose_holder.h b/engines/titanic/game/nose_holder.h index 3512e62bb4..e26c70fa1d 100644 --- a/engines/titanic/game/nose_holder.h +++ b/engines/titanic/game/nose_holder.h @@ -32,14 +32,10 @@ private: int _field118; int _field11C; public: + CLASSDEF CNoseHolder(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNoseHolder"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/null_port_hole.h b/engines/titanic/game/null_port_hole.h index 2caff276d5..fb07462ea8 100644 --- a/engines/titanic/game/null_port_hole.h +++ b/engines/titanic/game/null_port_hole.h @@ -29,14 +29,10 @@ namespace Titanic { class CNullPortHole : public CClickResponder { public: + CLASSDEF CNullPortHole(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNullPortHole"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/nut_replacer.h b/engines/titanic/game/nut_replacer.h index ef800c71a6..0917b40bd2 100644 --- a/engines/titanic/game/nut_replacer.h +++ b/engines/titanic/game/nut_replacer.h @@ -29,10 +29,7 @@ namespace Titanic { class CNutReplacer : 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/game/parrot/parrot_lobby_controller.h b/engines/titanic/game/parrot/parrot_lobby_controller.h index 371e31eaa9..6515a23944 100644 --- a/engines/titanic/game/parrot/parrot_lobby_controller.h +++ b/engines/titanic/game/parrot/parrot_lobby_controller.h @@ -29,10 +29,7 @@ namespace Titanic { class CParrotLobbyController : public CParrotLobbyObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CParrotLobbyController"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/parrot/parrot_lobby_link_updater.h b/engines/titanic/game/parrot/parrot_lobby_link_updater.h index d0843fe9ec..2f3ce7bac4 100644 --- a/engines/titanic/game/parrot/parrot_lobby_link_updater.h +++ b/engines/titanic/game/parrot/parrot_lobby_link_updater.h @@ -31,14 +31,10 @@ class CParrotLobbyLinkUpdater : public CParrotLobbyObject { public: int _fieldBC; public: + CLASSDEF CParrotLobbyLinkUpdater() : CParrotLobbyObject(), _fieldBC(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CParrotLobbyLinkUpdater"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/parrot/parrot_lobby_object.h b/engines/titanic/game/parrot/parrot_lobby_object.h index 85f2c3bc77..9cc979cd26 100644 --- a/engines/titanic/game/parrot/parrot_lobby_object.h +++ b/engines/titanic/game/parrot/parrot_lobby_object.h @@ -36,10 +36,7 @@ public: static void init(); public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CParrotLobbyObject"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/parrot/parrot_lobby_view_object.h b/engines/titanic/game/parrot/parrot_lobby_view_object.h index 00f7bbc72d..1e3e398c2c 100644 --- a/engines/titanic/game/parrot/parrot_lobby_view_object.h +++ b/engines/titanic/game/parrot/parrot_lobby_view_object.h @@ -31,14 +31,10 @@ class CParrotLobbyViewObject : public CParrotLobbyObject { public: int _fieldBC; public: + CLASSDEF CParrotLobbyViewObject() : CParrotLobbyObject(), _fieldBC(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CParrotLobbyViewObject"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/parrot/parrot_loser.h b/engines/titanic/game/parrot/parrot_loser.h index dac253e189..806195db19 100644 --- a/engines/titanic/game/parrot/parrot_loser.h +++ b/engines/titanic/game/parrot/parrot_loser.h @@ -29,10 +29,7 @@ namespace Titanic { class CParrotLoser : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CParrotLoser"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/parrot/parrot_nut_bowl_actor.h b/engines/titanic/game/parrot/parrot_nut_bowl_actor.h index 623918c85b..d1ccca6a71 100644 --- a/engines/titanic/game/parrot/parrot_nut_bowl_actor.h +++ b/engines/titanic/game/parrot/parrot_nut_bowl_actor.h @@ -31,14 +31,10 @@ class CParrotNutBowlActor : public CGameObject { public: int _value1, _value2; public: + CLASSDEF CParrotNutBowlActor(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CParrotNutBowlActor"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/parrot/parrot_nut_eater.h b/engines/titanic/game/parrot/parrot_nut_eater.h index 55367af818..6a7afd94cf 100644 --- a/engines/titanic/game/parrot/parrot_nut_eater.h +++ b/engines/titanic/game/parrot/parrot_nut_eater.h @@ -35,14 +35,10 @@ public: int _fieldC8; int _fieldCC; public: + CLASSDEF CParrotNutEater(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CParrotNutEater"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/parrot/parrot_perch_holder.h b/engines/titanic/game/parrot/parrot_perch_holder.h index 489e124a91..f355263846 100644 --- a/engines/titanic/game/parrot/parrot_perch_holder.h +++ b/engines/titanic/game/parrot/parrot_perch_holder.h @@ -29,10 +29,7 @@ namespace Titanic { class CParrotPerchHolder : public CMultiDropTarget { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CParrotPerchHolder"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/parrot/parrot_succubus.h b/engines/titanic/game/parrot/parrot_succubus.h index aad8a7ffa5..e60d35cd6c 100644 --- a/engines/titanic/game/parrot/parrot_succubus.h +++ b/engines/titanic/game/parrot/parrot_succubus.h @@ -35,14 +35,10 @@ public: int _field1F0; int _field1F4; public: + CLASSDEF CParrotSuccUBus(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CParrotSuccUBus"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/parrot/parrot_trigger.h b/engines/titanic/game/parrot/parrot_trigger.h index cb0d59c320..33aea157ad 100644 --- a/engines/titanic/game/parrot/parrot_trigger.h +++ b/engines/titanic/game/parrot/parrot_trigger.h @@ -31,14 +31,10 @@ class CParrotTrigger : public CGameObject { public: int _value; public: + CLASSDEF CParrotTrigger() : CGameObject(), _value(0x446AB) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CParrotTrigger"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/parrot/player_meets_parrot.h b/engines/titanic/game/parrot/player_meets_parrot.h index 685e67a95d..d0c3b9d9f3 100644 --- a/engines/titanic/game/parrot/player_meets_parrot.h +++ b/engines/titanic/game/parrot/player_meets_parrot.h @@ -29,10 +29,7 @@ namespace Titanic { class CPlayerMeetsParrot : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPlayerMeetsParrot"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/pet/pet.h b/engines/titanic/game/pet/pet.h index 096c1de9bf..58e3577235 100644 --- a/engines/titanic/game/pet/pet.h +++ b/engines/titanic/game/pet/pet.h @@ -37,14 +37,10 @@ public: int _fieldD8; int _fieldDC; public: + CLASSDEF CPET(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPET"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/pet/pet_class1.h b/engines/titanic/game/pet/pet_class1.h index c390a8732e..12dfb322b2 100644 --- a/engines/titanic/game/pet/pet_class1.h +++ b/engines/titanic/game/pet/pet_class1.h @@ -29,10 +29,7 @@ namespace Titanic { class CPETClass1 : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPETClass1"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/pet/pet_class2.h b/engines/titanic/game/pet/pet_class2.h index cfa445e6e2..5b96118c7c 100644 --- a/engines/titanic/game/pet/pet_class2.h +++ b/engines/titanic/game/pet/pet_class2.h @@ -29,10 +29,7 @@ namespace Titanic { class CPETClass2 : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPETClass2"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/pet/pet_class3.h b/engines/titanic/game/pet/pet_class3.h index a41a4d53f6..d68cb098ec 100644 --- a/engines/titanic/game/pet/pet_class3.h +++ b/engines/titanic/game/pet/pet_class3.h @@ -29,10 +29,7 @@ namespace Titanic { class CPETClass3 : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPETClass3"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/pet/pet_lift.h b/engines/titanic/game/pet/pet_lift.h index 11207cde26..1c56b0515a 100644 --- a/engines/titanic/game/pet/pet_lift.h +++ b/engines/titanic/game/pet/pet_lift.h @@ -29,10 +29,7 @@ namespace Titanic { class CPETLift : public CPETTransport { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPETLift"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/pet/pet_monitor.h b/engines/titanic/game/pet/pet_monitor.h index 544bbdea0e..ff2209802d 100644 --- a/engines/titanic/game/pet/pet_monitor.h +++ b/engines/titanic/game/pet/pet_monitor.h @@ -29,10 +29,7 @@ namespace Titanic { class CPETMonitor : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPETMonitor"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/pet/pet_pellerator.h b/engines/titanic/game/pet/pet_pellerator.h index 7314f7297a..1036c93c66 100644 --- a/engines/titanic/game/pet/pet_pellerator.h +++ b/engines/titanic/game/pet/pet_pellerator.h @@ -29,10 +29,7 @@ namespace Titanic { class CPETPellerator : public CPETTransport { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPETPellerator"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/pet/pet_position.h b/engines/titanic/game/pet/pet_position.h index 6454b1e489..407a42f0ae 100644 --- a/engines/titanic/game/pet/pet_position.h +++ b/engines/titanic/game/pet/pet_position.h @@ -29,10 +29,7 @@ namespace Titanic { class CPETPosition : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPETPosition"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/pet/pet_sentinal.h b/engines/titanic/game/pet/pet_sentinal.h index 98f05dfee6..728ddbfe57 100644 --- a/engines/titanic/game/pet/pet_sentinal.h +++ b/engines/titanic/game/pet/pet_sentinal.h @@ -29,10 +29,7 @@ namespace Titanic { class CPETSentinal : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPETSentinal"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/pet/pet_sounds.h b/engines/titanic/game/pet/pet_sounds.h index cae45ac89d..f099d9efb5 100644 --- a/engines/titanic/game/pet/pet_sounds.h +++ b/engines/titanic/game/pet/pet_sounds.h @@ -31,14 +31,10 @@ class CPETSounds : public CGameObject { public: int _value; public: + CLASSDEF CPETSounds() : CGameObject(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPETSounds"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/pet/pet_transition.h b/engines/titanic/game/pet/pet_transition.h index 3ccb45fb04..c8dc153d53 100644 --- a/engines/titanic/game/pet/pet_transition.h +++ b/engines/titanic/game/pet/pet_transition.h @@ -29,10 +29,7 @@ namespace Titanic { class CPETTransition : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPETTransition"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/pet/pet_transport.h b/engines/titanic/game/pet/pet_transport.h index af821ef334..1aa6df8ced 100644 --- a/engines/titanic/game/pet/pet_transport.h +++ b/engines/titanic/game/pet/pet_transport.h @@ -29,10 +29,7 @@ namespace Titanic { class CPETTransport : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPETTransport"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/pet_disabler.h b/engines/titanic/game/pet_disabler.h index 3e8c799bad..5db5d7b533 100644 --- a/engines/titanic/game/pet_disabler.h +++ b/engines/titanic/game/pet_disabler.h @@ -31,14 +31,10 @@ class CPetDisabler : public CGameObject { public: CString _value; public: + CLASSDEF CPetDisabler() : CGameObject() {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPetDisabler"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/phonograph.h b/engines/titanic/game/phonograph.h index e7fcddf0ae..14712e5c1b 100644 --- a/engines/titanic/game/phonograph.h +++ b/engines/titanic/game/phonograph.h @@ -37,14 +37,10 @@ protected: int _fieldF0; int _fieldF4; public: + CLASSDEF CPhonograph(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPhonograph"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/phonograph_lid.h b/engines/titanic/game/phonograph_lid.h index 2252551ad7..38c8924885 100644 --- a/engines/titanic/game/phonograph_lid.h +++ b/engines/titanic/game/phonograph_lid.h @@ -31,14 +31,10 @@ class CPhonographLid : public CGameObject { private: int _value; public: + CLASSDEF CPhonographLid() : CGameObject(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPhonographLid"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/pickup/pick_up.h b/engines/titanic/game/pickup/pick_up.h index e1783ef322..d5a858017d 100644 --- a/engines/titanic/game/pickup/pick_up.h +++ b/engines/titanic/game/pickup/pick_up.h @@ -31,14 +31,10 @@ class CPickUp : public CGameObject { private: int _fieldBC; public: + CLASSDEF CPickUp() : CGameObject(), _fieldBC(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CAnnoyBarbot"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/pickup/pick_up_bar_glass.h b/engines/titanic/game/pickup/pick_up_bar_glass.h index 9bec56cdd5..f1c75555ad 100644 --- a/engines/titanic/game/pickup/pick_up_bar_glass.h +++ b/engines/titanic/game/pickup/pick_up_bar_glass.h @@ -29,10 +29,7 @@ namespace Titanic { class CPickUpBarGlass : public CPickUp { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPickUpBarGlass"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/pickup/pick_up_hose.h b/engines/titanic/game/pickup/pick_up_hose.h index 13d5810177..9014934ba1 100644 --- a/engines/titanic/game/pickup/pick_up_hose.h +++ b/engines/titanic/game/pickup/pick_up_hose.h @@ -33,10 +33,7 @@ private: CString _string1; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPickUpHose"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/pickup/pick_up_lemon.h b/engines/titanic/game/pickup/pick_up_lemon.h index fee2485c1e..dc2942f366 100644 --- a/engines/titanic/game/pickup/pick_up_lemon.h +++ b/engines/titanic/game/pickup/pick_up_lemon.h @@ -29,10 +29,7 @@ namespace Titanic { class CPickUpLemon : public CPickUp { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPickUpLemon"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/pickup/pick_up_speech_centre.h b/engines/titanic/game/pickup/pick_up_speech_centre.h index b68761b83c..5d7d133ccc 100644 --- a/engines/titanic/game/pickup/pick_up_speech_centre.h +++ b/engines/titanic/game/pickup/pick_up_speech_centre.h @@ -29,10 +29,7 @@ namespace Titanic { class CPickUpSpeechCentre : public CPickUp { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPickUpSpeechCentre"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/pickup/pick_up_vis_centre.h b/engines/titanic/game/pickup/pick_up_vis_centre.h index 16db8f2b73..4345fceda9 100644 --- a/engines/titanic/game/pickup/pick_up_vis_centre.h +++ b/engines/titanic/game/pickup/pick_up_vis_centre.h @@ -29,10 +29,7 @@ namespace Titanic { class CPickUpVisCentre : public CPickUp { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPickUpVisCentre"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/placeholder/bar_shelf_vis_centre.h b/engines/titanic/game/placeholder/bar_shelf_vis_centre.h index 1cd3ca22bf..a2d39c3ea7 100644 --- a/engines/titanic/game/placeholder/bar_shelf_vis_centre.h +++ b/engines/titanic/game/placeholder/bar_shelf_vis_centre.h @@ -31,12 +31,9 @@ class CBarShelfVisCentre : public CPlaceHolder { private: int _value; public: + CLASSDEF CBarShelfVisCentre() : CPlaceHolder(), _value(0) {} - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBarShelfVisCentre"; } - + /** * Save the data for the class to file */ diff --git a/engines/titanic/game/placeholder/lemon_on_bar.h b/engines/titanic/game/placeholder/lemon_on_bar.h index d02f7a9eb8..c88698fcab 100644 --- a/engines/titanic/game/placeholder/lemon_on_bar.h +++ b/engines/titanic/game/placeholder/lemon_on_bar.h @@ -31,10 +31,7 @@ class CLemonOnBar : public CPlaceHolder { private: Common::Point _pos1; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CLemonOnBar"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/placeholder/place_holder.h b/engines/titanic/game/placeholder/place_holder.h index dd1c89dd86..4d01cd6c39 100644 --- a/engines/titanic/game/placeholder/place_holder.h +++ b/engines/titanic/game/placeholder/place_holder.h @@ -29,10 +29,7 @@ namespace Titanic { class CPlaceHolder : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPlaceHolder"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/placeholder/tv_on_bar.h b/engines/titanic/game/placeholder/tv_on_bar.h index 1583dad05a..3358cd6fec 100644 --- a/engines/titanic/game/placeholder/tv_on_bar.h +++ b/engines/titanic/game/placeholder/tv_on_bar.h @@ -31,10 +31,7 @@ class CTVOnBar : public CPlaceHolder { private: Common::Point _pos1; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTVOnBar"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/play_music_button.h b/engines/titanic/game/play_music_button.h index 29a13a688a..9e0bb464b3 100644 --- a/engines/titanic/game/play_music_button.h +++ b/engines/titanic/game/play_music_button.h @@ -32,14 +32,10 @@ public: int _fieldE0; int _fieldE4; public: + CLASSDEF CPlayMusicButton() : CBackground(), _fieldE0(0), _fieldE4(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPlayMusicButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/play_on_act.h b/engines/titanic/game/play_on_act.h index b8fdb2ac15..22bb54de6a 100644 --- a/engines/titanic/game/play_on_act.h +++ b/engines/titanic/game/play_on_act.h @@ -29,10 +29,7 @@ namespace Titanic { class CPlayOnAct : public CBackground { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPlayOnAct"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/port_hole.h b/engines/titanic/game/port_hole.h index 60aab51bb6..2672614d68 100644 --- a/engines/titanic/game/port_hole.h +++ b/engines/titanic/game/port_hole.h @@ -32,14 +32,10 @@ private: int _fieldBC; CString _string1, _string2; public: + CLASSDEF CPortHole(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPortHole"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/record_phonograph_button.h b/engines/titanic/game/record_phonograph_button.h index 4b2c6c885e..3ae7fb1dea 100644 --- a/engines/titanic/game/record_phonograph_button.h +++ b/engines/titanic/game/record_phonograph_button.h @@ -31,14 +31,10 @@ class CRecordPhonographButton : public CBackground { public: int _value; public: + CLASSDEF CRecordPhonographButton() : CBackground(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CRecordPhonographButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/replacement_ear.h b/engines/titanic/game/replacement_ear.h index 9c4a8e1398..0cff55d684 100644 --- a/engines/titanic/game/replacement_ear.h +++ b/engines/titanic/game/replacement_ear.h @@ -29,10 +29,7 @@ namespace Titanic { class CReplacementEar : public CBackground { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CNoNutBowl"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/reserved_table.h b/engines/titanic/game/reserved_table.h index abf3a657be..49cd5e8e39 100644 --- a/engines/titanic/game/reserved_table.h +++ b/engines/titanic/game/reserved_table.h @@ -31,14 +31,10 @@ class CReservedTable : public CGameObject { public: int _value1, _value2; public: + CLASSDEF CReservedTable() : CGameObject(), _value1(0), _value2(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CReservedTable"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/restaurant_cylinder_holder.h b/engines/titanic/game/restaurant_cylinder_holder.h index 29e2958f98..9f3911d850 100644 --- a/engines/titanic/game/restaurant_cylinder_holder.h +++ b/engines/titanic/game/restaurant_cylinder_holder.h @@ -37,14 +37,10 @@ private: CString _string6; int _field140; public: + CLASSDEF CRestaurantCylinderHolder(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CRestaurantCylinderHolder"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/restaurant_phonograph.h b/engines/titanic/game/restaurant_phonograph.h index 777ec34358..40116f5d07 100644 --- a/engines/titanic/game/restaurant_phonograph.h +++ b/engines/titanic/game/restaurant_phonograph.h @@ -34,14 +34,10 @@ private: CString _string3; int _field114; public: + CLASSDEF CRestaurantPhonograph(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CRestaurantPhonograph"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/room_item.h b/engines/titanic/game/room_item.h index c213d38caa..7441ed01bc 100644 --- a/engines/titanic/game/room_item.h +++ b/engines/titanic/game/room_item.h @@ -42,14 +42,10 @@ private: void loading(); public: + CLASSDEF CRoomItem(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CRoomItem"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/sauce_dispensor.h b/engines/titanic/game/sauce_dispensor.h index fd9afd979c..6969adb326 100644 --- a/engines/titanic/game/sauce_dispensor.h +++ b/engines/titanic/game/sauce_dispensor.h @@ -37,14 +37,10 @@ public: int _field104; int _field108; public: + CLASSDEF CSauceDispensor(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSauceDispensor"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/search_point.h b/engines/titanic/game/search_point.h index 3908d87ee6..7bd05d8d1e 100644 --- a/engines/titanic/game/search_point.h +++ b/engines/titanic/game/search_point.h @@ -31,14 +31,10 @@ class CSearchPoint : public CGameObject { public: int _value; public: + CLASSDEF CSearchPoint() : CGameObject(), _value(2) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSearchPoint"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/season_background.h b/engines/titanic/game/season_background.h index 28998538da..709f1002c3 100644 --- a/engines/titanic/game/season_background.h +++ b/engines/titanic/game/season_background.h @@ -34,14 +34,10 @@ public: int _fieldE8; int _fieldEC; public: + CLASSDEF CSeasonBackground(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSeasonBackground"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/season_barrel.h b/engines/titanic/game/season_barrel.h index af22c14f73..d3f7b1a91e 100644 --- a/engines/titanic/game/season_barrel.h +++ b/engines/titanic/game/season_barrel.h @@ -32,14 +32,10 @@ public: int _fieldE0; int _fieldE4; public: + CLASSDEF CSeasonBarrel() : CBackground(), _fieldE0(0), _fieldE4(7) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSeasonBarrel"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/seasonal_adjustment.h b/engines/titanic/game/seasonal_adjustment.h index 2db94033db..4bfec1a47a 100644 --- a/engines/titanic/game/seasonal_adjustment.h +++ b/engines/titanic/game/seasonal_adjustment.h @@ -32,14 +32,10 @@ public: int _fieldE0; int _fieldE4; public: + CLASSDEF CSeasonalAdjustment() : CBackground(), _fieldE0(0), _fieldE4(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSeasonalAdjustment"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/service_elevator_window.h b/engines/titanic/game/service_elevator_window.h index 493776c7af..70c38753b2 100644 --- a/engines/titanic/game/service_elevator_window.h +++ b/engines/titanic/game/service_elevator_window.h @@ -34,14 +34,10 @@ public: int _fieldE8; int _fieldEC; public: + CLASSDEF CServiceElevatorWindow(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CServiceElevatorWindow"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/sgt/armchair.h b/engines/titanic/game/sgt/armchair.h index 2157c3c556..1ce6955c58 100644 --- a/engines/titanic/game/sgt/armchair.h +++ b/engines/titanic/game/sgt/armchair.h @@ -29,10 +29,7 @@ namespace Titanic { class CArmchair : public CSGTStateRoom { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CArmchair"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/sgt/basin.h b/engines/titanic/game/sgt/basin.h index 85aaf476dd..cc9739fd1d 100644 --- a/engines/titanic/game/sgt/basin.h +++ b/engines/titanic/game/sgt/basin.h @@ -29,10 +29,7 @@ namespace Titanic { class CBasin : public CSGTStateRoom { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBasin"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/sgt/bedfoot.h b/engines/titanic/game/sgt/bedfoot.h index 7794fc4349..55be4fdadd 100644 --- a/engines/titanic/game/sgt/bedfoot.h +++ b/engines/titanic/game/sgt/bedfoot.h @@ -29,10 +29,7 @@ namespace Titanic { class CBedfoot : public CSGTStateRoom { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBedfoot"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/sgt/bedhead.h b/engines/titanic/game/sgt/bedhead.h index 36691639fc..317b7eb2a3 100644 --- a/engines/titanic/game/sgt/bedhead.h +++ b/engines/titanic/game/sgt/bedhead.h @@ -29,10 +29,7 @@ namespace Titanic { class CBedhead : public CSGTStateRoom { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBedhead"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/sgt/chest_of_drawers.h b/engines/titanic/game/sgt/chest_of_drawers.h index 17f5cf9e9b..e0bdd7579e 100644 --- a/engines/titanic/game/sgt/chest_of_drawers.h +++ b/engines/titanic/game/sgt/chest_of_drawers.h @@ -29,10 +29,7 @@ namespace Titanic { class CChestOfDrawers : public CSGTStateRoom { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CChestOfDrawers"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/sgt/desk.h b/engines/titanic/game/sgt/desk.h index 4c89c04e4b..7fbb65ad5e 100644 --- a/engines/titanic/game/sgt/desk.h +++ b/engines/titanic/game/sgt/desk.h @@ -29,10 +29,7 @@ namespace Titanic { class CDesk : public CSGTStateRoom { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CDesk"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/sgt/deskchair.h b/engines/titanic/game/sgt/deskchair.h index 762b639eb7..205209c22c 100644 --- a/engines/titanic/game/sgt/deskchair.h +++ b/engines/titanic/game/sgt/deskchair.h @@ -29,10 +29,7 @@ namespace Titanic { class CDeskchair : public CSGTStateRoom { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CDeskchair"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/sgt/drawer.h b/engines/titanic/game/sgt/drawer.h index 100e27cb52..8436e5ccb7 100644 --- a/engines/titanic/game/sgt/drawer.h +++ b/engines/titanic/game/sgt/drawer.h @@ -31,14 +31,10 @@ class CDrawer : public CSGTStateRoom { private: int _fieldF4; public: + CLASSDEF CDrawer(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CDrawer"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/sgt/sgt_doors.h b/engines/titanic/game/sgt/sgt_doors.h index 946404936f..9828708377 100644 --- a/engines/titanic/game/sgt/sgt_doors.h +++ b/engines/titanic/game/sgt/sgt_doors.h @@ -31,14 +31,10 @@ class CSGTDoors : public CGameObject { public: int _value1, _value2; public: + CLASSDEF CSGTDoors() : CGameObject(), _value1(0), _value2(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSGTDoors"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/sgt/sgt_nav.h b/engines/titanic/game/sgt/sgt_nav.h index 7f1912dc35..7d7f57f851 100644 --- a/engines/titanic/game/sgt/sgt_nav.h +++ b/engines/titanic/game/sgt/sgt_nav.h @@ -29,10 +29,7 @@ namespace Titanic { class SGTNav : public CSGTStateRoom { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "SGTNav"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/sgt/sgt_navigation.h b/engines/titanic/game/sgt/sgt_navigation.h index 539a6073a8..083efa8cfa 100644 --- a/engines/titanic/game/sgt/sgt_navigation.h +++ b/engines/titanic/game/sgt/sgt_navigation.h @@ -37,15 +37,11 @@ class CSGTNavigation : public CGameObject { private: static CSGTNavigationStatics *_statics; public: + CLASSDEF static void init(); static void deinit(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSGTNavigation"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/sgt/sgt_restaurant_doors.h b/engines/titanic/game/sgt/sgt_restaurant_doors.h index 904c0c6b60..14677ea5f9 100644 --- a/engines/titanic/game/sgt/sgt_restaurant_doors.h +++ b/engines/titanic/game/sgt/sgt_restaurant_doors.h @@ -31,14 +31,10 @@ class CSGTRestaurantDoors : public CGameObject { private: int _fieldBC; public: + CLASSDEF CSGTRestaurantDoors() : CGameObject(), _fieldBC(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSGTRestaurantDoors"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/sgt/sgt_state_control.h b/engines/titanic/game/sgt/sgt_state_control.h index b22095cb14..05d8fde7d1 100644 --- a/engines/titanic/game/sgt/sgt_state_control.h +++ b/engines/titanic/game/sgt/sgt_state_control.h @@ -31,14 +31,10 @@ class CSGTStateControl : public CBackground { private: int _fieldE0; public: + CLASSDEF CSGTStateControl() : CBackground(), _fieldE0(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSGTStateControl"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/sgt/sgt_state_room.h b/engines/titanic/game/sgt/sgt_state_room.h index f67a916f1f..dfac6894b9 100644 --- a/engines/titanic/game/sgt/sgt_state_room.h +++ b/engines/titanic/game/sgt/sgt_state_room.h @@ -54,16 +54,12 @@ private: int _fieldEC; int _fieldF0; public: + CLASSDEF CSGTStateRoom(); static void init(); static void deinit(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSGTStateRoom"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/sgt/sgt_tv.h b/engines/titanic/game/sgt/sgt_tv.h index 79e7efde4f..347d2c74ab 100644 --- a/engines/titanic/game/sgt/sgt_tv.h +++ b/engines/titanic/game/sgt/sgt_tv.h @@ -29,10 +29,7 @@ namespace Titanic { class CSGTTV : public CSGTStateRoom { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSGTTV"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/sgt/sgt_upper_doors_sound.h b/engines/titanic/game/sgt/sgt_upper_doors_sound.h index ed97627315..cd62aa5cf6 100644 --- a/engines/titanic/game/sgt/sgt_upper_doors_sound.h +++ b/engines/titanic/game/sgt/sgt_upper_doors_sound.h @@ -29,14 +29,10 @@ namespace Titanic { class CSGTUpperDoorsSound : public CClickResponder { public: + CLASSDEF CSGTUpperDoorsSound(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSGTUpperDoorsSound"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/sgt/toilet.h b/engines/titanic/game/sgt/toilet.h index a5265e7473..08926516ee 100644 --- a/engines/titanic/game/sgt/toilet.h +++ b/engines/titanic/game/sgt/toilet.h @@ -29,10 +29,7 @@ namespace Titanic { class CToilet : public CSGTStateRoom { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CToilet"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/sgt/vase.h b/engines/titanic/game/sgt/vase.h index 37a58181a2..1b2a89f17b 100644 --- a/engines/titanic/game/sgt/vase.h +++ b/engines/titanic/game/sgt/vase.h @@ -29,10 +29,7 @@ namespace Titanic { class CVase : public CSGTStateRoom { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CVase"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/sgt/washstand.h b/engines/titanic/game/sgt/washstand.h index 40eb5a4eee..975a4d57c9 100644 --- a/engines/titanic/game/sgt/washstand.h +++ b/engines/titanic/game/sgt/washstand.h @@ -29,10 +29,7 @@ namespace Titanic { class CWashstand : public CSGTStateRoom { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CWashstand"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/ship_setting.h b/engines/titanic/game/ship_setting.h index 8e57e53125..a3b5d5f511 100644 --- a/engines/titanic/game/ship_setting.h +++ b/engines/titanic/game/ship_setting.h @@ -34,14 +34,10 @@ public: CString _string4; CString _string5; public: + CLASSDEF CShipSetting(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CShipSetting"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/ship_setting_button.h b/engines/titanic/game/ship_setting_button.h index fb8d533a7f..e6a6822854 100644 --- a/engines/titanic/game/ship_setting_button.h +++ b/engines/titanic/game/ship_setting_button.h @@ -33,14 +33,10 @@ private: int _fieldC8; int _fieldCC; public: + CLASSDEF CShipSettingButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CShipSettingButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/show_cell_points.h b/engines/titanic/game/show_cell_points.h index c807cd5ed6..a3d7ba2e5a 100644 --- a/engines/titanic/game/show_cell_points.h +++ b/engines/titanic/game/show_cell_points.h @@ -32,14 +32,10 @@ public: CString _strValue; int _numValue; public: + CLASSDEF CShowCellpoints() : CGameObject(), _numValue(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CShowCellpoints"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/speech_dispensor.h b/engines/titanic/game/speech_dispensor.h index 19f31fcf68..440746e5c2 100644 --- a/engines/titanic/game/speech_dispensor.h +++ b/engines/titanic/game/speech_dispensor.h @@ -38,10 +38,7 @@ private: int _fieldF8; int _fieldFC; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSpeechDispensor"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/splash_animation.h b/engines/titanic/game/splash_animation.h index 8ac59d9d1c..2f4056231b 100644 --- a/engines/titanic/game/splash_animation.h +++ b/engines/titanic/game/splash_animation.h @@ -29,10 +29,7 @@ namespace Titanic { class CSplashAnimation : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSplashAnimation"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/starling_puret.h b/engines/titanic/game/starling_puret.h index 5bfdd660f9..7299c68449 100644 --- a/engines/titanic/game/starling_puret.h +++ b/engines/titanic/game/starling_puret.h @@ -31,14 +31,10 @@ class CStarlingPuret : public CGameObject { private: int _value; public: + CLASSDEF CStarlingPuret() : CGameObject(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CStarlingPuret"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/start_action.h b/engines/titanic/game/start_action.h index 3725dbc4a0..fc7a2ea514 100644 --- a/engines/titanic/game/start_action.h +++ b/engines/titanic/game/start_action.h @@ -32,14 +32,10 @@ protected: CString _string3; CString _string4; public: + CLASSDEF CStartAction(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CStartAction"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/stop_phonograph_button.h b/engines/titanic/game/stop_phonograph_button.h index 945345cd61..b1accfe1e1 100644 --- a/engines/titanic/game/stop_phonograph_button.h +++ b/engines/titanic/game/stop_phonograph_button.h @@ -29,10 +29,7 @@ namespace Titanic { class CStopPhonographButton : public CBackground { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CStopPhonographButton"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/sub_glass.h b/engines/titanic/game/sub_glass.h index 00ff26fbeb..b7ba51379e 100644 --- a/engines/titanic/game/sub_glass.h +++ b/engines/titanic/game/sub_glass.h @@ -36,14 +36,10 @@ private: int _fieldCC; CString _string; public: + CLASSDEF CSUBGlass(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSUBGlass"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/sub_wrapper.h b/engines/titanic/game/sub_wrapper.h index b67d4e506f..6b724f8000 100644 --- a/engines/titanic/game/sub_wrapper.h +++ b/engines/titanic/game/sub_wrapper.h @@ -31,14 +31,10 @@ class CSUBWrapper : public CGameObject { public: int _value; public: + CLASSDEF CSUBWrapper() : CGameObject(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSUBWrapper"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/sweet_bowl.h b/engines/titanic/game/sweet_bowl.h index 8fb20e4041..fa607bb67b 100644 --- a/engines/titanic/game/sweet_bowl.h +++ b/engines/titanic/game/sweet_bowl.h @@ -29,10 +29,7 @@ namespace Titanic { class CSweetBowl : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CSweetBowl"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/television.h b/engines/titanic/game/television.h index 4f39d60b9f..d64c253d90 100644 --- a/engines/titanic/game/television.h +++ b/engines/titanic/game/television.h @@ -42,14 +42,10 @@ private: int _fieldEC; int _fieldF0; public: + CLASSDEF CTelevision(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTelevision"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/third_class_canal.h b/engines/titanic/game/third_class_canal.h index 4465cba07b..7a2c3d4f77 100644 --- a/engines/titanic/game/third_class_canal.h +++ b/engines/titanic/game/third_class_canal.h @@ -29,10 +29,7 @@ namespace Titanic { class CThirdClassCanal : public CBackground { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CThirdClassCanal"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/throw_tv_down_well.h b/engines/titanic/game/throw_tv_down_well.h index 0f8f731be3..dee145014b 100644 --- a/engines/titanic/game/throw_tv_down_well.h +++ b/engines/titanic/game/throw_tv_down_well.h @@ -32,14 +32,10 @@ public: CString _strValue; int _numValue; public: + CLASSDEF CThrowTVDownWell() : CGameObject(), _numValue(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CThrowTVDownWell"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/titania_still_control.h b/engines/titanic/game/titania_still_control.h index 141f0c5cf9..a0f739db01 100644 --- a/engines/titanic/game/titania_still_control.h +++ b/engines/titanic/game/titania_still_control.h @@ -29,10 +29,7 @@ namespace Titanic { class CTitaniaStillControl : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTitaniaStillControl"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/tow_parrot_nav.h b/engines/titanic/game/tow_parrot_nav.h index 6233728198..420c29bfab 100644 --- a/engines/titanic/game/tow_parrot_nav.h +++ b/engines/titanic/game/tow_parrot_nav.h @@ -29,10 +29,7 @@ namespace Titanic { class CTOWParrotNav : public CGameObject { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTOWParrotNav"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/transport/exit_pellerator.h b/engines/titanic/game/transport/exit_pellerator.h index d327ea6ba6..e72cbb4b9d 100644 --- a/engines/titanic/game/transport/exit_pellerator.h +++ b/engines/titanic/game/transport/exit_pellerator.h @@ -32,10 +32,7 @@ private: static int _v1; static int _v2; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPellerator"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/transport/gondolier.h b/engines/titanic/game/transport/gondolier.h index 1d874beb3a..bdfb3e7156 100644 --- a/engines/titanic/game/transport/gondolier.h +++ b/engines/titanic/game/transport/gondolier.h @@ -29,10 +29,7 @@ namespace Titanic { class CGondolier : public CTransport { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CGondolier"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/transport/lift.h b/engines/titanic/game/transport/lift.h index acb5fde45b..b1cd48960e 100644 --- a/engines/titanic/game/transport/lift.h +++ b/engines/titanic/game/transport/lift.h @@ -38,14 +38,10 @@ private: int _fieldF8; public: + CLASSDEF CLift() : CTransport(), _fieldF8(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CLift"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/transport/lift_indicator.h b/engines/titanic/game/transport/lift_indicator.h index bbd6cb2867..2fe6e1a61e 100644 --- a/engines/titanic/game/transport/lift_indicator.h +++ b/engines/titanic/game/transport/lift_indicator.h @@ -34,14 +34,10 @@ private: int _field108; int _field10C; public: + CLASSDEF CLiftindicator(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CLiftindicator"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/transport/pellerator.h b/engines/titanic/game/transport/pellerator.h index d327ea6ba6..e72cbb4b9d 100644 --- a/engines/titanic/game/transport/pellerator.h +++ b/engines/titanic/game/transport/pellerator.h @@ -32,10 +32,7 @@ private: static int _v1; static int _v2; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPellerator"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/transport/service_elevator.h b/engines/titanic/game/transport/service_elevator.h index f97e3bcd5e..9edc1f9100 100644 --- a/engines/titanic/game/transport/service_elevator.h +++ b/engines/titanic/game/transport/service_elevator.h @@ -38,14 +38,10 @@ private: int _field100; int _field104; public: + CLASSDEF CServiceElevator(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CServiceElevator"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/transport/transport.h b/engines/titanic/game/transport/transport.h index 6e3f1a2d1d..faa00b4dd9 100644 --- a/engines/titanic/game/transport/transport.h +++ b/engines/titanic/game/transport/transport.h @@ -32,14 +32,10 @@ public: CString _string1; CString _string2; public: + CLASSDEF CTransport(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTransport"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/up_lighter.h b/engines/titanic/game/up_lighter.h index e7c6cdf38e..e24e712c1c 100644 --- a/engines/titanic/game/up_lighter.h +++ b/engines/titanic/game/up_lighter.h @@ -34,14 +34,10 @@ private: int _field120; int _field124; public: + CLASSDEF CUpLighter(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CUpLighter"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/useless_lever.h b/engines/titanic/game/useless_lever.h index 444df0c69f..f582bdee63 100644 --- a/engines/titanic/game/useless_lever.h +++ b/engines/titanic/game/useless_lever.h @@ -29,10 +29,7 @@ namespace Titanic { class CUselessLever : public CToggleButton { public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CUselessLever"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/game/wheel_button.h b/engines/titanic/game/wheel_button.h index b1721ebbdd..75e1268585 100644 --- a/engines/titanic/game/wheel_button.h +++ b/engines/titanic/game/wheel_button.h @@ -33,14 +33,10 @@ public: int _fieldE4; int _fieldE8; public: + CLASSDEF CWheelButton(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CWheelButton"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/wheel_hotspot.h b/engines/titanic/game/wheel_hotspot.h index 6887407a1e..7164b88b71 100644 --- a/engines/titanic/game/wheel_hotspot.h +++ b/engines/titanic/game/wheel_hotspot.h @@ -32,14 +32,10 @@ public: int _fieldE0; int _fieldE4; public: + CLASSDEF CWheelHotSpot() : CBackground(), _fieldE0(0), _fieldE4(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CWheelHotSpot"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/wheel_spin.h b/engines/titanic/game/wheel_spin.h index 64006afa0f..2e21da4984 100644 --- a/engines/titanic/game/wheel_spin.h +++ b/engines/titanic/game/wheel_spin.h @@ -31,14 +31,10 @@ class CWheelSpin : public CBackground { public: int _value; public: + CLASSDEF CWheelSpin() : CBackground(), _value(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CWheelSpin"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/game/wheel_spin_horn.h b/engines/titanic/game/wheel_spin_horn.h index b96b20b6c4..e4c0bd738c 100644 --- a/engines/titanic/game/wheel_spin_horn.h +++ b/engines/titanic/game/wheel_spin_horn.h @@ -32,10 +32,7 @@ public: CString _string1; CString _string2; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CWheelSpinHorn"; } + CLASSDEF /** * Save the data for the class to file |