- improved verboseness of badguy in wall error message
[supertux.git] / src / player.cpp
index c6daeae..d6f60e9 100644 (file)
@@ -1,47 +1,52 @@
+//  $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;
-texture_type tux_right[3];
-texture_type tux_left[3];
-texture_type bigtux_right[3];
-texture_type bigtux_left[3];
-texture_type bigtux_right_jump;
-texture_type bigtux_left_jump;
-texture_type ducktux_right;
-texture_type ducktux_left;
-texture_type skidtux_right;
-texture_type skidtux_left;
-texture_type firetux_right[3];
-texture_type firetux_left[3];
-texture_type bigfiretux_right[3];
-texture_type bigfiretux_left[3];
-texture_type bigfiretux_right_jump;
-texture_type bigfiretux_left_jump;
-texture_type duckfiretux_right;
-texture_type duckfiretux_left;
-texture_type skidfiretux_right;
-texture_type skidfiretux_left;
-texture_type cape_right[2];
-texture_type cape_left[2];
-texture_type bigcape_right[2];
-texture_type bigcape_left[2];
+Surface* tux_life;
+
+Sprite* smalltux_gameover;
+Sprite* smalltux_star;
+Sprite* largetux_star;
+
+PlayerSprite smalltux;
+PlayerSprite largetux;
+PlayerSprite firetux;
+
+PlayerKeymap keymap;
+
+PlayerKeymap::PlayerKeymap()
+{
+  keymap.jump  = SDLK_UP;
+  keymap.duck  = SDLK_DOWN;
+  keymap.left  = SDLK_LEFT;
+  keymap.right = SDLK_RIGHT;
+  keymap.fire  = SDLK_LCTRL;
+}
 
 void player_input_init(player_input_type* pplayer_input)
 {
@@ -51,50 +56,46 @@ void player_input_init(player_input_type* pplayer_input)
   pplayer_input->old_fire = UP;
   pplayer_input->right = UP;
   pplayer_input->up = UP;
+  pplayer_input->old_up = UP;
 }
 
 void
 Player::init()
 {
+  Level* plevel = World::current()->get_level();
+
+  holding_something = false;
+
   base.width = 32;
   base.height = 32;
 
   size = SMALL;
   got_coffee = false;
 
-  // FIXME: Make the start position configurable via the levelfile
-  base.x = 100;
-  base.y = 240;
-  
+  base.x = plevel->start_pos_x;
+  base.y = plevel->start_pos_y;
   base.xm = 0;
   base.ym = 0;
-  old_base = base;
+  previous_base = old_base = base;
   dir = RIGHT;
   duck = false;
 
   dying   = DYING_NOT;
   jumping = false;
+  can_jump = true;
 
   frame_main = 0;
   frame_ = 0;
-  lives = 3;
-  score = 0;
-  distros = 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);
+  kick_timer.init(true);
 
-  timer_init(&invincible_timer,true);
-  timer_init(&skidding_timer,true);
-  timer_init(&safe_timer,true);
-  timer_init(&frame_timer,true);
-  physic_init(&hphysic);
-  physic_init(&vphysic);
+  physic.reset();
 }
 
 int
@@ -122,6 +123,8 @@ Player::key_event(SDLKey key, int state)
     }
   else if(key == keymap.fire)
     {
+      if (state == UP)
+        input.old_fire = UP;
       input.fire = state;
       return true;
     }
@@ -133,82 +136,86 @@ void
 Player::level_begin()
 {
   base.x  = 100;
-  base.y  = 240;
+  base.y  = 170;
   base.xm = 0;
   base.ym = 0;
-  old_base = base;
+  previous_base = old_base = base;
+  duck = false;
+
+  dying = DYING_NOT;
 
   player_input_init(&input);
 
-  timer_init(&invincible_timer,true);
-  timer_init(&skidding_timer,true);
-  timer_init(&safe_timer,true);
-  timer_init(&frame_timer,true);
-  physic_init(&hphysic);
-  physic_init(&vphysic);
+  invincible_timer.init(true);
+  skidding_timer.init(true);
+  safe_timer.init(true);
+  frame_timer.init(true);
+
+  physic.reset();
 }
 
 void
