diff options
Diffstat (limited to 'engines/titanic/moves')
22 files changed, 23 insertions, 107 deletions
diff --git a/engines/titanic/moves/enter_bomb_room.h b/engines/titanic/moves/enter_bomb_room.h index fc4d1360ec..dabde2e308 100644 --- a/engines/titanic/moves/enter_bomb_room.h +++ b/engines/titanic/moves/enter_bomb_room.h @@ -31,14 +31,10 @@ class CEnterBombRoom : public CMovePlayerTo { protected: int _fieldC8; public: + CLASSDEF CEnterBombRoom(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEnterBombRoom"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/enter_bridge.h b/engines/titanic/moves/enter_bridge.h index bbc4cc96d0..6a6e7161dd 100644 --- a/engines/titanic/moves/enter_bridge.h +++ b/engines/titanic/moves/enter_bridge.h @@ -31,14 +31,10 @@ class CEnterBridge : public CGameObject { public: int _value; public: + CLASSDEF CEnterBridge() : CGameObject(), _value(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEnterBridge"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/enter_exit_first_class_state.h b/engines/titanic/moves/enter_exit_first_class_state.h index f7bc4c69f7..728395d20c 100644 --- a/engines/titanic/moves/enter_exit_first_class_state.h +++ b/engines/titanic/moves/enter_exit_first_class_state.h @@ -41,10 +41,7 @@ public: */ static void deinit(); public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CBowlUnlocker"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/moves/enter_exit_mini_lift.h b/engines/titanic/moves/enter_exit_mini_lift.h index 417e25d13f..5a91d397f9 100644 --- a/engines/titanic/moves/enter_exit_mini_lift.h +++ b/engines/titanic/moves/enter_exit_mini_lift.h @@ -32,14 +32,10 @@ private: int _fieldBC; int _fieldC0; public: + CLASSDEF CEnterExitMiniLift() : CSGTNavigation(), _fieldBC(0), _fieldC0(1) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEnterExitMiniLift"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/enter_exit_sec_class_mini_lift.h b/engines/titanic/moves/enter_exit_sec_class_mini_lift.h index 364b2e3dc6..a1081c2836 100644 --- a/engines/titanic/moves/enter_exit_sec_class_mini_lift.h +++ b/engines/titanic/moves/enter_exit_sec_class_mini_lift.h @@ -39,14 +39,11 @@ private: static CEnterExitSecClassMiniLiftStatics *_statics; int _value; public: + CLASSDEF CEnterExitSecClassMiniLift() : CGameObject(), _value(0) {} static void init(); static void deinit(); - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEnterExitSecClassMiniLift"; } - + /** * Save the data for the class to file */ diff --git a/engines/titanic/moves/enter_exit_view.h b/engines/titanic/moves/enter_exit_view.h index 05ed63da5c..e967723558 100644 --- a/engines/titanic/moves/enter_exit_view.h +++ b/engines/titanic/moves/enter_exit_view.h @@ -35,14 +35,10 @@ public: int _fieldC8; int _fieldCC; public: + CLASSDEF CEnterExitView(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEnterExitView"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/enter_sec_class_state.h b/engines/titanic/moves/enter_sec_class_state.h index 5da623dc08..2e80939976 100644 --- a/engines/titanic/moves/enter_sec_class_state.h +++ b/engines/titanic/moves/enter_sec_class_state.h @@ -31,14 +31,10 @@ class CEnterSecClassState : public CGameObject { public: int _value1, _value2; public: + CLASSDEF CEnterSecClassState() : CGameObject(), _value1(0), _value2(0) {} /** - * Return the class name - */ - virtual const char *getClassName() const { return "CEnterSecClassState"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/exit_arboretum.h b/engines/titanic/moves/exit_arboretum.h index 4e5815d284..0da67dd5a0 100644 --- a/engines/titanic/moves/exit_arboretum.h +++ b/engines/titanic/moves/exit_arboretum.h @@ -33,14 +33,10 @@ protected: int _fieldCC; int _fieldD0; public: + CLASSDEF CExitArboretum(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CExitArboretum"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/exit_bridge.h b/engines/titanic/moves/exit_bridge.h index c85c1bcab7..9231728e12 100644 --- a/engines/titanic/moves/exit_bridge.h +++ b/engines/titanic/moves/exit_bridge.h @@ -31,14 +31,10 @@ class CExitBridge : public CMovePlayerTo { private: CString _string1; public: + CLASSDEF CExitBridge(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CExitBridge"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/exit_lift.h b/engines/titanic/moves/exit_lift.h index 534de1b8ec..e97f041804 100644 --- a/engines/titanic/moves/exit_lift.h +++ b/engines/titanic/moves/exit_lift.h @@ -31,10 +31,7 @@ class CExitLift : public CGameObject { public: CString _value; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CExitLift"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/moves/exit_pellerator.h b/engines/titanic/moves/exit_pellerator.h index 7df5657691..3ae70dbed8 100644 --- a/engines/titanic/moves/exit_pellerator.h +++ b/engines/titanic/moves/exit_pellerator.h @@ -37,15 +37,11 @@ class CExitPellerator : public CGameObject { private: static CExitPelleratorStatics *_statics; public: + CLASSDEF static void init(); static void deinit(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CExitPellerator"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/exit_state_room.h b/engines/titanic/moves/exit_state_room.h index ecef4f1dc3..ccf52ce3f3 100644 --- a/engines/titanic/moves/exit_state_room.h +++ b/engines/titanic/moves/exit_state_room.h @@ -31,14 +31,10 @@ class CExitStateRoom : public CMovePlayerTo { protected: int _fieldC8; public: + CLASSDEF CExitStateRoom(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CExitStateRoom"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/exit_tiania.h b/engines/titanic/moves/exit_tiania.h index 63e120fcf3..3af5aadc2e 100644 --- a/engines/titanic/moves/exit_tiania.h +++ b/engines/titanic/moves/exit_tiania.h @@ -34,14 +34,10 @@ private: CString _string2; CString _string3; public: + CLASSDEF CExitTiania(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CExitTiania"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/move_player_in_parrot_room.h b/engines/titanic/moves/move_player_in_parrot_room.h index 91f8b993a6..5339a60a9c 100644 --- a/engines/titanic/moves/move_player_in_parrot_room.h +++ b/engines/titanic/moves/move_player_in_parrot_room.h @@ -29,14 +29,10 @@ namespace Titanic { class CMovePlayerInParrotRoom : public CMovePlayerTo { public: + CLASSDEF CMovePlayerInParrotRoom(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMovePlayerInParrotRoom"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/move_player_to.h b/engines/titanic/moves/move_player_to.h index aa785b9167..2617b46097 100644 --- a/engines/titanic/moves/move_player_to.h +++ b/engines/titanic/moves/move_player_to.h @@ -31,14 +31,10 @@ class CMovePlayerTo : public CGameObject { protected: CString _destination; public: + CLASSDEF CMovePlayerTo(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMovePlayerTo"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/move_player_to_from.h b/engines/titanic/moves/move_player_to_from.h index 82fe5db2ec..bc1878af38 100644 --- a/engines/titanic/moves/move_player_to_from.h +++ b/engines/titanic/moves/move_player_to_from.h @@ -31,14 +31,10 @@ class CMovePlayerToFrom : public CGameObject { private: CString _string2; public: + CLASSDEF CMovePlayerToFrom(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMovePlayerToFrom"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/multi_move.h b/engines/titanic/moves/multi_move.h index 102b4b7473..a06632df52 100644 --- a/engines/titanic/moves/multi_move.h +++ b/engines/titanic/moves/multi_move.h @@ -35,14 +35,10 @@ private: CString _string4; CString _string5; public: + CLASSDEF CMultiMove(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CMultiMove"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/pan_from_pel.h b/engines/titanic/moves/pan_from_pel.h index 41f3fdb339..b94f5166d7 100644 --- a/engines/titanic/moves/pan_from_pel.h +++ b/engines/titanic/moves/pan_from_pel.h @@ -32,14 +32,10 @@ protected: int _fieldC8; CString _string1; public: + CLASSDEF CPanFromPel(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CPanFromPel"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/restaurant_pan_handler.h b/engines/titanic/moves/restaurant_pan_handler.h index d2db5843a8..29f7832b74 100644 --- a/engines/titanic/moves/restaurant_pan_handler.h +++ b/engines/titanic/moves/restaurant_pan_handler.h @@ -34,10 +34,7 @@ protected: CString _string1; CString _string2; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CRestaurantPanHandler"; } + CLASSDEF /** * Save the data for the class to file diff --git a/engines/titanic/moves/restricted_move.h b/engines/titanic/moves/restricted_move.h index 48ddefe9b8..ef95e0f5b5 100644 --- a/engines/titanic/moves/restricted_move.h +++ b/engines/titanic/moves/restricted_move.h @@ -31,14 +31,10 @@ class CRestrictedMove : public CMovePlayerTo { protected: int _fieldC8; public: + CLASSDEF CRestrictedMove(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CRestrictedMove"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/scraliontis_table.h b/engines/titanic/moves/scraliontis_table.h index d7c2ad69ab..53b000646b 100644 --- a/engines/titanic/moves/scraliontis_table.h +++ b/engines/titanic/moves/scraliontis_table.h @@ -34,14 +34,10 @@ private: int _fieldE8; int _fieldEC; public: + CLASSDEF CScraliontisTable(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CScraliontisTable"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; diff --git a/engines/titanic/moves/trip_down_canal.h b/engines/titanic/moves/trip_down_canal.h index 0a5f918fb2..80d5dcf706 100644 --- a/engines/titanic/moves/trip_down_canal.h +++ b/engines/titanic/moves/trip_down_canal.h @@ -29,14 +29,10 @@ namespace Titanic { class CTripDownCanal : public CMovePlayerTo { public: + CLASSDEF CTripDownCanal(); /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTripDownCanal"; } - - /** * Save the data for the class to file */ virtual void save(SimpleFile *file, int indent) const; |