X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer.cpp;h=9d06c188e021ed61e70ec5a3628e28100525cc3f;hb=76a4f6e86dd5677158c72fc4ae51a7a2e450036f;hp=93b3cfcce2a4f8d6d3e642269c6af9d83bf5f547;hpb=c11b04d0525c1566260b02bacd78fd7faa7be8f1;p=supertux.git

diff --git a/src/player.cpp b/src/player.cpp
index 93b3cfcce..9d06c188e 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -709,7 +709,7 @@ Player::collision(void* p_c_object, int c_object)
       ptramp_c = (Trampoline*) p_c_object;
       
       // Pick up trampoline
-      if (ptramp_c->mode != Trampoline::M_HELD && input.fire == DOWN && !holding_something)
+      if (ptramp_c->mode != Trampoline::M_HELD && input.fire == DOWN && !holding_something && on_ground())
       {
         holding_something = true;
         ptramp_c->mode = Trampoline::M_HELD;
@@ -796,7 +796,7 @@ Player::is_dying()
 
 bool Player::is_dead()
 {
-  if(base.y > screen->h || base.x < scroll_x - AUTOSCROLL_DEAD_INTERVAL)  // last condition can happen in auto-scrolling
+  if(base.y > World::current()->get_level()->height * /*TILE_HEIGHT*/ 32 || base.x < scroll_x - AUTOSCROLL_DEAD_INTERVAL)  // last condition can happen in auto-scrolling
     return true;
   else
     return false;
@@ -822,7 +822,7 @@ Player::check_bounds(bool back_scrolling, bool hor_autoscroll)
     }
 
   /* Keep in-bounds, vertically: */
-  if (base.y > screen->h)
+  if (base.y > World::current()->get_level()->height * /*TILE_HEIGHT*/ 32)
     {
       kill(KILL);
     }