diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2015-12-01 07:29:47 -0500 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2015-12-01 07:29:47 -0500 |
| commit | 813f30f8d7e4db971fbb9aab429b489e884ad2e9 (patch) | |
| tree | 706a0dc14485acfb7cb711f20c98f821465f8fe3 /include/inventory.h | |
| parent | af22d85f9a417a94ea75db1878219f8baeba8b73 (diff) | |
| parent | 80bc1b24bcf6862a7fbd3223a3d6988ce4e389e0 (diff) | |
Merge branch 'master' of http://github.com/tcsullivan/gamedev
Diffstat (limited to 'include/inventory.h')
| -rw-r--r-- | include/inventory.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/inventory.h b/include/inventory.h index 2b402fc..8567b8b 100644 --- a/include/inventory.h +++ b/include/inventory.h @@ -74,14 +74,13 @@ private: unsigned int size; // Size of 'item' array item_t *inv; int os = 0; - //struct item_t *item; // An array of the items contained in this inventory. public: unsigned int sel; bool invOpen = false; bool invOpening = false; Inventory(unsigned int s); // Creates an inventory of size 's' - ~Inventory(void); // Free's 'item' + ~Inventory(void); // Free's allocated memory int addItem(ITEM_ID id,unsigned char count); // Add 'count' items with an id of 'id' to the inventory int takeItem(ITEM_ID id,unsigned char count); // Take 'count' items with an id of 'id' from the inventory |