From 64a64dc5c4a1207912263d810a5b94c74cb67fbb Mon Sep 17 00:00:00 2001 From: Matthias Braun Date: Sat, 3 Mar 2007 21:01:55 +0000 Subject: [PATCH] more work on the camera SVN-Revision: 4920 --- data/camera.cfg | 4 ++-- src/object/camera.cpp | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/data/camera.cfg b/data/camera.cfg index 5dfc76c75..d13ecbb6d 100644 --- 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 0e66cbc8b..a0f6bc947 100644 --- 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 -- 2.11.0