diff options
| -rw-r--r-- | config/items.h | 4 | ||||
| -rw-r--r-- | include/inventory.h | 9 | ||||
| -rw-r--r-- | src/inventory.cpp | 4 |
3 files changed, 6 insertions, 11 deletions
diff --git a/config/items.h b/config/items.h index a3ec683..c2e7c95 100644 --- a/config/items.h +++ b/config/items.h @@ -1,4 +1,4 @@ -ID DEBUG_ITEM +ID DEBUG_ITEM NAME "Debug" TYPE TOOL WIDTH 1 @@ -41,4 +41,4 @@ ID SWORD_WOOD HEIGHT HLINE*10 STACKSIZE 1 TEX "assets/items/ITEM_SWORD.png" - STOP
\ No newline at end of file + STOP diff --git a/include/inventory.h b/include/inventory.h index dc5c04e..46053f6 100644 --- a/include/inventory.h +++ b/include/inventory.h @@ -60,18 +60,9 @@ public: }; -static Item item[5]= { - #include "../config/items.h" -}; - struct item_t{ int count; ITEM_ID itmid; - void addC(int c, ITEM_ID i){ - count = c; - itmid = i; - item[itmid].addCount(count); - } } __attribute__((packed)); diff --git a/src/inventory.cpp b/src/inventory.cpp index edc88ff..192a3a4 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -7,6 +7,10 @@ extern Player *player; extern GLuint invUI; +static Item item[5]= { + #include "../config/items.h" +}; + GLuint *ITEM_TEX; void itemDraw(Player *p,ITEM_ID id); |