fix stupid bug in camera code, tweak camera settings a bit more

SVN-Revision: 4917

diff --git a/data/camera.cfg b/data/camera.cfg
index eacedd2..0220294 100644 (file)
--- a/data/camera.cfg
+++ b/data/camera.cfg
@@ -15,7 +15,7 @@
 
   ; Specify where to keep tux in fixed camera mode
   (target-x 0.5)
-  (target-y 0.5)
+  (target-y 0.66)
 
   ; Speed is limited to these for the Yoshi cam
   (max-speed-x 80)
@@ -32,7 +32,7 @@
   (clamp-y 0)
 
   ; Keep tux here when he runs in YI mode
-  (edge-x 0.3)
+  (edge-x 0.28)
   ; If YI camera is in no-scrollmode it will go to scrollmode again if tux
   ; reaches this part of the screen, make sure this value is bigger than edge-x
   ; to avoid sudden camera stops

diff --git a/src/object/camera.cpp b/src/object/camera.cpp
index 0232d1f..2f9f499 100644 (file)
--- a/src/object/camera.cpp
+++ b/src/object/camera.cpp
@@ -406,7 +406,7 @@ Camera::update_scroll_normal(float elapsed_time)
     }
 
     LEFTEND = SCREEN_WIDTH * config.edge_x;
-    RIGHTEND = SCREEN_HEIGHT * (1-config.edge_x);
+    RIGHTEND = SCREEN_WIDTH * (1-config.edge_x);
 
     // calculate our scroll target depending on scroll mode
     float target_x;