diff options
| author | whiterandrek | 2018-05-21 21:38:02 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-06-28 23:51:32 +0200 |
| commit | 37574a3bcf2a85e0faf23b0278b560ab1a36086e (patch) | |
| tree | 86f5dc81516c1251fd9f76cb2bc377fc7e7ed2ff /engines/pink/objects/inventory.h | |
| parent | d8e42e739547868f61efd5818133b2045c89d77a (diff) | |
| download | scummvm-rg350-37574a3bcf2a85e0faf23b0278b560ab1a36086e.tar.gz scummvm-rg350-37574a3bcf2a85e0faf23b0278b560ab1a36086e.tar.bz2 scummvm-rg350-37574a3bcf2a85e0faf23b0278b560ab1a36086e.zip | |
PINK: remove >> << operators
Diffstat (limited to 'engines/pink/objects/inventory.h')
| -rw-r--r-- | engines/pink/objects/inventory.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/pink/objects/inventory.h b/engines/pink/objects/inventory.h index 8cb4f0aba9..b8de36b8b4 100644 --- a/engines/pink/objects/inventory.h +++ b/engines/pink/objects/inventory.h @@ -23,14 +23,12 @@ #ifndef PINK_INVENTORY_H #define PINK_INVENTORY_H -#include "common/array.h" #include "common/rect.h" -#include "pink/objects/object.h" +#include "pink/utils.h" namespace Pink { - class InventoryItem : public NamedObject { public: virtual void deserialize(Archive &archive); @@ -77,8 +75,7 @@ private: void showNextItem(bool direction); - InventoryItem *_item; - Common::Array<InventoryItem*> _items; + LeadActor *_lead; Actor *_window; @@ -86,6 +83,9 @@ private: Actor *_rightArrow; Actor *_leftArrow; + InventoryItem *_item; + Array<InventoryItem*> _items; + enum State { kIdle = 0, kOpening = 1, |