diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2015-11-24 07:43:05 -0500 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2015-11-24 07:43:05 -0500 |
| commit | da95ece60c808ca04dd5c61068d8016a92c6c9b5 (patch) | |
| tree | 1f841831c467d340595248a4f0f010c93a499e73 | |
| parent | 5c1be9978e4c9b18c400c051fc2b083a02b74b7a (diff) | |
items.h include moved
| -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); |