diff options
Diffstat (limited to 'include/inventory.h')
| -rw-r--r-- | include/inventory.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/inventory.h b/include/inventory.h index a9a4bcb..cde8d2a 100644 --- a/include/inventory.h +++ b/include/inventory.h @@ -49,13 +49,19 @@ public: int maxStackSize; char* textureLoc; Texturec *tex; + GLuint text; int count; + Item(ITEM_ID i, const char *n, ITEM_TYPE t, float w, float h, int m, const char *tl); GLuint rtex(){ return tex->image[0]; } }; +static Item item[5]= { + #include "../config/items.h" +}; + struct item_t{ int count; ITEM_ID id; @@ -67,14 +73,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 |