Fix fall damage

1 files changed, 4 insertions, 4 deletions

diff --git a/src/player.odin b/src/player.odin
index 592552d..4e1fe90 100644
--- a/src/player.odin
+++ b/src/player.odin
@@ -221,17 +221,15 @@ _default_state :: proc(dt: f32) {
   if .Down in new_collisions && .Down not_in collisions {
     // just landed
     height := phys.get_position(player.body).y
-
     distance_fallen := height - player.fall_height
+
     if distance_fallen > MAX_SAFE_FALL_HEIGHT {
       distance_fallen -= MAX_SAFE_FALL_HEIGHT
       damage := (distance_fallen / MAX_FALL_HEIGHT) * PLAYER_MAX_FALL_DAMAGE
+      damage = math.clamp(damage, 0, PLAYER_MAX_FALL_DAMAGE)
       player_take_damage(damage, {0, 0})
     }
   }
-
-  // cam_pos := phys.get_position(player.body) - SCREEN_SIZE * 0.5
-  // fw.set_camera_pos(cam_pos)
 }
 
 @(private = "file")
@@ -375,6 +373,8 @@ _change_rooms :: proc() {
     new_pos := pos + diff
     phys.set_position(player.body, new_pos)
 
+    player.fall_height += diff.y
+
     if diff.y > 0 {
       vel := phys.get_velocity(player.body)
       vel.y = -PLAYER_JUMP_FORCE