diff options
author | Paul Gilbert | 2016-03-31 21:40:36 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-03-31 21:40:36 -0400 |
commit | 7d819f71f7d9fdd794b12ac55bd2177f12069c1b (patch) | |
tree | 827709731a6443202540dd3e2ec072f9cf2b0e14 /engines/titanic/pet_control/pet_control.h | |
parent | 3149cd1a341f6001922e6bddce1a376db1fea49c (diff) | |
download | scummvm-rg350-7d819f71f7d9fdd794b12ac55bd2177f12069c1b.tar.gz scummvm-rg350-7d819f71f7d9fdd794b12ac55bd2177f12069c1b.tar.bz2 scummvm-rg350-7d819f71f7d9fdd794b12ac55bd2177f12069c1b.zip |
TITANIC: PET frame is now showing
Diffstat (limited to 'engines/titanic/pet_control/pet_control.h')
-rw-r--r-- | engines/titanic/pet_control/pet_control.h | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h index ea7c6845f3..24ab78a963 100644 --- a/engines/titanic/pet_control/pet_control.h +++ b/engines/titanic/pet_control/pet_control.h @@ -42,11 +42,11 @@ private: int _fieldC0; int _locked; int _fieldC8; - CPetConversationSection _convSection; - CPetInventorySection _invSection; - CPetRemoteSection _remoteSection; - CPetRoomsSection _roomsSection; - CPetSaveSection _saveSection; + CPetConversationSection _conversations; + CPetInventorySection _inventory; + CPetRemoteSection _remote; + CPetRoomsSection _rooms; + CPetSaveSection _saves; CPetControlSub5 _sub5; CPetControlSub7 _sub7; CPetFrame _frame; @@ -55,7 +55,7 @@ private: CTreeItem *_treeItem2; CString _string2; CRoomItem *_hiddenRoom; - Rect _oldBounds; + Rect _drawBounds; private: /** * Returns true if the control is in a valid state @@ -81,6 +81,11 @@ private: * Scan the specified room for an item by name */ CGameObject *findItemInRoom(CRoomItem *room, const CString &name) const; + + /** + * Returns true if the draw bounds contains the specified point + */ + bool containsPt(const Common::Point &pt) const; public: PetArea _currentArea; public: @@ -103,6 +108,11 @@ public: virtual void draw(CScreenManager *screenManager); /** + * Gets the bounds occupied by the item + */ + virtual Rect getBounds(); + + /** * Called after loading a game has finished */ void postLoad(); |