diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/entities.cpp | 4 | ||||
| -rw-r--r-- | src/inventory.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/entities.cpp b/src/entities.cpp index c2c560a..97b4d35 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -108,7 +108,7 @@ Object::Object(int id):identifier(id){ height = HLINE * 8; maxHealth = health = 1; - tex = new Texturec(1, item[id].textureLoc); + //tex = new Texturec(1, item[id].textureLoc); questObject = false; pickupDialog="\0"; @@ -122,7 +122,7 @@ Object::Object(int id, bool qo, char *pd):identifier(id),questObject(qo),pickupD height = HLINE * 8; maxHealth = health = 1; - tex = new Texturec(1, item[id].textureLoc); + //tex = new Texturec(1, item[id].textureLoc); } diff --git a/src/inventory.cpp b/src/inventory.cpp index 2547760..45d5bce 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" +}; + void itemDraw(Player *p,ITEM_ID id); Inventory::Inventory(unsigned int s){ |