-Player::action()
+Player::action(double frame_ratio)
 {
   bool jumped_in_solid = false;
 
-  /* --- HANDLE TUX! --- */
-
-  handle_input();
+  if (input.fire == UP)
+    holding_something = false;
 
   /* Move tux: */
-
   previous_base = base;
 
-  base.x += base.xm * frame_ratio;
-  base.y += base.ym * frame_ratio;
+  /* --- HANDLE TUX! --- */
+  if(dying == DYING_NOT)
+    handle_input();
 
-  collision_swept_object_map(&old_base,&base);
+  physic.apply(frame_ratio, base.x, base.y);
 
-  keep_in_bounds();
+  if(dying == DYING_NOT) 
+    {
+      base_type target = base;
 
-  /* Land: */
+      collision_swept_object_map(&old_base, &base);
 
-  if (!dying)
-    {
+      // Don't accelerate Tux if he is running against a wall
+      if (target.x != base.x)
+        {
+          physic.set_velocity_x(0);
+        }
 
+      // 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( !on_ground())
+      // Land:
+      if (!on_ground())
         {
+          physic.enable_gravity(true);
           if(under_solid())
             {
-              physic_set_state(&vphysic,PH_VT);
-              physic_set_start_vy(&vphysic,0);
+              // fall down
+              physic.set_velocity_y(0);
               jumped_in_solid = true;
             }
-          else
-            {
-              if(!physic_is_set(&vphysic))
-                {
-                  physic_set_state(&vphysic,PH_VT);
-                  physic_set_start_vy(&vphysic,0);
-                }
-            }
-          base.ym = physic_get_velocity(&vphysic);
-
         }
       else
         {
-
           /* Land: */
-
-          if (base.ym > 0)
+          if (physic.get_velocity_y() < 0)
             {
               base.y = (int)(((int)base.y / 32) * 32);
-              base.ym = 0;
+              physic.set_velocity_y(0);
             }
 
-          physic_init(&vphysic);
-
+          physic.enable_gravity(false);
           /* Reset score multiplier (for multi-hits): */
-
-          score_multiplier = 1;
+          player_status.score_multiplier = 1;
         }
 
       if(jumped_in_solid)
@@ -216,71 +223,26 @@ Player::action()
           if (isbrick(base.x, base.y) ||
               isfullbox(base.x, base.y))
             {
-              trygrabdistro(base.x, base.y - 32,BOUNCE);
-              trybumpbadguy(base.x, base.y - 64);
+              World::current()->trygrabdistro(base.x, base.y - 32,BOUNCE);
+              World::current()->trybumpbadguy(base.x, base.y - 64);
 
-              if(size == BIG)
-                trybreakbrick(base.x, base.y);
+              World::current()->trybreakbrick(base.x, base.y, size == SMALL);
 
               bumpbrick(base.x, base.y);
-              tryemptybox(base.x, base.y, RIGHT);
+              World::current()->tryemptybox(base.x, base.y, RIGHT);
             }
 
           if (isbrick(base.x+ 31, base.y) ||
               isfullbox(base.x+ 31, base.y))
             {
-              trygrabdistro(base.x+ 31, base.y - 32,BOUNCE);
-              trybumpbadguy(base.x+ 31, base.y - 64);
+              World::current()->trygrabdistro(base.x+ 31, base.y - 32,BOUNCE);
+              World::current()->trybumpbadguy(base.x+ 31, base.y - 64);
 
               if(size == BIG)
-                trybreakbrick(base.x+ 31, base.y);
+                World::current()->trybreakbrick(base.x+ 31, base.y, size == SMALL);
 
               bumpbrick(base.x+ 31, base.y);
-              tryemptybox(base.x+ 31, base.y, LEFT);
-            }
-
-
-          if(size == SMALL)
-            {
-              /* Get a distro from a brick? */
-              if (shape(base.x, base.y) == 'x' ||
-                  shape(base.x, base.y) == 'y')
-                {
-                  add_bouncy_distro((((int)base.x)
-                                     / 32) * 32,
-                                    ((int)base.y / 32) * 32);
-                  if (counting_distros == false)
-                    {
-                      counting_distros = true;
-                      distro_counter = 100;
-                    }
-
-                  if (distro_counter <= 0)
-                    level_change(&current_level,base.x,base.y - 1, TM_IA, 'a');
-                   
-                  play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
-                  score = score + SCORE_DISTRO;
-                  distros++;
-                }
-              else if (shape(base.x+ 31, base.y) == 'x' ||
-                       shape(base.x+ 31, base.y) == 'y')
-                {
-                  add_bouncy_distro((((int)base.x + 31)
-                                     / 32) * 32,
-                                    ((int)base.y / 32) * 32);
-                  if (counting_distros == false)
-                    {
-                      counting_distros = true;
-                      distro_counter = 100;
-                    }
-
-                  if (distro_counter <= 0)
-                    level_change(&current_level,base.x+ 31, base.y, TM_IA, 'a');
-
-                  play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
-                  score = score + SCORE_DISTRO;
-                  distros++;
-                }
+              World::current()->tryemptybox(base.x+ 31, base.y, LEFT);
             }
         }
 
@@ -296,54 +258,15 @@ Player::action()
               jumping = false;
             }
         }
