diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2015-10-15 09:07:05 -0400 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2015-10-15 09:07:05 -0400 |
| commit | ef74ae83db1d3049e4e890df77d25ac6e1f7719f (patch) | |
| tree | 15b01f3ac4f4f2ef06e6fe463ce5e053b26a02e2 /src/entities.cpp | |
| parent | 5adabb82443b9b10b25cdd8b4db3cfe890e36fa1 (diff) | |
Added glew and shader loading
Diffstat (limited to 'src/entities.cpp')
| -rw-r--r-- | src/entities.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/entities.cpp b/src/entities.cpp index 0457ba1..f9bd015 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -109,10 +109,10 @@ void Entity::draw(void){ //draws the entities texState-=1; if(texState==0)up=true; } - }if(ground == 0){ - glBindTexture(GL_TEXTURE_2D, texture[1]); } - else if(vel.x != 0){ + if(ground == 0){ + glBindTexture(GL_TEXTURE_2D, texture[1]); + }else if(vel.x != 0){ switch(texState){ case 0: glBindTexture(GL_TEXTURE_2D,texture[1]); @@ -156,7 +156,7 @@ void Entity::draw(void){ //draws the entities ui::setFontSize(16); ui::putText(((SCREEN_WIDTH / 2 ) + loc.x) - 125, SCREEN_HEIGHT - ui::fontSize, "Health: %d/%d",health,maxHealth); glColor3ub(255,0,0); - glRectf((SCREEN_WIDTH / 2 + loc.x) - 125, SCREEN_HEIGHT - 32, ((SCREEN_WIDTH / 2 + loc.x) - 125) + (int)((int)(health / maxHealth) * 100), SCREEN_HEIGHT - 32 + 12); + glRectf((SCREEN_WIDTH / 2 + loc.x) - 125, SCREEN_HEIGHT - 32, ((SCREEN_WIDTH / 2 + loc.x) - 125) + (((float)health / (float)maxHealth) * 100), SCREEN_HEIGHT - 32 + 12); } if(near){ ui::setFontSize(14); |