X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer.cpp;h=b3e1831ec78c6a091364d1f16ed3c68b5d23a206;hb=84160722392a024dda42bd86ca9bd85b68c49457;hp=6e33c7441db412289bed2a77025ed9f0ce64239b;hpb=07e39df2d2daf5264c6a2f1692be03e9d5a04fcc;p=supertux.git

diff --git a/src/player.cpp b/src/player.cpp
index 6e33c7441..b3e1831ec 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -1,35 +1,63 @@
+//  $Id$
 //
-// C Implementation: player/tux
+//  SuperTux -  A Jump'n Run
+//  Copyright (C) 2003 Tobias Glaesser <tobi.web@gmx.de>
 //
-// Description:
-//
-//
-// Author: Tobias Glaesser <tobi.web@gmx.de> & Bill Kendrick, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
 //
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
 //
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include <math.h>
 
 #include "gameloop.h"
 #include "globals.h"
 #include "player.h"
 #include "defines.h"
 #include "scene.h"
+#include "tile.h"
+#include "sprite.h"
 #include "screen.h"
 
-texture_type tux_life,
-tux_right[3],  tux_left[3],
-bigtux_right[3],  bigtux_left[3],
-bigtux_right_jump,  bigtux_left_jump,
-ducktux_right,  ducktux_left,
-skidtux_right,  skidtux_left,
-firetux_right[3],  firetux_left[3],
-bigfiretux_right[3],  bigfiretux_left[3],
-bigfiretux_right_jump,  bigfiretux_left_jump,
-duckfiretux_right,  duckfiretux_left,
-skidfiretux_right,  skidfiretux_left,
-cape_right[2],  cape_left[2],
-bigcape_right[2],  bigcape_left[2];
+Surface* tux_life;
+std::vector<Surface*> tux_right;
+std::vector<Surface*> tux_left;
+Surface* smalltux_jump_left;
+Surface* smalltux_jump_right;
+Surface* smalltux_stand_left;
+Surface* smalltux_stand_right;
+
+Sprite* bigtux_right;
+Sprite* bigtux_left;
+Sprite* bigtux_right_jump;
+Sprite* bigtux_left_jump;
+Sprite* ducktux_right;
+Sprite* ducktux_left;
+Surface* skidtux_right;
+Surface* skidtux_left;
+Surface* firetux_right[3];
+Surface* firetux_left[3];
+Surface* bigfiretux_right[3];
+Surface* bigfiretux_left[3];
+Surface* bigfiretux_right_jump;
+Surface* bigfiretux_left_jump;
+Surface* duckfiretux_right;
+Surface* duckfiretux_left;
+Surface* skidfiretux_right;
+Surface* skidfiretux_left;
+Surface* cape_right[2];
+Surface* cape_left[2];
+Surface* bigcape_right[2];
+Surface* bigcape_left[2];
 
 void player_input_init(player_input_type* pplayer_input)
 {
@@ -41,256 +69,203 @@ void player_input_init(player_input_type* pplayer_input)
   pplayer_input->up = UP;
 }
 
-void player_init(player_type* pplayer)
+void
+Player::init()
 {
-  pplayer->base.width = 32;
-  pplayer->base.height = 32;
-
-  pplayer->size = SMALL;
-  pplayer->got_coffee = false;
-
-  pplayer->base.x = 0;
-  pplayer->base.y = 240;
-  pplayer->base.xm = 0;
-  pplayer->base.ym = 0;
-  pplayer->old_base = pplayer->base;
-  pplayer->dir = RIGHT;
-  pplayer->duck = false;
-
-  pplayer->dying   = DYING_NOT;
-  pplayer->jumping = false;
-
-  pplayer->frame_main = 0;
-  pplayer->frame = 0;
-  pplayer->lives = 3;
-  pplayer->score = 0;
-  pplayer->distros = 0;
-
-  player_input_init(&pplayer->input);
-
-  pplayer->keymap.jump  = SDLK_UP;
-  pplayer->keymap.duck  = SDLK_DOWN;
-  pplayer->keymap.left  = SDLK_LEFT;
-  pplayer->keymap.right = SDLK_RIGHT;
-  pplayer->keymap.fire  = SDLK_LCTRL;
-
-  timer_init(&pplayer->invincible_timer,true);
-  timer_init(&pplayer->skidding_timer,true);
-  timer_init(&pplayer->safe_timer,true);
-  timer_init(&pplayer->frame_timer,true);
-  physic_init(&pplayer->hphysic);
-  physic_init(&pplayer->vphysic);
+  Level* plevel = World::current()->get_level();
+
+  base.width = 32;
+  base.height = 32;
+
+  size = SMALL;
+  got_coffee = false;
+
+  base.x = plevel->start_pos_x;
+  base.y = plevel->start_pos_y;
+  base.xm = 0;
+  base.ym = 0;
+  previous_base = old_base = base;
+  dir = RIGHT;
+  duck = false;
+
+  dying   = DYING_NOT;
+  jumping = false;
+
+  frame_main = 0;
+  frame_ = 0;
+  
+  player_input_init(&input);
+
+  keymap.jump  = SDLK_UP;
+  keymap.duck  = SDLK_DOWN;
+  keymap.left  = SDLK_LEFT;
+  keymap.right = SDLK_RIGHT;
+  keymap.fire  = SDLK_LCTRL;
+
+  invincible_timer.init(true);
+  skidding_timer.init(true);
+  safe_timer.init(true);
+  frame_timer.init(true);
+
+  physic.reset();
 }
 
-int player_key_event(player_type* pplayer, SDLKey key, int state)
+int
+Player::key_event(SDLKey key, int state)
 {
-  if(key == pplayer->keymap.right)
+  if(key == keymap.right)
     {
-      pplayer->input.right = state;
+      input.right = state;
       return true;
     }
-  else if(key == pplayer->keymap.left)
+  else if(key == keymap.left)
     {
-      pplayer->input.left = state;
+      input.left = state;
       return true;
     }
-  else if(key == pplayer->keymap.jump)
+  else if(key == keymap.jump)
     {
-      pplayer->input.up = state;
+      input.up = state;
       return true;
     }
-  else if(key == pplayer->keymap.duck)
+  else if(key == keymap.duck)
     {
-      pplayer->input.down = state;
+      input.down = state;
       return true;
     }
-  else if(key == pplayer->keymap.fire)
+  else if(key == keymap.fire)
     {
-      pplayer->input.fire = state;
+      input.fire = state;
       return true;
     }
   else
     return false;
 }
 