-
     }
 
-  timer_check(&safe_timer);
-
-
   /* ---- DONE HANDLING TUX! --- */
 
-  /* Handle invincibility timer: */
-
-
-  if (get_current_music() == HERRING_MUSIC && !timer_check(&invincible_timer))
-    {
-      /*
-         no, we are no more invincible
-         or we were not in invincible mode
-         but are we in hurry ?
-       */
-
-
-      if (timer_get_left(&time_left) < TIME_WARNING)
-        {
-          /* yes, we are in hurry
-             stop the herring_song, prepare to play the correct
-             fast level_song !
-           */
-          set_current_music(HURRYUP_MUSIC);
-        }
-      else
-        {
-          set_current_music(LEVEL_MUSIC);
-        }
-
-      /* start playing it */
-      play_current_music();
-    }
-
-  /* Handle skidding: */
-
-  timer_check(&skidding_timer);
-
-  /* End of level? */
-
-  if (base.x >= endpos && endpos != 0)
-    {
-      next_level = 1;
-    }
-
+  // check some timers
+  skidding_timer.check();
+  invincible_timer.check();
+  safe_timer.check();
+  kick_timer.check();
 }
 
 bool
@@ -363,167 +286,146 @@ Player::under_solid()
 }
 
 void
-Player::handle_horizontal_input(int newdir)
+Player::handle_horizontal_input()
 {
-  if ((newdir ? (base.xm < -SKID_XM) : (base.xm > SKID_XM)) && !timer_started(&skidding_timer) &&
-      dir == !newdir && on_ground())
-    {
-      timer_start(&skidding_timer, SKID_TIME);
-
-      play_sound(sounds[SND_SKID], SOUND_CENTER_SPEAKER);
-
-    }
-  dir = newdir;
-
-
-  if ((newdir ? (base.xm < 0) : (base.xm > 0)) && !isice(base.x, base.y + base.height) &&
-      !timer_started(&skidding_timer))
-    {
-      base.xm = 0;
-    }
-
-  if (!duck)
-    {
-      if (dir == newdir)
-        {
-          /* Facing the direction we're jumping?  Go full-speed: */
-
-          if (input.fire == UP)
-            {
-              base.xm = base.xm + ( newdir ? WALK_SPEED : -WALK_SPEED) * frame_ratio;
-
-              if(newdir)
-                {
-                  if (base.xm > MAX_WALK_XM)
-                    base.xm = MAX_WALK_XM;
-                }
-              else
-                {
-                  if (base.xm < -MAX_WALK_XM)
-                    base.xm = -MAX_WALK_XM;
-                }
-            }
-          else if ( input.fire == DOWN)
-            {
-              base.xm = base.xm + ( newdir ? RUN_SPEED : -RUN_SPEED) * frame_ratio;
-
-              if(newdir)
-                {
-                  if (base.xm > MAX_RUN_XM)
-                    base.xm = MAX_RUN_XM;
-                }
-              else
-                {
-                  if (base.xm < -MAX_RUN_XM)
-                    base.xm = -MAX_RUN_XM;
-                }
-            }
-          else
-            {
-              /* Not facing the direction we're jumping?
-                 Go half-speed: */
-
-              base.xm = base.xm + ( newdir ? (WALK_SPEED / 2) : -(WALK_SPEED / 2)) * frame_ratio;
-
-              if(newdir)
-                {
-                  if (base.xm > MAX_WALK_XM / 2)
-                    base.xm = MAX_WALK_XM / 2;
-                }
-              else
-                {
-                  if (base.xm < -MAX_WALK_XM / 2)
-                    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()
 {
-  if(input.up == DOWN)
+  // Press jump key
+  if(input.up == DOWN && can_jump)
     {
       if (on_ground())
         {
-          if(!physic_is_set(&vphysic))
-            {
-              physic_set_state(&vphysic,PH_VT);
-              physic_set_start_vy(&vphysic,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);
-            }
+          // jump higher if we are running
+          if (fabs(physic.get_velocity_x()) > MAX_WALK_XM)
+            physic.set_velocity_y(5.8);
+          else
+            physic.set_velocity_y(5.2);
+
+          --base.y;
+          jumping = true;
+          can_jump = false;
+          if (size == SMALL)
+            play_sound(sounds[SND_JUMP], SOUND_CENTER_SPEAKER);
+          else
+            play_sound(sounds[SND_BIGJUMP], SOUND_CENTER_SPEAKER);
         }
     }
+  // Let go of jump key
   else if(input.up == UP && jumping)
     {
-      if (on_ground())
-        {
-          physic_init(&vphysic);
-          jumping = false;
-        }
-      else
-        {
-          jumping = false;
-          if(physic_is_set(&vphysic))
-            {
-              if(physic_get_velocity(&vphysic) < 0.)
-                {
-                  physic_set_state(&vphysic,PH_VT);
-                  physic_set_start_vy(&vphysic,0);
-                }
-            }
-          else
-            {
-              if(!physic_is_set(&vphysic))
-                {
-                  physic_set_state(&vphysic,PH_VT);
-                }
-            }
-        }
+      jumping = false;
+      if(physic.get_velocity_y() > 0) {
+        physic.set_velocity_y(0);
+      }
+    }
+
+  if ( (issolid(base.x + base.width / 2, base.y + base.height + 64) ||
+        issolid(base.x + 1, base.y + base.height + 64) ||
+        issolid(base.x + base.width - 1, base.y + base.height + 64))
+       && jumping  == false
+       && can_jump == false
+       && input.up == DOWN
+       && input.old_up == UP)
+    {
+      can_jump = true;
     }
+
+  input.old_up = input.up;
 }
 
 void
 Player::handle_input()
 {
-  /* Handle key and joystick state: */
-  if(duck == false)
-    {
-      if (input.right == DOWN && input.left == UP)
-        {
-          handle_horizontal_input(RIGHT);
-        }
-      else if (input.left == DOWN && input.right == UP)
-        {
-          handle_horizontal_input(LEFT);
-        }
-      else
-        {
-          if(base.xm > 0)
-            {
-              base.xm = (int)(base.xm - frame_ratio);
-              if(base.xm < 0)
-                base.xm = 0;
-            }
-          else if(base.xm < 0)
-            {
-              base.xm = (int)(base.xm + frame_ratio);
-              if(base.xm > 0)
-                base.xm = 0;
-            }
-        }
-    }
+  /* Handle horizontal movement: */
+    handle_horizontal_input();
 
   /* Jump/jumping? */
 
-  if ( input.up == DOWN || (input.up == UP && jumping))
+  if (on_ground() && input.up == UP)
+    can_jump = true;
+  if (input.up == DOWN || (input.up == UP && jumping))
     {
       handle_vertical_input();
     }
@@ -532,53 +434,14 @@ Player::handle_input()
 
   if (input.fire == DOWN && input.old_fire == UP && got_coffee)
     {
-      add_bullet(base.x, base.y, base.xm, dir);
+      World::current()->add_bullet(base.x, base.y, physic.get_velocity_x(), dir);
+      input.old_fire = DOWN;
     }
 
-
-  /* Duck! */
-
-  if (input.down == DOWN)
-    {
-      if (size == BIG && duck != true)
-        {
-          duck = true;
-          base.height = 32;
-          base.y += 32;
-        }
-    }
-  else
+  /* tux animations: */
+  if(!frame_timer.check())
     {
-      if (size == BIG && duck)
-        {
-          /* Make sure we're not standing back up into a solid! */
-          base.height = 64;
-          base.y -= 32;
-
-          if (!collision_object_map(&base) /*issolid(base.x + 16, base.y - 16)*/)
-            {
-              duck = false;
-              base.height = 64;
-              old_base.y -= 32;
-              old_base.height = 64;
-            }
-          else
-            {
-              base.height = 32;
-              base.y += 32;
-            }
-        }
-      else
-        {
-          duck = false;
-        }
-    }
-
-  /* (Tux): */
-
-  if(!timer_check(&frame_timer))
-    {
-      timer_start(&frame_timer,25);
+      frame_timer.start(25);
       if (input.right == UP && input.left == UP)
         {
           frame_main = 1;
@@ -597,6 +460,36 @@ Player::handle_input()
         }
     }
 
+  /* Duck! */
+  if (input.down == DOWN && size == BIG && !duck && physic.get_velocity_y() == 0 && on_ground())
+    {
+      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 && on_ground())
+    {
+      duck = false;
+      base.y -= 32;
+      base.height = 64;
+      // changing base size confuses collision otherwise
+      old_base = previous_base = base;                        
+    }
+}
+
+void
+Player::grow()
+{
+  if(size == BIG)
+    return;
+  
+  size = BIG;
+  base.height = 64;
+  base.y -= 32;
+
+  old_base = previous_base = base;
 }
 
 void
@@ -605,26 +498,26 @@ Player::grabdistros()
   /* Grab distros: */
   if (!dying)
     {
-      trygrabdistro(base.x, base.y, NO_BOUNCE);
-      trygrabdistro(base.x+ 31, base.y, NO_BOUNCE);
+      World::current()->trygrabdistro(base.x, base.y, NO_BOUNCE);
+      World::current()->trygrabdistro(base.x+ 31, base.y, NO_BOUNCE);
 
-      trygrabdistro(base.x, base.y + base.height, NO_BOUNCE);
-      trygrabdistro(base.x+ 31, base.y + 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(size == BIG)
         {
-          trygrabdistro(base.x, base.y + base.height / 2, NO_BOUNCE);
-          trygrabdistro(base.x+ 31, base.y + 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(lives < MAX_LIVES)
-        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);
     }
@@ -633,191 +526,93 @@ Player::grabdistros()
 void
 Player::draw()
 {
-  if (!timer_started(&safe_timer) || (global_frame_counter % 2) == 0)
+  if (!safe_timer.started() || (global_frame_counter % 2) == 0)
     {
-      if (size == SMALL)
+      if (dying == DYING_SQUISHED)
         {
-          if (timer_started(&invincible_timer))
+          smalltux_gameover->draw(base.x - scroll_x, base.y);
+        }
+      else
+        {
+          PlayerSprite* sprite;
+          
+          if (size == SMALL)
+            sprite = &smalltux;
+          else if (got_coffee)
+            sprite = &firetux;
+          else
+            sprite = &largetux;
+          
+          if (duck && size != SMALL)
             {
-              /* Draw cape: */
-
               if (dir == RIGHT)
-                {
-                  texture_draw(&cape_right[global_frame_counter % 2],
-                               base.x- scroll_x, base.y);
-                }
-              else
-                {
-                  texture_draw(&cape_left[global_frame_counter % 2],
-                               base.x- scroll_x, base.y);
-                }
+                sprite->duck_right->draw(base.x - scroll_x, base.y);
+              else 
+                sprite->duck_left->draw(base.x - scroll_x, base.y);
             }
-
-
-          if (!got_coffee)
+          else if (skidding_timer.started())
             {
               if (dir == RIGHT)
-                {
-                  texture_draw(&tux_right[frame_], base.x- scroll_x, base.y);
-                }
+                sprite->skid_right->draw(base.x - scroll_x, base.y);
               else
-                {
-                  texture_draw(&tux_left[frame_], base.x- scroll_x, base.y);
-                }
+                sprite->skid_left->draw(base.x - scroll_x, base.y); 
             }
-          else
+          else if (kick_timer.started())
             {
-              /* Tux got coffee! */
-
               if (dir == RIGHT)
-                {
-                  texture_draw(&firetux_right[frame_], base.x- scroll_x, base.y);
-                }
+                sprite->kick_right->draw(base.x - scroll_x, base.y);
               else
-                {
-                  texture_draw(&firetux_left[frame_], base.x- scroll_x, base.y);
-                }
+                sprite->kick_left->draw(base.x - scroll_x, base.y); 
             }
-        }
-      else
-        {
-          if (timer_started(&invincible_timer))
+          else if (physic.get_velocity_y() != 0)
             {
-              /* Draw cape: */
               if (dir == RIGHT)
-                {
-                  texture_draw(&bigcape_right[global_frame_counter % 2],
-                               base.x- scroll_x - 8, base.y);
-                }
+                sprite->jump_right->draw(base.x - scroll_x, base.y);
               else
-                {
-                  texture_draw(&bigcape_left[global_frame_counter % 2],
-                               base.x-scroll_x - 8, base.y);
-                }
+                sprite->jump_left->draw(base.x - scroll_x, base.y);                   
             }
-
-          if (!got_coffee)
+          else
             {
-              if (!duck)
+              if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
                 {
-                  if (!timer_started(&skidding_timer))
-                    {
-                      if (!jumping || base.ym > 0)
-                        {
-                          if (dir == RIGHT)
-                            {
-                              texture_draw(&bigtux_right[frame_],
-                                           base.x- scroll_x - 8, base.y);
-                            }
-                          else
-                            {
-                              texture_draw(&bigtux_left[frame_],
-                                           base.x- scroll_x - 8, base.y);
-                            }
-                        }
-                      else
-                        {
-                          if (dir == RIGHT)
-                            {
-                              texture_draw(&bigtux_right_jump,
-                                           base.x- scroll_x - 8, base.y);
-                            }
-                          else
-                            {
-                              texture_draw(&bigtux_left_jump,
-                                           base.x- scroll_x - 8, base.y);
-                            }
-                        }
-                    }
+                  if (dir == RIGHT)
+                    sprite->stand_right->draw( base.x - scroll_x, base.y);
                   else
-                    {
-                      if (dir == RIGHT)
-                        {
-                          texture_draw(&skidtux_right,
-                                       base.x- scroll_x - 8, base.y);
-                        }
-                      else
-                        {
-                          texture_draw(&skidtux_left,
-                                       base.x- scroll_x - 8, base.y);
-                        }
-                    }
+                    sprite->stand_left->draw( base.x - scroll_x, base.y);
                 }
-              else
+              else // moving
                 {
                   if (dir == RIGHT)
-                    {
-                      texture_draw(&ducktux_right, base.x- scroll_x - 8, base.y - 16);
-                    }
+                    sprite->walk_right->draw(base.x - scroll_x, base.y);
                   else
-                    {
-                      texture_draw(&ducktux_left, base.x- scroll_x - 8, base.y - 16);
-                    }
+                    sprite->walk_left->draw(base.x - scroll_x, base.y);
                 }
             }
-          else
+                      
+          // Draw arm overlay graphics when Tux is holding something
+          if (holding_something && physic.get_velocity_y() == 0)
             {
-              /* Tux has coffee! */
+              if (dir == RIGHT)
+                sprite->grab_right->draw(base.x - scroll_x, base.y);
+              else
+                sprite->grab_left->draw(base.x - scroll_x, base.y);
+            }
 
-              if (!duck)
-                {
-                  if (!timer_started(&skidding_timer))
-                    {
-                      if (!jumping || base.ym > 0)
-                        {
-                          if (dir == RIGHT)
-                            {
-                              texture_draw(&bigfiretux_right[frame_],
-                                           base.x- scroll_x - 8, base.y);
-                            }
-                          else
-                            {
-                              texture_draw(&bigfiretux_left[frame_],
-                                           base.x- scroll_x - 8, base.y);
-                            }
-                        }
-                      else
-                        {
-                          if (dir == RIGHT)
-                            {
-                              texture_draw(&bigfiretux_right_jump,
-                                           base.x- scroll_x - 8, base.y);
-                            }
-                          else
-                            {
-                              texture_draw(&bigfiretux_left_jump,
-                                           base.x- scroll_x - 8, base.y);
-                            }
-                        }
-                    }
-                  else
-                    {
-                      if (dir == RIGHT)
-                        {
-                          texture_draw(&skidfiretux_right,
-                                       base.x- scroll_x - 8, base.y);
-                        }
-                      else
-                        {
-                          texture_draw(&skidfiretux_left,
-                                       base.x- scroll_x - 8, base.y);
-                        }
-                    }
-                }
+          // Draw blinking star overlay
+          if (invincible_timer.started() &&
+             (invincible_timer.get_left() > TUX_INVINCIBLE_TIME_WARNING || global_frame_counter % 3))
+            {
+              if (size == SMALL || duck)
+                smalltux_star->draw(base.x - scroll_x, base.y);
               else
-                {
-                  if (dir == RIGHT)
-                    {
-                      texture_draw(&duckfiretux_right, base.x- scroll_x - 8, base.y - 16);
-                    }
-                  else
-                    {
-                      texture_draw(&duckfiretux_left, base.x- scroll_x - 8, base.y - 16);
-                    }
-                }
+                largetux_star->draw(base.x - scroll_x, base.y);
             }
         }
-    }
+    }     
+  
+  if (debug_mode)
+    fillrect(base.x - scroll_x, base.y, 
+             base.width, base.height, 75,75,75, 150);
 }
 
 void
@@ -829,85 +624,51 @@ Player::collision(void* p_c_object, int c_object)
     {
     case CO_BADGUY:
       pbad_c = (BadGuy*) p_c_object;
-      /* Hurt the player if he just touched it: */
 
+     /* Hurt player if he touches a badguy */
       if (!pbad_c->dying && !dying &&
-          !timer_started(&safe_timer) &&
-          pbad_c->mode != HELD)
+          !safe_timer.started() &&
+          pbad_c->mode != BadGuy::HELD)
         {
-          if (pbad_c->mode == FLAT  && input.fire != DOWN)
+          if (pbad_c->mode == BadGuy::FLAT && input.fire == DOWN
+               && !holding_something)
             {
-              /* Kick: */
-
-              pbad_c->mode = KICK;
-              play_sound(sounds[SND_KICK], SOUND_CENTER_SPEAKER);
-
-              if (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);
+              holding_something = true;
+              pbad_c->mode = BadGuy::HELD;
+              pbad_c->base.y-=8;
             }
-          else if (pbad_c->mode == FLAT && input.fire == DOWN)
+          else if (pbad_c->mode == BadGuy::FLAT)
             {
-              pbad_c->mode = HELD;
-              pbad_c->base.y-=8;
+              // Don't get hurt if we're kicking a flat badguy!
             }
-          else if (pbad_c->mode == KICK)
+          else if (pbad_c->mode == BadGuy::KICK)
             {
-              if (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(&invincible_timer))
-                        {
-                          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->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(&invincible_timer ))
+              if (!invincible_timer.started())
                 {
                   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(25);
                 }
             }
-          score_multiplier++;
+          player_status.score_multiplier++;
         }
       break;
     default:
@@ -919,29 +680,31 @@ Player::collision(void* p_c_object, int c_object)
 /* Kill Player! */
 
 void
-Player::kill(int mode)
+Player::kill(HurtMode mode)
 {
-  base.ym = -5;
-
   play_sound(sounds[SND_HURT], SOUND_CENTER_SPEAKER);
 
-  if (dir == RIGHT)
-    base.xm = -8;
-  else if (dir == LEFT)
-    base.xm = 8;
+  physic.set_velocity_x(0);
 
   if (mode == SHRINK && size == BIG)
     {
       if (got_coffee)
-        got_coffee = false;
-
-      size = SMALL;
-      base.height = 32;
-
-      timer_start(&safe_timer,TUX_SAFE_TIME);
+        {
+          got_coffee = false;
+        }
+      else
+        {
+          size = SMALL;
+          base.height = 32;
+          duck = false;
+        }
+      safe_timer.start(TUX_SAFE_TIME);
     }
   else
     {
+      physic.enable_gravity(true);
+      physic.set_acceleration(0, 0);
+      physic.set_velocity(0, 7);
       dying = DYING_SQUISHED;
     }
 }
@@ -949,16 +712,16 @@ Player::kill(int mode)
 void
 Player::is_dying()
 {
-  base.ym = base.ym + gravity;
-
-  /* He died :^( */
-
-  --lives;
   remove_powerups();
   dying = DYING_NOT;
-  
-  level_begin();
+}
 
+bool Player::is_dead()
+{
+  if(base.y > screen->h)
+    return true;
+  else
+    return false;
 }
 
 /* Remove Tux's power ups */
@@ -973,41 +736,57 @@ Player::remove_powerups()
 void
 Player::keep_in_bounds()
 {
-  /* Keep tux in bounds: */
-  if (base.x< 0)
-    base.x= 0;
-  else if(base.x< scroll_x)
-    base.x= scroll_x;
-  else if (base.x< 160 + scroll_x && scroll_x > 0 && debug_mode)
-    {
-      scroll_x = base.x- 160;
-      /*base.x+= 160;*/
-
-      if(scroll_x < 0)
-        scroll_x = 0;
-
-    }
-  else if (base.x> screen->w / 2 + scroll_x && scroll_x < ((current_level.width * 32) - screen->w))
-    {
-      /* Scroll the screen in past center: */
+  Level* plevel = World::current()->get_level();
 
-      scroll_x = base.x- screen->w / 2;
-      /*base.x= 320 + scroll_x;*/
-
-      if (scroll_x > ((current_level.width * 32) - screen->w))
-        scroll_x = ((current_level.width * 32) - screen->w);
+  /* 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 (base.x> 608 + scroll_x)
-    {
-      /* ... unless there's no more to scroll! */
-
-      /*base.x= 608 + scroll_x;*/
+  else if (base.x < scroll_x)
+    { 
+      base.x = scroll_x;
     }
 
   /* Keep in-bounds, vertically: */
-
   if (base.y > screen->h)
     {
       kill(KILL);
     }
+
+  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(scroll_x < 0)
+        scroll_x = 0;
+    }
+  else
+    {
+      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 //
+