-Changed drawing model. Everything is handled through DrawingContext now and

[supertux.git] / src / camera.cpp

diff --git a/src/camera.cpp b/src/camera.cpp
index bef202d..e8cd4f5 100644 (file)
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -25,6 +25,7 @@
 #include "player.h"
 #include "level.h"
 #include "globals.h"
+#include "world.h"
 
 Camera::Camera(Player* newplayer, Level* newlevel)
   : player(newplayer), level(newlevel), do_backscrolling(true),
@@ -40,10 +41,10 @@ Camera::~Camera()
 {
 }
 
-void
-Camera::set_translation(const Vector& newtranslation)
+const Vector&
+Camera::get_translation() const
 {
-  translation = newtranslation;
+  return World::current()->context.get_translation();
 }
 
 void
@@ -128,10 +129,12 @@ static const float max_speed_y = 1.4;
 void
 Camera::action(float elapsed_time)
 {
+  translation = World::current()->context.get_translation();
   if(mode == NORMAL)
     scroll_normal(elapsed_time);
   else if(mode == AUTOSCROLL)
     scroll_autoscroll(elapsed_time);
+  World::current()->context.set_translation(translation);
 }
 
 void
@@ -202,10 +205,10 @@ Camera::scroll_normal(float elapsed_time)
       || (player->dir == ::RIGHT && scrollchange == LEFT))
     scrollchange = NONE;
   // when in left 1/3rd of screen scroll left
-  if(player->base.x < translation.x + screen->w/3 && do_backscrolling)
+  if(player->base.x < translation.x + screen->w/3 - 16 && do_backscrolling)
     scrollchange = LEFT;
   // scroll right when in right 1/3rd of screen
-  else if(player->base.x > translation.x + screen->w/3*2)
+  else if(player->base.x > translation.x + screen->w/3*2 + 16)
     scrollchange = RIGHT;
 
   // calculate our scroll target depending on scroll mode