merge

1 files changed, 4 insertions, 1 deletions

diff --git a/src/ui.cpp b/src/ui.cpp
index b827b43..7979138 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -568,7 +568,7 @@ namespace ui {
 				hub.y-=fontSize*1.15;
 				glRectf(hub.x,
 						hub.y,
-						hub.x+(player->health/player->maxHealth)*130,
+						hub.x+(player->health/player->maxHealth?player->maxHealth:1)*130,
 						hub.y+12);
 			}
 			
@@ -814,6 +814,9 @@ DONE:
 				case SDLK_RIGHT:
 					player->inv->sel++;
 					break;
+				case SDLK_f:
+					
+					break;
 				default:
 					break;
 				}