aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/pet_control/pet_inventory_glyphs.h
diff options
context:
space:
mode:
authorPaul Gilbert2017-07-28 20:00:10 -0400
committerPaul Gilbert2017-07-28 20:00:10 -0400
commit83b46ee3ccc28f602049ed62ce89d119af1d17df (patch)
tree1eb4adeaa34aad83ff2dd29a05106e2575da5a11 /engines/titanic/pet_control/pet_inventory_glyphs.h
parentc1ed17ce861d7434f5b1aabb70a54cef250b6378 (diff)
downloadscummvm-rg350-83b46ee3ccc28f602049ed62ce89d119af1d17df.tar.gz
scummvm-rg350-83b46ee3ccc28f602049ed62ce89d119af1d17df.tar.bz2
scummvm-rg350-83b46ee3ccc28f602049ed62ce89d119af1d17df.zip
TITANIC: Further cleanup of inventory glyphs
Diffstat (limited to 'engines/titanic/pet_control/pet_inventory_glyphs.h')
-rw-r--r--engines/titanic/pet_control/pet_inventory_glyphs.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/titanic/pet_control/pet_inventory_glyphs.h b/engines/titanic/pet_control/pet_inventory_glyphs.h
index e35ecc00f7..906bf18888 100644
--- a/engines/titanic/pet_control/pet_inventory_glyphs.h
+++ b/engines/titanic/pet_control/pet_inventory_glyphs.h
@@ -65,14 +65,14 @@ private:
void reposition(const Point &pt);
public:
CGameObject *_item;
- int _field34;
- CGameObject *_background;
- CGameObject *_image;
+ bool _active;
+ CGameObject *_repeated;
+ CGameObject *_singular;
public:
- CPetInventoryGlyph() : _item(nullptr), _field34(1),
- _background(nullptr), _image(nullptr) {}
- CPetInventoryGlyph(CCarry *item, int val) : _item(item),
- _field34(val), _background(nullptr), _image(nullptr) {}
+ CPetInventoryGlyph() : _item(nullptr), _active(true),
+ _repeated(nullptr), _singular(nullptr) {}
+ CPetInventoryGlyph(CCarry *item, bool active) : _item(item),
+ _active(active), _repeated(nullptr), _singular(nullptr) {}
/**
* Called when the PET area is entered
@@ -117,7 +117,7 @@ public:
/**
* Return whether the glyph is currently valid
*/
- virtual bool isValid() const { return _item && _background; }
+ virtual bool isValid() const { return _item && _repeated; }
/**
* Returns the object associated with the glyph