aboutsummaryrefslogtreecommitdiffstats
path: root/src/inventory.cpp
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2016-03-04 08:45:53 -0500
committerClyne Sullivan <tullivan99@gmail.com>2016-03-04 08:45:53 -0500
commit5fadac5d0f37f574ca160107d832d11b421ad559 (patch)
treeff9667adf7c3b8d882083a99b7176260afd25349 /src/inventory.cpp
parentfe5ea7fe415857f49d6630f2b0f50e1246c38eee (diff)
entity following
Diffstat (limited to 'src/inventory.cpp')
-rw-r--r--src/inventory.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 203e707..7400f89 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -14,6 +14,8 @@ static vec2 itemLoc;
Mix_Chunk* swordSwing;
static std::vector<Item *> itemMap;
+static GLuint *itemtex;
+void itemDraw(Player *p,uint id);
void items(void){
XMLDocument xml;
@@ -44,7 +46,7 @@ int Inventory::addItem(std::string name,uint count){
return 0;
}
}
- items.push_back((item_t){count,i});
+ items.push_back( item_t { count, i });
return 0;
}
}
@@ -108,9 +110,6 @@ int Inventory::hasItem(std::string name){
return 0;
}
-static GLuint *itemtex;
-void itemDraw(Player *p,uint id);
-
void initInventorySprites(void){
items();