aboutsummaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
authordrumsetmonkey <abelleisle@roadrunner.com>2015-10-13 08:50:54 -0400
committerdrumsetmonkey <abelleisle@roadrunner.com>2015-10-13 08:50:54 -0400
commit3d375c17982f9f459c82364117687d145540fe75 (patch)
tree47638e15f9d3f26f8a43c89c4566d4794b08ba4d /main.cpp
parent8f2f66a7b90f97911bbffce3ccc8c7ad01ba61ad (diff)
Added rabbit, and player health
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/main.cpp b/main.cpp
index 386d419..afcaa57 100644
--- a/main.cpp
+++ b/main.cpp
@@ -134,7 +134,7 @@ static float debugY=0;
void mainLoop(void){
static unsigned int debugDiv=0;
- unsigned int i,
+ static unsigned int i,
prevTime = 0,
currentTime = 0;
@@ -201,7 +201,6 @@ void render(){
player->near=true; // Ensure the player's name is always drawn
currentWorld->draw(player); // Draw the world & the player
- glColor3ub(255,255,255); // Draw the player's inventory
player->inv->draw(); //
ui::draw(); // Draw any UI elements if they need to be