diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2015-12-03 09:29:46 -0500 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2015-12-03 09:29:46 -0500 |
| commit | 8a342f76c838b8240d6d5fa99c624726e5d589a8 (patch) | |
| tree | 566d2c037860ded5aac06ca333df9f0c55c4ca88 /include | |
| parent | 8a2f08dc35632a9a8e5272a629e0b4770d567c3a (diff) | |
| parent | 3c8140152bcf72eb1d64b580bb9c1e139bcbe191 (diff) | |
Merge branch 'master' of http://github.com/tcsullivan/gamedev
Diffstat (limited to 'include')
| -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 d28a930..2c667a7 100644 --- a/include/inventory.h +++ b/include/inventory.h @@ -39,8 +39,6 @@ enum ITEM_TYPE{ class Item{ protected: public: - friend class Inventory; - friend unsigned int initInventorySprites(void); ITEM_ID id; // ID of the item char *name; ITEM_TYPE type; // What category the item falls under @@ -92,6 +90,7 @@ public: }; void itemUse(void *p); +void initInventorySprites(void); char *getItemTexturePath(ITEM_ID id); #endif // INVENTORY_H |