Added texture support and basic textures

1 files changed, 3 insertions, 2 deletions

diff --git a/src/main.cpp b/src/main.cpp
index f4e3943..9b16085 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -163,6 +163,9 @@ void render(){
 	glColor3ub(0,0,0);
 	player->near=true;
 	player->draw();						// Draw the player
+	player->inv->draw();
+
+	ui::draw();							// Draw any UI elements if they need to be
 
 	if(ui::debug){
 		static unsigned int debugDiv=0;
@@ -180,8 +183,6 @@ void render(){
 					fps,d,player->ground,SCREEN_WIDTH,SCREEN_HEIGHT,entity.size(),player->loc.x,rndy,player->qh.current.size());
 	}
 
-	ui::draw();							// Draw any UI elements if they need to be
-
 	for(int i=0;i<=entity.size();i++){
 		//entity[i]->draw();
 		entity[i]->loc.x += entity[i]->vel.x * deltaTime;