-void player_level_begin(player_type* pplayer)
+void
+Player::level_begin()
 {
-  pplayer->base.x = 0;
-  pplayer->base.y = 240;
-  pplayer->base.xm = 0;
-  pplayer->base.ym = 0;
-  pplayer->old_base = pplayer->base;
-
-  player_input_init(&pplayer->input);
-
-  timer_init(&pplayer->invincible_timer,true);
-  timer_init(&pplayer->skidding_timer,true);
-  timer_init(&pplayer->safe_timer,true);
-  timer_init(&pplayer->frame_timer,true);
-  physic_init(&pplayer->hphysic);
-  physic_init(&pplayer->vphysic);
+  base.x  = 100;
+  base.y  = 170;
+  base.xm = 0;
+  base.ym = 0;
+  previous_base = old_base = base;
+  duck = false;
+
+  dying = DYING_NOT;
+
+  player_input_init(&input);
+
+  invincible_timer.init(true);
+  skidding_timer.init(true);
+  safe_timer.init(true);
+  frame_timer.init(true);
+
+  physic.reset();
 }
 
-void player_action(player_type* pplayer)
+void
+Player::action(double frame_ratio)
 {
   bool jumped_in_solid = false;
 
   /* --- HANDLE TUX! --- */
 
-  player_input(pplayer);
+  if(dying == DYING_NOT)
+    handle_input();
 
   /* Move tux: */
-
-  pplayer->previous_base = pplayer->base;
-
-  pplayer->base.x += pplayer->base.xm * frame_ratio;
-  pplayer->base.y += pplayer->base.ym * frame_ratio;
-
-  collision_swept_object_map(&pplayer->old_base,&pplayer->base);
-
-  player_keep_in_bounds(pplayer);
-
-  /* Land: */
-
-  if (!pplayer->dying)
+  previous_base = base;
+
+  physic.apply(frame_ratio, base.x, base.y);
+  if(dying == DYING_NOT) {
+      collision_swept_object_map(&old_base, &base);
+      // special exception for cases where we're stuck under tiles after
+      // being ducked. In this case we drift out
+      if(!duck && on_ground() && old_base.x == base.x && old_base.y == base.y
+              && collision_object_map(&base)) {
+          base.x += frame_ratio * WALK_SPEED * (dir ? 1 : -1);
+          previous_base = old_base = base;
+      }
+      keep_in_bounds();
+  }
+
+  if (dying == DYING_NOT)
     {
+      /* Land: */
 
 
-      if( !player_on_ground(pplayer))
+      if( !on_ground())
         {
-          if(player_under_solid(pplayer))
+          physic.enable_gravity(true);
+          if(under_solid())
             {
-              physic_set_state(&pplayer->vphysic,PH_VT);
-              physic_set_start_vy(&pplayer->vphysic,0);
+              // fall down
+              physic.set_velocity(physic.get_velocity_x(), 0);
               jumped_in_solid = true;
             }
-          else
-            {
-              if(!physic_is_set(&pplayer->vphysic))
-                {
-                  physic_set_state(&pplayer->vphysic,PH_VT);
-                  physic_set_start_vy(&pplayer->vphysic,0);
-                }
-            }
-          pplayer->base.ym = physic_get_velocity(&pplayer->vphysic);
-
         }
       else
         {
-
           /* Land: */
-
-          if (pplayer->base.ym > 0)
+          if (physic.get_velocity_y() < 0)
             {
-              pplayer->base.y = (int)(((int)pplayer->base.y / 32) * 32);
-              pplayer->base.ym = 0;
+              base.y = (int)(((int)base.y / 32) * 32);
+              physic.set_velocity(physic.get_velocity_x(), 0);
             }
 
-          physic_init(&pplayer->vphysic);
-
+          physic.enable_gravity(false);
           /* Reset score multiplier (for multi-hits): */
-
-          score_multiplier = 1;
+          player_status.score_multiplier = 1;
         }
 
-      if(jumped_in_solid == true)
+      if(jumped_in_solid)
         {
-
-          if (isbrick(pplayer->base.x, pplayer->base.y) ||
-              isfullbox(pplayer->base.x, pplayer->base.y))
+          if (isbrick(base.x, base.y) ||
+              isfullbox(base.x, base.y))
             {
-              trygrabdistro(pplayer->base.x, pplayer->base.y - 32,BOUNCE);
-              trybumpbadguy(pplayer->base.x, pplayer->base.y - 64);
+              World::current()->trygrabdistro(base.x, base.y - 32,BOUNCE);
+              World::current()->trybumpbadguy(base.x, base.y - 64);
 
-              if(pplayer->size == BIG)
-                trybreakbrick(pplayer->base.x, pplayer->base.y);
+              World::current()->trybreakbrick(base.x, base.y, size == SMALL);
 
-              bumpbrick(pplayer->base.x, pplayer->base.y);
-              tryemptybox(pplayer->base.x, pplayer->base.y, RIGHT);
+              bumpbrick(base.x, base.y);
+              World::current()->tryemptybox(base.x, base.y, RIGHT);
             }
 
-          if (isbrick(pplayer->base.x+ 31, pplayer->base.y) ||
-              isfullbox(pplayer->base.x+ 31, pplayer->base.y))
+          if (isbrick(base.x+ 31, base.y) ||
+              isfullbox(base.x+ 31, base.y))
             {
-              trygrabdistro(pplayer->base.x+ 31, pplayer->base.y - 32,BOUNCE);
-              trybumpbadguy(pplayer->base.x+ 31, pplayer->base.y - 64);
+              World::current()->trygrabdistro(base.x+ 31, base.y - 32,BOUNCE);
+              World::current()->trybumpbadguy(base.x+ 31, base.y - 64);
 
-              if(pplayer->size == BIG)
-                trybreakbrick(pplayer->base.x+ 31, pplayer->base.y);
+              if(size == BIG)
+                World::current()->trybreakbrick(base.x+ 31, base.y, size == SMALL);
 
-              bumpbrick(pplayer->base.x+ 31, pplayer->base.y);
-              tryemptybox(pplayer->base.x+ 31, pplayer->base.y, LEFT);
-            }
-
-
-          if(pplayer->size == SMALL)
-            {
-              /* Get a distro from a brick? */
-
-              if (shape(pplayer->base.x, pplayer->base.y) == 'x' ||
-                  shape(pplayer->base.x, pplayer->base.y) == 'y')
-                {
-                  add_bouncy_distro((((int)pplayer->base.x)
-                                     / 32) * 32,
-                                    ((int)pplayer->base.y / 32) * 32);
-                  if (counting_distros == false)
-                    {
-                      counting_distros = true;
-                      distro_counter = 100;
-                    }
-
-                  if (distro_counter <= 0)
-                    level_change(&current_level,pplayer->base.x,pplayer->base.y - 1, 'a');
-
-                  play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
-                  score = score + SCORE_DISTRO;
-                  distros++;
-                }
-              else if (shape(pplayer->base.x+ 31, pplayer->base.y) == 'x' ||
-                       shape(pplayer->base.x+ 31, pplayer->base.y) == 'y')
-                {
-                  add_bouncy_distro((((int)pplayer->base.x + 31)
-                                     / 32) * 32,
-                                    ((int)pplayer->base.y / 32) * 32);
-                  if (counting_distros == false)
-                    {
-                      counting_distros = true;
-                      distro_counter = 100;
-                    }
-
-                  if (distro_counter <= 0)
-                    level_change(&current_level,pplayer->base.x+ 31, pplayer->base.y, 'a');
-
-                  play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
-                  score = score + SCORE_DISTRO;
-                  distros++;
-                }
+              bumpbrick(base.x+ 31, base.y);
+              World::current()->tryemptybox(base.x+ 31, base.y, LEFT);
             }
         }
 
-      player_grabdistros(pplayer);
-      if(jumped_in_solid == true)
+      grabdistros();
+
+      if (jumped_in_solid)
         {
-          ++pplayer->base.y;
-          ++pplayer->old_base.y;
-          if(player_on_ground(pplayer))
+          ++base.y;
+          ++old_base.y;
+          if(on_ground())
             {
               /* Make sure jumping is off. */
-              pplayer->jumping = false;
+              jumping = false;
             }
         }
-
     }
 
-  timer_check(&pplayer->safe_timer);
-
 
   /* ---- DONE HANDLING TUX! --- */
 
   /* Handle invincibility timer: */
-
-
-  if (get_current_music() == HERRING_MUSIC && !timer_check(&pplayer->invincible_timer))
+  if (get_current_music() == HERRING_MUSIC && !invincible_timer.check())
     {
       /*
          no, we are no more invincible
@@ -298,8 +273,8 @@ void player_action(player_type* pplayer)
          but are we in hurry ?
        */
 
-
-      if (timer_get_left(&time_left) < TIME_WARNING)
+      // FIXME: Move this to gamesession
+      if (GameSession::current()->time_left.get_left() < TIME_WARNING)
         {
           /* yes, we are in hurry
              stop the herring_song, prepare to play the correct
@@ -316,492 +291,387 @@ void player_action(player_type* pplayer)
       play_current_music();
     }
 
-  /* Handle skidding: */
-
-  timer_check(&pplayer->skidding_timer);
-
-  /* End of level? */
-
-  if (pplayer->base.x >= endpos && endpos != 0)
-    {
-      next_level = 1;
-    }
-
+  // check some timers
+  skidding_timer.check();
+  invincible_timer.check();
+  safe_timer.check();
 }
 
-bool player_on_ground(player_type *pplayer)
+bool
+Player::on_ground()
 {
-  return ( issolid(pplayer->base.x + pplayer->base.width / 2, pplayer->base.y + pplayer->base.height) ||
-           issolid(pplayer->base.x + 1, pplayer->base.y + pplayer->base.height) ||
-           issolid(pplayer->base.x + pplayer->base.width - 1, pplayer->base.y + pplayer->base.height)  );
+  return ( issolid(base.x + base.width / 2, base.y + base.height) ||
+           issolid(base.x + 1, base.y + base.height) ||
+           issolid(base.x + base.width - 1, base.y + base.height)  );
 }
 
-bool player_under_solid(player_type *pplayer)
+bool
+Player::under_solid()
 {
-  return ( issolid(pplayer->base.x + pplayer->base.width / 2, pplayer->base.y) ||
-           issolid(pplayer->base.x + 1, pplayer->base.y) ||
-           issolid(pplayer->base.x + pplayer->base.width - 1, pplayer->base.y)  );
+  return ( issolid(base.x + base.width / 2, base.y) ||
+           issolid(base.x + 1, base.y) ||
+           issolid(base.x + base.width - 1, base.y)  );
 }
 
-void player_handle_horizontal_input(player_type *pplayer, int dir)
+void
+Player::handle_horizontal_input()
 {
-
-  if ((dir ? (pplayer->base.xm < -SKID_XM) : (pplayer->base.xm > SKID_XM)) && !timer_started(&pplayer->skidding_timer) &&
-      pplayer->dir == !dir && player_on_ground(pplayer))
-    {
-      timer_start(&pplayer->skidding_timer, SKID_TIME);
-
-      play_sound(sounds[SND_SKID], SOUND_CENTER_SPEAKER);
-
-    }
-  pplayer->dir = dir;
-
-
-  if ((dir ? (pplayer->base.xm < 0) : (pplayer->base.xm > 0)) && !isice(pplayer->base.x, pplayer->base.y + pplayer->base.height) &&
-      !timer_started(&pplayer->skidding_timer))
-    {
-      pplayer->base.xm = 0;
-    }
-
-  if (!pplayer->duck)
-    {
-      if (pplayer->dir == dir)
-        {
-          /* Facing the direction we're jumping?  Go full-speed: */
-
-          if (pplayer->input.fire == UP)
-            {
-              pplayer->base.xm = pplayer->base.xm + ( dir ? WALK_SPEED : -WALK_SPEED) * frame_ratio;
-
-              if(dir)
-                {
-                  if (pplayer->base.xm > MAX_WALK_XM)
-                    pplayer->base.xm = MAX_WALK_XM;
-                }
-              else
-                {
-                  if (pplayer->base.xm < -MAX_WALK_XM)
-                    pplayer->base.xm = -MAX_WALK_XM;
-                }
-            }
-          else if ( pplayer->input.fire == DOWN)
-            {
-              pplayer->base.xm = pplayer->base.xm + ( dir ? RUN_SPEED : -RUN_SPEED) * frame_ratio;
-
-              if(dir)
-                {
-                  if (pplayer->base.xm > MAX_RUN_XM)
-                    pplayer->base.xm = MAX_RUN_XM;
-                }
-              else
-                {
-                  if (pplayer->base.xm < -MAX_RUN_XM)
-                    pplayer->base.xm = -MAX_RUN_XM;
-                }
-            }
-          else
-            {
-              /* Not facing the direction we're jumping?
-              Go half-speed: */
-
-              pplayer->base.xm = pplayer->base.xm + ( dir ? (WALK_SPEED / 2) : -(WALK_SPEED / 2)) * frame_ratio;
-
-              if(dir)
-                {
-                  if (pplayer->base.xm > MAX_WALK_XM / 2)
-                    pplayer->base.xm = MAX_WALK_XM / 2;
-                }
-              else
-                {
-                  if (pplayer->base.xm < -MAX_WALK_XM / 2)
-                    pplayer->base.xm = -MAX_WALK_XM / 2;
-                }
-            }
-        }
-
-    }
+  float vx = physic.get_velocity_x();
+  float vy = physic.get_velocity_y();
+  float ax = physic.get_acceleration_x();
+  float ay = physic.get_acceleration_y();
+
+  float dirsign = 0;
+  if(input.left == DOWN && input.right == UP && (!duck || physic.get_velocity_y() != 0)) {
+      dir = LEFT;
+      dirsign = -1;
+  } else if(input.left == UP && input.right == DOWN && (!duck || physic.get_velocity_y() != 0)) {
+      dir = RIGHT;
+      dirsign = 1;
+  }
+
+  if (input.fire == UP) {
+      ax = dirsign * WALK_ACCELERATION_X;
+      // limit speed
+      if(vx >= MAX_WALK_XM && dirsign > 0) {
+        vx = MAX_WALK_XM;
+        ax = 0;
+      } else if(vx <= -MAX_WALK_XM && dirsign < 0) {
+        vx = -MAX_WALK_XM;
+        ax = 0;
+      }
+  } else {
+      ax = dirsign * RUN_ACCELERATION_X;
+      // limit speed
+      if(vx >= MAX_RUN_XM && dirsign > 0) {
+        vx = MAX_RUN_XM;
+        ax = 0;
+      } else if(vx <= -MAX_RUN_XM && dirsign < 0) {
+        vx = -MAX_RUN_XM;
+        ax = 0;
+      }
+  }
+
+  // we can reach WALK_SPEED without any acceleration
+  if(dirsign != 0 && fabs(vx) < WALK_SPEED) {
+    vx = dirsign * WALK_SPEED;
+  }
+
+  // changing directions?
+  if(on_ground() && ((vx < 0 && dirsign >0) || (vx>0 && dirsign<0))) {
+      if(fabs(vx)>SKID_XM && !skidding_timer.check()) {
+          skidding_timer.start(SKID_TIME);
+          play_sound(sounds[SND_SKID], SOUND_CENTER_SPEAKER);
+          ax *= 2.5;
+      } else {
+          ax *= 2;
+      }
+  }
+
+  // we get slower when not pressing any keys
+  if(dirsign == 0) {
+      if(fabs(vx) < WALK_SPEED) {
+          vx = 0;
+          ax = 0;
+      } else if(vx < 0) {
+          ax = WALK_ACCELERATION_X * 1.5;
+      } else {
+          ax = WALK_ACCELERATION_X * -1.5;
+      }
+  }
+
+  // if we're on ice slow down acceleration or deceleration
+  if (isice(base.x, base.y + base.height))
+  {
+    /* the acceleration/deceleration rate on ice is inversely proportional to
+     * the current velocity.
+     */
+
+    // increasing 1 will increase acceleration/deceleration rate
+    // decreasing 1 will decrease acceleration/deceleration rate
+    //  must stay above zero, though
+    if (ax != 0) ax *= 1 / fabs(vx);
+  }
+
+  physic.set_velocity(vx, vy);
+  physic.set_acceleration(ax, ay);
 }
 
-void player_handle_vertical_input(player_type *pplayer)
+void
+Player::handle_vertical_input()
 {
-  if(pplayer->input.up == DOWN)
+  if(input.up == DOWN)
     {
-      if (player_on_ground(pplayer))
+      if (on_ground())
         {
-          if(!physic_is_set(&pplayer->vphysic))
-            {
-              physic_set_state(&pplayer->vphysic,PH_VT);
-              physic_set_start_vy(&pplayer->vphysic,5.5);
-              --pplayer->base.y;
-              pplayer->jumping = true;
-              if (pplayer->size == SMALL)
-                play_sound(sounds[SND_JUMP], SOUND_CENTER_SPEAKER);
-              else
-                play_sound(sounds[SND_BIGJUMP], SOUND_CENTER_SPEAKER);
-            }
+          // jump
+          physic.set_velocity(physic.get_velocity_x(), 5.5);
+          --base.y;
+          jumping = true;
+          if (size == SMALL)
+            play_sound(sounds[SND_JUMP], SOUND_CENTER_SPEAKER);
+          else
+            play_sound(sounds[SND_BIGJUMP], SOUND_CENTER_SPEAKER);
         }
     }
-  else if(pplayer->input.up == UP && pplayer->jumping == true)
+  else if(input.up == UP && jumping)
     {
-      if (player_on_ground(pplayer))
-        {
-          physic_init(&pplayer->vphysic);
-          pplayer->jumping = false;
-        }
-      else
-        {
-          pplayer->jumping = false;
-          if(physic_is_set(&pplayer->vphysic))
-            {
-              if(physic_get_velocity(&pplayer->vphysic) < 0.)
-                {
-                  physic_set_state(&pplayer->vphysic,PH_VT);
-                  physic_set_start_vy(&pplayer->vphysic,0);
-                }
-            }
-          else
-            {
-              if(!physic_is_set(&pplayer->vphysic))
-                {
-                  physic_set_state(&pplayer->vphysic,PH_VT);
-                }
-            }
-        }
+      jumping = false;
+      if(physic.get_velocity_y() > 0) {
+        physic.set_velocity(physic.get_velocity_x(), 0);
+      }
     }
 }
 
-void player_input(player_type *pplayer)
+void
+Player::handle_input()
 {
-  /* Handle key and joystick state: */
-
-  if(pplayer->duck == false)
-    {
-      if (pplayer->input.right == DOWN && pplayer->input.left == UP)
-        {
-          player_handle_horizontal_input(pplayer,RIGHT);
-        }
-      else if (pplayer->input.left == DOWN && pplayer->input.right == UP)
-        {
-          player_handle_horizontal_input(pplayer,LEFT);
-        }
-      else
-        {
-          if(pplayer->base.xm > 0)
-            {
-              pplayer->base.xm = (int)(pplayer->base.xm - frame_ratio);
-              if(pplayer->base.xm < 0)
-                pplayer->base.xm = 0;
-            }
-          else if(pplayer->base.xm < 0)
-            {
-              pplayer->base.xm = (int)(pplayer->base.xm + frame_ratio);
-              if(pplayer->base.xm > 0)
-                pplayer->base.xm = 0;
-            }
-        }
-    }
+  /* Handle horizontal movement: */
+    handle_horizontal_input();
 
   /* Jump/jumping? */
 
-  if ( pplayer->input.up == DOWN || (pplayer->input.up == UP && pplayer->jumping == true))
+  if ( input.up == DOWN || (input.up == UP && jumping))
     {
-      player_handle_vertical_input(pplayer);
+      handle_vertical_input();
     }
 
   /* Shoot! */
 
-  if (pplayer->input.fire == DOWN && pplayer->input.old_fire == UP && pplayer->got_coffee)
+  if (input.fire == DOWN && input.old_fire == UP && got_coffee)
     {
-      add_bullet(pplayer->base.x, pplayer->base.y, pplayer->base.xm, pplayer->dir);
+      World::current()->add_bullet(base.x, base.y, physic.get_velocity_x(), dir);
     }
 
-
-  /* Duck! */
-
-  if (pplayer->input.down == DOWN)
+  /* tux animations: */
+  if(!frame_timer.check())
     {
-      if (pplayer->size == BIG && pplayer->duck != true)
+      frame_timer.start(25);
+      if (input.right == UP && input.left == UP)
         {
-          pplayer->duck = true;
-          pplayer->base.height = 32;
-          pplayer->base.y += 32;
-        }
-    }
-  else
-    {
-      if (pplayer->size == BIG && pplayer->duck == true)
-        {
-          /* Make sure we're not standing back up into a solid! */
-          pplayer->base.height = 64;
-          pplayer->base.y -= 32;
-
-          if (!collision_object_map(&pplayer->base) /*issolid(pplayer->base.x + 16, pplayer->base.y - 16)*/)
-            {
-              pplayer->duck = false;
-              pplayer->base.height = 64;
-              pplayer->old_base.y -= 32;
-              pplayer->old_base.height = 64;
-            }
-          else
-            {
-              pplayer->base.height = 32;
-              pplayer->base.y += 32;
-            }
+          frame_main = 1;
+          frame_ = 1;
         }
       else
         {
-          pplayer->duck = false;
-        }
-    }
+          if ((input.fire == DOWN && (global_frame_counter % 2) == 0) ||
+              (global_frame_counter % 4) == 0)
+            frame_main = (frame_main + 1) % 4;
 
-  /* (Tux): */
+          frame_ = frame_main;
 
-  if(!timer_check(&pplayer->frame_timer))
-    {
-      timer_start(&pplayer->frame_timer,25);
-      if (pplayer->input.right == UP && pplayer->input.left == UP)
-        {
-          pplayer->frame_main = 1;
-          pplayer->frame = 1;
-        }
-      else
-        {
-          if ((pplayer->input.fire == DOWN && (frame % 2) == 0) ||
-              (frame % 4) == 0)
-            pplayer->frame_main = (pplayer->frame_main + 1) % 4;
-
-          pplayer->frame = pplayer->frame_main;
-
-          if (pplayer->frame == 3)
-            pplayer->frame = 1;
+          if (frame_ == 3)
+            frame_ = 1;
         }
     }
 
+  /* Duck! */
+  if (input.down == DOWN && size == BIG && !duck && physic.get_velocity_y() == 0)
+    {
+      duck = true;
+      base.height = 32;                             
+      base.y += 32;
+      // changing base size confuses collision otherwise
+      old_base = previous_base = base;
+    }
+  else if(input.down == UP && size == BIG && duck && physic.get_velocity_y() == 0)
+    {
+      duck = false;
+      base.y -= 32;
+      base.height = 64;
+      old_base = previous_base = base;
+    }
 }
 
-void player_grabdistros(player_type *pplayer)
+void
+Player::grabdistros()
 {
   /* Grab distros: */
-  if (!pplayer->dying)
+  if (!dying)
     {
-      trygrabdistro(pplayer->base.x, pplayer->base.y, NO_BOUNCE);
-      trygrabdistro(pplayer->base.x+ 31, pplayer->base.y, NO_BOUNCE);
+      World::current()->trygrabdistro(base.x, base.y, NO_BOUNCE);
+      World::current()->trygrabdistro(base.x+ 31, base.y, NO_BOUNCE);
 
-      trygrabdistro(pplayer->base.x, pplayer->base.y + pplayer->base.height, NO_BOUNCE);
-      trygrabdistro(pplayer->base.x+ 31, pplayer->base.y + pplayer->base.height, NO_BOUNCE);
+      World::current()->trygrabdistro(base.x, base.y + base.height, NO_BOUNCE);
+      World::current()->trygrabdistro(base.x+ 31, base.y + base.height, NO_BOUNCE);
 
-      if(pplayer->size == BIG)
+      if(size == BIG)
         {
-          trygrabdistro(pplayer->base.x, pplayer->base.y + pplayer->base.height / 2, NO_BOUNCE);
-          trygrabdistro(pplayer->base.x+ 31, pplayer->base.y + pplayer->base.height / 2, NO_BOUNCE);
+          World::current()->trygrabdistro(base.x, base.y + base.height / 2, NO_BOUNCE);
+          World::current()->trygrabdistro(base.x+ 31, base.y + base.height / 2, NO_BOUNCE);
         }
 
     }
 
-
   /* Enough distros for a One-up? */
-
-  if (distros >= DISTROS_LIFEUP)
+  if (player_status.distros >= DISTROS_LIFEUP)
     {
-      distros = distros - DISTROS_LIFEUP;
-      if(pplayer->lives < MAX_LIVES)
-        pplayer->lives++;
+      player_status.distros = player_status.distros - DISTROS_LIFEUP;
+      if(player_status.lives < MAX_LIVES)
+        ++player_status.lives;
       /*We want to hear the sound even, if MAX_LIVES is reached*/
       play_sound(sounds[SND_LIFEUP], SOUND_CENTER_SPEAKER);
     }
 }
 
-void player_draw(player_type* pplayer)
+void
+Player::draw()
 {
-  if (!timer_started(&pplayer->safe_timer) || (frame % 2) == 0)
+  if (!safe_timer.started() || (global_frame_counter % 2) == 0)
     {
-      if (pplayer->size == SMALL)
+      if (size == SMALL)
         {
-          if (timer_started(&pplayer->invincible_timer))
+          if (invincible_timer.started())
             {
               /* Draw cape: */
 
-              if (pplayer->dir == RIGHT)
-                {
-                  texture_draw(&cape_right[frame % 2],
-                               pplayer->base.x- scroll_x, pplayer->base.y);
-                }
+              if (dir == RIGHT)
+                cape_right[global_frame_counter % 2]->draw(base.x- scroll_x, base.y);
               else
-                {
-                  texture_draw(&cape_left[frame % 2],
-                               pplayer->base.x- scroll_x, pplayer->base.y);
-                }
+                cape_left[global_frame_counter % 2]->draw(base.x- scroll_x, base.y);
             }
 
 
-          if (!pplayer->got_coffee)
+          if (!got_coffee)
             {
-              if (pplayer->dir == RIGHT)
+              if (physic.get_velocity_y() != 0)
                 {
-                  texture_draw(&tux_right[pplayer->frame], pplayer->base.x- scroll_x, pplayer->base.y);
+                  if (dir == RIGHT)
+                    smalltux_jump_right->draw( base.x - scroll_x, base.y - 10);
+                  else
+                    smalltux_jump_left->draw( base.x - scroll_x, base.y - 10);                   
                 }
               else
                 {
-                  texture_draw(&tux_left[pplayer->frame], pplayer->base.x- scroll_x, pplayer->base.y);
+                  if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
+                    {
+                      if (dir == RIGHT)
+                        smalltux_stand_right->draw( base.x - scroll_x, base.y - 9);
+                      else
+                        smalltux_stand_left->draw( base.x - scroll_x, base.y - 9);
+                    }
+                  else // moving
+                    {
+                      if (dir == RIGHT)
+                        tux_right[(global_frame_counter/2) % tux_right.size()]->draw(base.x - scroll_x, base.y - 9);
+                      else
+                        tux_left[(global_frame_counter/2) % tux_left.size()]->draw(base.x - scroll_x, base.y - 9);
+                    }
                 }
             }
           else
             {
               /* Tux got coffee! */
 
-              if (pplayer->dir == RIGHT)
+              if (dir == RIGHT)
                 {
-                  texture_draw(&firetux_right[pplayer->frame], pplayer->base.x- scroll_x, pplayer->base.y);
+                  firetux_right[frame_]->draw( base.x- scroll_x, base.y);
                 }
               else
                 {
-                  texture_draw(&firetux_left[pplayer->frame], pplayer->base.x- scroll_x, pplayer->base.y);
+                  firetux_left[frame_]->draw( base.x- scroll_x, base.y);
                 }
             }
         }
       else
         {
-          if (timer_started(&pplayer->invincible_timer))
+          if (invincible_timer.started())
             {
-              /* Draw cape: */
-
-              if (pplayer->dir == RIGHT)
-                {
-                  texture_draw(&bigcape_right[frame % 2],
-                               pplayer->base.x- scroll_x - 8, pplayer->base.y);
-                }
+              float capex = base.x + (base.width - bigcape_right[0]->w) / 2;
+              capex -= scroll_x;
+              float capey = base.y + (base.height - bigcape_right[0]->h) / 2;
+                
+              /* Draw cape (just not in ducked mode since that looks silly): */
+              if (dir == RIGHT)
+                bigcape_right[global_frame_counter % 2]->draw(capex, capey);
               else
-                {
-                  texture_draw(&bigcape_left[frame % 2],
-                               pplayer->base.x-scroll_x - 8, pplayer->base.y);
-                }
+                bigcape_left[global_frame_counter % 2]->draw(capex, capey);
             }
 
-          if (!pplayer->got_coffee)
+          if (!got_coffee)
             {
-              if (!pplayer->duck)
+              if (!duck)
                 {
-                  if (!timer_started(&pplayer->skidding_timer))
+                  if (!skidding_timer.started())
                     {
-                      if (!pplayer->jumping || pplayer->base.ym > 0)
+                      if (physic.get_velocity_y() == 0)
                         {
-                          if (pplayer->dir == RIGHT)
-                            {
-                              texture_draw(&bigtux_right[pplayer->frame],
-                                           pplayer->base.x- scroll_x - 8, pplayer->base.y);
-                            }
+                          if (dir == RIGHT)
+                            bigtux_right->draw(base.x - scroll_x, base.y);
                           else
-                            {
-                              texture_draw(&bigtux_left[pplayer->frame],
-                                           pplayer->base.x- scroll_x - 8, pplayer->base.y);
-                            }
+                            bigtux_left->draw(base.x - scroll_x, base.y);
                         }
                       else
                         {
-                          if (pplayer->dir == RIGHT)
-                            {
-                              texture_draw(&bigtux_right_jump,
-                                           pplayer->base.x- scroll_x - 8, pplayer->base.y);
-                            }
+                          if (dir == RIGHT)
+                            bigtux_right_jump->draw(base.x - scroll_x, base.y);
                           else
-                            {
-                              texture_draw(&bigtux_left_jump,
-                                           pplayer->base.x- scroll_x - 8, pplayer->base.y);
-                            }
+                            bigtux_left_jump->draw(base.x - scroll_x, base.y);
                         }
                     }
                   else
                     {
-                      if (pplayer->dir == RIGHT)
-                        {
-                          texture_draw(&skidtux_right,
-                                       pplayer->base.x- scroll_x - 8, pplayer->base.y);
-                        }
+                      if (dir == RIGHT)
+                        skidtux_right->draw(base.x - scroll_x - 8, base.y);
                       else
-                        {
-                          texture_draw(&skidtux_left,
-                                       pplayer->base.x- scroll_x - 8, pplayer->base.y);
-                        }
+                        skidtux_left->draw(base.x - scroll_x - 8, base.y);
                     }
                 }
               else
                 {
-                  if (pplayer->dir == RIGHT)
-                    {
-                      texture_draw(&ducktux_right, pplayer->base.x- scroll_x - 8, pplayer->base.y - 16);
-                    }
+                  if (dir == RIGHT)
+                    ducktux_right->draw(base.x - scroll_x, base.y);
                   else
-                    {
-                      texture_draw(&ducktux_left, pplayer->base.x- scroll_x - 8, pplayer->base.y - 16);
-                    }
+                    ducktux_left->draw(base.x - scroll_x, base.y);
                 }
             }
           else
             {
               /* Tux has coffee! */
-
-              if (!pplayer->duck)
+              if (!duck)
                 {
-                  if (!timer_started(&pplayer->skidding_timer))
+                  if (!skidding_timer.started())
                     {
-                      if (!pplayer->jumping || pplayer->base.ym > 0)
+                      if (!jumping || physic.get_velocity_y() > 0)
                         {
-                          if (pplayer->dir == RIGHT)
-                            {
-                              texture_draw(&bigfiretux_right[pplayer->frame],
-                                           pplayer->base.x- scroll_x - 8, pplayer->base.y);
-                            }
+                          if (dir == RIGHT)
+                            bigfiretux_right[frame_]->draw(base.x- scroll_x - 8, base.y);
                           else
-                            {
-                              texture_draw(&bigfiretux_left[pplayer->frame],
-                                           pplayer->base.x- scroll_x - 8, pplayer->base.y);
-                            }
+                            bigfiretux_left[frame_]->draw(base.x- scroll_x - 8, base.y);
                         }
                       else
                         {
-                          if (pplayer->dir == RIGHT)
-                            {
-                              texture_draw(&bigfiretux_right_jump,
-                                           pplayer->base.x- scroll_x - 8, pplayer->base.y);
-                            }
+                          if (dir == RIGHT)
+                            bigfiretux_right_jump->draw(base.x- scroll_x - 8, base.y);
                           else
-                            {
-                              texture_draw(&bigfiretux_left_jump,
-                                           pplayer->base.x- scroll_x - 8, pplayer->base.y);
-                            }
+                            bigfiretux_left_jump->draw(base.x- scroll_x - 8, base.y);
                         }
                     }
                   else
                     {
-                      if (pplayer->dir == RIGHT)
-                        {
-                          texture_draw(&skidfiretux_right,
-                                       pplayer->base.x- scroll_x - 8, pplayer->base.y);
-                        }
+                      if (dir == RIGHT)
+                        skidfiretux_right->draw(base.x- scroll_x - 8, base.y);
                       else
-                        {
-                          texture_draw(&skidfiretux_left,
-                                       pplayer->base.x- scroll_x - 8, pplayer->base.y);
-                        }
+                        skidfiretux_left->draw(base.x- scroll_x - 8, base.y);
                     }
                 }
               else
                 {
-                  if (pplayer->dir == RIGHT)
-                    {
-                      texture_draw(&duckfiretux_right, pplayer->base.x- scroll_x - 8, pplayer->base.y - 16);
-                    }
+                  if (dir == RIGHT)
+                    duckfiretux_right->draw( base.x- scroll_x - 8, base.y - 16);
                   else
-                    {
-                      texture_draw(&duckfiretux_left, pplayer->base.x- scroll_x - 8, pplayer->base.y - 16);
-                    }
+                    duckfiretux_left->draw( base.x- scroll_x - 8, base.y - 16);
                 }
             }
         }
     }
+
+  if (debug_mode)
+    fillrect(base.x - scroll_x, base.y, 32, 32, 75,75,75, 150);
 }
 
-void player_collision(player_type* pplayer, void* p_c_object, int c_object)
+void
+Player::collision(void* p_c_object, int c_object)
 {
   BadGuy* pbad_c = NULL;
 
@@ -809,85 +679,49 @@ void player_collision(player_type* pplayer, void* p_c_object, int c_object)
     {
     case CO_BADGUY:
       pbad_c = (BadGuy*) p_c_object;
-      /* Hurt the player if he just touched it: */
 
-      if (!pbad_c->dying && !pplayer->dying &&
-          !timer_started(&pplayer->safe_timer) &&
+     /* Hurt player if he touches a badguy */
+      if (!pbad_c->dying && !dying &&
+          !safe_timer.started() &&
           pbad_c->mode != HELD)
         {
-          if (pbad_c->mode == FLAT  && pplayer->input.fire != DOWN)
-            {
-              /* Kick: */
-
-              pbad_c->mode = KICK;
-              play_sound(sounds[SND_KICK], SOUND_CENTER_SPEAKER);
-
-              if (pplayer->base.x < pbad_c->base.x + (pbad_c->base.width/2))
-                {
-                  pbad_c->dir = RIGHT;
-                  pbad_c->base.x = pbad_c->base.x + 16;
-                }
-              else
-                {
-                  pbad_c->dir = LEFT;
-                  pbad_c->base.x = pbad_c->base.x - 32;
-                }
-
-              timer_start(&pbad_c->timer,5000);
-            }
-          else if (pbad_c->mode == FLAT && pplayer->input.fire == DOWN)
+          if (pbad_c->mode == FLAT && input.fire == DOWN)
             {
               pbad_c->mode = HELD;
               pbad_c->base.y-=8;
             }
+          else if (pbad_c->mode == FLAT)
+            {
+              // Don't get hurt if we're kicking a flat badguy!
+            }
           else if (pbad_c->mode == KICK)
             {
-              if (pplayer->base.y < pbad_c->base.y - 16 &&
-                  timer_started(&pbad_c->timer))
+              /* Hurt if you get hit by kicked laptop: */
+              if (!invincible_timer.started())
                 {
-                  /* Step on (stop being kicked) */
-
-                  pbad_c->mode = FLAT;
-                  play_sound(sounds[SND_STOMP], SOUND_CENTER_SPEAKER);
-                  timer_start(&pbad_c->timer, 10000);
+                  kill(SHRINK);
                 }
               else
                 {
-                  /* Hurt if you get hit by kicked laptop: */
-
-                  if (timer_started(&pbad_c->timer))
-                    {
-                      if (!timer_started(&pplayer->invincible_timer))
-                        {
-                          player_kill(pplayer,SHRINK);
-                        }
-                      else
-                        {
-                          pbad_c->dying = DYING_FALLING;
-                          play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
-                          add_score(pbad_c->base.x - scroll_x,
-                                    pbad_c->base.y,
-                                    25 * score_multiplier);
-                        }
-                    }
+                   pbad_c->dying = DYING_FALLING;
+                   play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
+                   World::current()->add_score(pbad_c->base.x - scroll_x,
+                                               pbad_c->base.y,
+                                               25 * player_status.score_multiplier);
                 }
             }
           else
             {
-              if (!timer_started(&pplayer->invincible_timer ))
+              if (!invincible_timer.started())
                 {
-                  player_kill(pplayer,SHRINK);
+                  kill(SHRINK);
                 }
               else
                 {
-                  pbad_c->dying = DYING_FALLING;
-                  play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
-                  add_score(pbad_c->base.x - scroll_x,
-                            pbad_c->base.y,
-                            25 * score_multiplier);
+                  pbad_c->kill_me();
                 }
             }
-          score_multiplier++;
+          player_status.score_multiplier++;
         }
       break;
     default:
@@ -898,92 +732,111 @@ void player_collision(player_type* pplayer, void* p_c_object, int c_object)
 
 /* Kill Player! */
 
-void player_kill(player_type* pplayer, int mode)
+void
+Player::kill(int mode)
 {
-  pplayer->base.ym = -5;
-
   play_sound(sounds[SND_HURT], SOUND_CENTER_SPEAKER);
 
-  if (pplayer->dir == RIGHT)
-    pplayer->base.xm = -8;
-  else if (pplayer->dir == LEFT)
-    pplayer->base.xm = 8;
+  physic.set_velocity(0, physic.get_velocity_y());
 
-  if (mode == SHRINK && pplayer->size == BIG)
+  if (mode == SHRINK && size == BIG)
     {
-      if (pplayer->got_coffee)
-        pplayer->got_coffee = false;
+      if (got_coffee)
+        got_coffee = false;
 
-      pplayer->size = SMALL;
-      pplayer->base.height = 32;
+      size = SMALL;
+      base.height = 32;
+      duck = false;
 
-      timer_start(&pplayer->safe_timer,TUX_SAFE_TIME);
+      safe_timer.start(TUX_SAFE_TIME);
     }
   else
     {
-      pplayer->dying = DYING_SQUISHED;
+      physic.enable_gravity(true);
+      physic.set_acceleration(0, 0);
+      physic.set_velocity(0, 7);
+      dying = DYING_SQUISHED;
     }
 }
 
-void player_dying(player_type *pplayer)
+void
+Player::is_dying()
 {
-  pplayer->base.ym = pplayer->base.ym + gravity;
-
-  /* He died :^( */
-
-  --pplayer->lives;
-  player_remove_powerups(pplayer);
-  pplayer->dying = DYING_NOT;
-
-  player_level_begin(pplayer);
+  remove_powerups();
+  dying = DYING_NOT;
+}
 
+bool Player::is_dead()
+{
+  if(base.y > screen->h)
+    return true;
+  else
+    return false;
 }
 
 /* Remove Tux's power ups */
-void player_remove_powerups(player_type* pplayer)
+void
+Player::remove_powerups()
 {
-  pplayer->got_coffee = false;
-  pplayer->size = SMALL;
-  pplayer->base.height = 32;
+  got_coffee = false;
+  size = SMALL;
+  base.height = 32;
 }
 
-void player_keep_in_bounds(player_type* pplayer)
+void
+Player::keep_in_bounds()
 {
-  /* Keep tux in bounds: */
-  if (pplayer->base.x< 0)
-    pplayer->base.x= 0;
-  else if(pplayer->base.x< scroll_x)
-    pplayer->base.x= scroll_x;
-  else if (pplayer->base.x< 160 + scroll_x && scroll_x > 0 && debug_mode == true)
-    {
-      scroll_x = pplayer->base.x- 160;
-      /*pplayer->base.x+= 160;*/
-
-      if(scroll_x < 0)
-        scroll_x = 0;
+  Level* plevel = World::current()->get_level();
 
+  /* Keep tux in bounds: */
+  if (base.x < 0)
+    { // Lock Tux to the size of the level, so that he doesn't fall of
+      // on the left side
+      base.x = 0;
     }
-  else if (pplayer->base.x> screen->w / 2 + scroll_x && scroll_x < ((current_level.width * 32) - screen->w))
-    {
-      /* Scroll the screen in past center: */
-
-      scroll_x = pplayer->base.x- screen->w / 2;
-      /*pplayer->base.x= 320 + scroll_x;*/
-
-      if (scroll_x > ((current_level.width * 32) - screen->w))
-        scroll_x = ((current_level.width * 32) - screen->w);
+  else if (base.x < scroll_x)
+    { 
+      base.x = scroll_x;
     }
-  else if (pplayer->base.x> 608 + scroll_x)
-    {
-      /* ... unless there's no more to scroll! */
 
-      /*pplayer->base.x= 608 + scroll_x;*/
+  /* Keep in-bounds, vertically: */
+  if (base.y > screen->h)
+    {
+      kill(KILL);
     }
 
-  /* Keep in-bounds, vertically: */
+  int scroll_threshold = screen->w/2 - 80;
+  if (debug_mode)
+    {
+      scroll_x += screen->w/2;
+      // Backscrolling for debug mode
+      if (scroll_x < base.x - 80)
+        scroll_x = base.x - 80;
+      else if (scroll_x > base.x + 80)
+        scroll_x = base.x + 80;
+      scroll_x -= screen->w/2;
 
-  if (pplayer->base.y > screen->h)
+      if(scroll_x < 0)
+        scroll_x = 0;
+    }
+  else
     {
-      player_kill(&tux,KILL);
+      if (base.x > scroll_threshold + scroll_x
+          && scroll_x < ((World::current()->get_level()->width * 32) - screen->w))
+        {
+          // FIXME: Scrolling needs to be handled by a seperate View
+          // class, doing it as a player huck is ugly
+          
+          // Scroll the screen in past center:
+          scroll_x = base.x - scroll_threshold;
+          
+          // Lock the scrolling to the levelsize, so that we don't
+          // scroll over the right border
+          if (scroll_x > 32 * plevel->width - screen->w)
+            scroll_x = 32 * plevel->width - screen->w;
+        }
     }
 }
+
+// EOF //
+