From: Matthias Braun <matze@braunis.de>
Date: Sat, 3 Mar 2007 22:46:12 +0000 (+0000)
Subject: revert earlier target_y changes
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=50af5e6392c4fc472de2f8ee92e146b3d502c504;p=supertux.git

revert earlier target_y changes

SVN-Revision: 4926
---

diff --git a/src/object/camera.cpp b/src/object/camera.cpp
index 51d22d2f5..ed819665d 100644
--- a/src/object/camera.cpp
+++ b/src/object/camera.cpp
@@ -326,14 +326,10 @@ Camera::update_scroll_normal(float elapsed_time)
     // position where he last touched the ground. (this probably needs
     // exceptions for trampolines and similar things in the future)
     float target_y;
-#if 0
     if(player->fall_mode == Player::JUMPING)
       target_y = player->last_ground_y + player->get_bbox().get_height();
     else
       target_y = player->get_bbox().p2.y;
-#endif
-    target_y = player->last_ground_y;
-
     target_y -= SCREEN_HEIGHT * config.target_y;
 
     // delta_y is the distance we'd have to travel to directly reach target_y