From cba0fb54f19fabbd71d4d20034dde2660fc3b673 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 23 Aug 2013 09:17:08 +0300 Subject: FULLPIPE: Started CInventory2::rebuildItemRects() implementation --- engines/fullpipe/inventory.h | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'engines/fullpipe/inventory.h') diff --git a/engines/fullpipe/inventory.h b/engines/fullpipe/inventory.h index 0d16909f6a..6193c4a2bb 100644 --- a/engines/fullpipe/inventory.h +++ b/engines/fullpipe/inventory.h @@ -29,7 +29,6 @@ class Scene; class BigPicture; struct InventoryPoolItem { - public: int16 id; int16 pictureObjectNormalId; int16 pictureObjectId1; @@ -68,21 +67,21 @@ typedef Common::Array InventoryItems; class PictureObject; -class InventoryIcon { - PictureObject *_pictureObjectNormal; - InventoryIcon **_icons; - int _numIcons; - int _x1; - int _y1; - int _x2; - int _y2; - int16 _inventoryItemId; - int16 _field_1E; - int _isSelected; - int _isMouseInside; +struct InventoryIcon { + PictureObject *pictureObjectNormal; + InventoryIcon **icons; + int numIcons; + int x1; + int y1; + int x2; + int y2; + int16 inventoryItemId; + int16 field_1E; + int isSelected; + int isMouseInside; }; -typedef Common::Array InventoryIcons; +typedef Common::Array InventoryIcons; class CInventory2 : public CInventory { InventoryItems _inventoryItems; -- cgit v1.2.3