diff options
| author | Colin Snover | 2017-11-14 12:01:37 -0600 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-11-18 22:35:12 +0100 |
| commit | 5ab7a12779af3ade5494fa53a265fe70103f720a (patch) | |
| tree | 0aedc36e8046eae84551d1d203d3169f2f2cadf4 /engines/fullpipe/inventory.h | |
| parent | ac593e045e1410c541d2941f7fdc4cad7bcb3b5a (diff) | |
| download | scummvm-rg350-5ab7a12779af3ade5494fa53a265fe70103f720a.tar.gz scummvm-rg350-5ab7a12779af3ade5494fa53a265fe70103f720a.tar.bz2 scummvm-rg350-5ab7a12779af3ade5494fa53a265fe70103f720a.zip | |
FULLPIPE: Fix memory leaks of inventory icons and items
Diffstat (limited to 'engines/fullpipe/inventory.h')
| -rw-r--r-- | engines/fullpipe/inventory.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/fullpipe/inventory.h b/engines/fullpipe/inventory.h index 9f9b9961c6..2c08c8a9ac 100644 --- a/engines/fullpipe/inventory.h +++ b/engines/fullpipe/inventory.h @@ -66,8 +66,6 @@ struct InventoryItem { InventoryItem(int id, int cnt) : itemId(id), count(cnt) {} }; -typedef Common::Array<InventoryItem *> InventoryItems; - class PictureObject; struct InventoryIcon { @@ -83,11 +81,9 @@ struct InventoryIcon { bool isMouseHover; }; -typedef Common::Array<InventoryIcon *> InventoryIcons; - class Inventory2 : public Inventory { - InventoryItems _inventoryItems; - InventoryIcons _inventoryIcons; + Common::Array<InventoryItem> _inventoryItems; + Common::Array<InventoryIcon> _inventoryIcons; int _selectedId; int _field_48; bool _isInventoryOut; |