diff options
Diffstat (limited to 'src/inventory.cpp')
| -rw-r--r-- | src/inventory.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp index cd8bb71..d75a1bf 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -66,7 +66,7 @@ int Inventory::takeItem(std::string name,uint count){ } if(id == 999999) - return -1; + return -1; //if no such item exists /* * Inventory lookup @@ -142,12 +142,13 @@ const char *getItemTexturePath(std::string name){ return NULL; } -Texturec *getItemTexture(std::string name){ +GLuint getItemTexture(std::string name){ for(auto &i : itemMap){ if(i->name == name) - return i->tex; + return Texture::loadTexture(i->texloc); } - return NULL; + + return Texture::loadTexture("assets/items/ITEM_TEST.png"); } float getItemWidth(std::string name){ |