more work on the camera

SVN-Revision: 4920

diff --git a/data/camera.cfg b/data/camera.cfg
index 5dfc76c..d13ecbb 100644 (file)
--- a/data/camera.cfg
+++ b/data/camera.cfg
@@ -15,11 +15,11 @@
 
   ; Specify where to keep tux in fixed camera mode
   (target-x 0.5)
-  (target-y 0.66)
+  (target-y 0.5)
 
   ; Speed is limited to these for the Yoshi cam
   (max-speed-x 80)
-  (max-speed-y 80)
+  (max-speed-y 100)
 
   ; Used in YI camera to adjust to max_speed relatively to player speed
   (dynamic-max-speed-x 1.0)

diff --git a/src/object/camera.cpp b/src/object/camera.cpp
index 0e66cbc..a0f6bc9 100644 (file)
--- a/src/object/camera.cpp
+++ b/src/object/camera.cpp
@@ -315,10 +315,14 @@ 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