Now the player dies when reaching the bottom of the level, even in Y-scrolling levels.

SVN-Revision: 1250

diff --git a/src/player.cpp b/src/player.cpp
index 9d06c18..e0fd003 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -796,7 +796,8 @@ Player::is_dying()
 
 bool Player::is_dead()
 {
-  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
+  if(base.y > screen->h + scroll_y ||
+      base.x < scroll_x - AUTOSCROLL_DEAD_INTERVAL)  // can happen in auto-scrolling
     return true;
   else
     return false;

diff --git a/src/world.cpp b/src/world.cpp
index 00f3812..f0dbf04 100644 (file)
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -344,7 +344,7 @@ void World::scrolling(double frame_ratio)
 
   float tux_pos_y = tux.base.y + (tux.base.height/2);
 
-  if(level->height > VISIBLE_TILES_Y-1)
+  if(level->height > VISIBLE_TILES_Y-1 && !tux.dying)
     {
     if (scroll_y < tux_pos_y - (screen->h - Y_SPACE))
       scroll_y = tux_pos_y - (screen->h - Y_SPACE);