diff options
| author | Paul Gilbert | 2016-08-14 12:17:09 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-08-14 12:17:09 -0400 |
| commit | 6e1045b5be9b8c03f56408234c6888e84f788fb8 (patch) | |
| tree | 8f1245351995b2c7644a2c73fac18e15f53a0993 /engines/titanic/core | |
| parent | 6c3fdca97beec1bf6a2e6a755d754ba8e0796995 (diff) | |
| download | scummvm-rg350-6e1045b5be9b8c03f56408234c6888e84f788fb8.tar.gz scummvm-rg350-6e1045b5be9b8c03f56408234c6888e84f788fb8.tar.bz2 scummvm-rg350-6e1045b5be9b8c03f56408234c6888e84f788fb8.zip | |
TITANIC: Implemented CSuccUBus class
Diffstat (limited to 'engines/titanic/core')
| -rw-r--r-- | engines/titanic/core/game_object.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h index 849682c1a3..f853a63bbb 100644 --- a/engines/titanic/core/game_object.h +++ b/engines/titanic/core/game_object.h @@ -71,7 +71,6 @@ private: */ bool clipRect(const Rect &rect1, Rect &rect2) const; protected: - Rect _bounds; double _field34; double _field38; double _field3C; @@ -341,11 +340,6 @@ protected: bool changeView(const CString &viewName); /** - * Get the centre of the game object's bounds - */ - Point getControid() const; - - /** * Play an arbitrary clip */ void playClip(const CString &name, uint flags); @@ -445,16 +439,6 @@ protected: uint32 getTickCount(); /** - * Adds an object to the mail list - */ - void addMail(int mailId); - - /** - * Sets the mail identifier for an object - */ - void setMailId(int mailId); - - /** * Returns true if a mail with a specified Id exists */ bool mailExists(int id) const; @@ -544,6 +528,7 @@ protected: */ int getNewRandomNumber(int max, int *oldVal = nullptr); public: + Rect _bounds; bool _isMail; int _id; uint _roomFlags; @@ -627,6 +612,11 @@ public: void setPosition(const Point &newPos); /** + * Get the centre of the game object's bounds + */ + Point getControid() const; + + /** * Change the object's status */ void playMovie(uint flags); @@ -697,6 +687,16 @@ public: int getPriorClass() const; /** + * Adds an object to the mail list + */ + void addMail(int mailId); + + /** + * Sets the mail identifier for an object + */ + void setMailId(int mailId); + + /** * Returns true if there's an attached surface which has a frame * ready for display */ |