X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer.cpp;h=86bb7d2e0bf9cd2178549a82fa83957766be0520;hb=5023c5b34da1b979a9bd829824662960bd3a7ff9;hp=790d42bdb54b020319b85ea248d830e9116f5dc3;hpb=403f2652505e814b645892bffaf89a584984f9b8;p=supertux.git

diff --git a/src/player.cpp b/src/player.cpp
index 790d42bdb..86bb7d2e0 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -17,36 +17,56 @@
 //  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 <cmath>
 #include <iostream>
 #include <cassert>
+
 #include "gameloop.h"
-#include "globals.h"
+#include "app/globals.h"
 #include "player.h"
 #include "defines.h"
 #include "scene.h"
 #include "tile.h"
-#include "sprite.h"
-#include "screen.h"
-
+#include "special/sprite.h"
+#include "sector.h"
+#include "tilemap.h"
+#include "camera.h"
+#include "gameobjs.h"
+#include "resources.h"
+#include "interactive_object.h"
+#include "video/screen.h"
+
+// behavior definitions:
+#define TILES_FOR_BUTTJUMP 3
+// animation times (in ms):
+#define SHOOTING_TIME 320
+// others stuff:
 #define AUTOSCROLL_DEAD_INTERVAL 300
 
+// time before idle animation starts
+#define IDLE_TIME 2500
+
+// growing animation
+Surface* growingtux_left[GROWING_FRAMES];
+Surface* growingtux_right[GROWING_FRAMES];
+
 Surface* tux_life;
 
 Sprite* smalltux_gameover;
 Sprite* smalltux_star;
-Sprite* largetux_star;
+Sprite* bigtux_star;
 
-PlayerSprite smalltux;
-PlayerSprite largetux;
-PlayerSprite icetux;
-PlayerSprite firetux;
+TuxBodyParts* small_tux;
+TuxBodyParts* big_tux;
+TuxBodyParts* fire_tux;
+TuxBodyParts* ice_tux;
 
 PlayerKeymap keymap;
 
 PlayerKeymap::PlayerKeymap()
 {
-  keymap.jump  = SDLK_UP;
+  keymap.jump  = SDLK_SPACE;
+  keymap.activate = SDLK_UP;
   keymap.duck  = SDLK_DOWN;
   keymap.left  = SDLK_LEFT;
   keymap.right = SDLK_RIGHT;
@@ -62,11 +82,51 @@ void player_input_init(player_input_type* pplayer_input)
   pplayer_input->right = UP;
   pplayer_input->up = UP;
   pplayer_input->old_up = UP;
+  pplayer_input->activate = UP;
 }
 
-Player::Player(DisplayManager& display_manager)
+void
+TuxBodyParts::set_action(std::string action)
+{
+  if(head != NULL)
+    head->set_action(action);
+  if(body != NULL)
+    body->set_action(action);
+  if(arms != NULL)
+    arms->set_action(action);
+  if(feet != NULL)
+    feet->set_action(action);
+}
+
+void
+TuxBodyParts::one_time_animation()
+{
+  if(head != NULL)
+    head->start_animation(1);
+  if(body != NULL)
+    body->start_animation(1);
+  if(arms != NULL)
+    arms->start_animation(1);
+  if(feet != NULL)
+    feet->start_animation(1);
+}
+
+void
+TuxBodyParts::draw(DrawingContext& context, const Vector& pos, int layer,
+                  Uint32 drawing_effect)
+{
+  if(head != NULL)
+    head->draw(context, pos, layer, drawing_effect);
+  if(body != NULL)
+    body->draw(context, pos, layer, drawing_effect);
+  if(arms != NULL)
+    arms->draw(context, pos, layer, drawing_effect);
+  if(feet != NULL)
+    feet->draw(context, pos, layer, drawing_effect);
+}
+
+Player::Player()
 {
-  display_manager.add_drawable(this, LAYER_OBJECTS);
   init();
 }
 
@@ -77,8 +137,6 @@ Player::~Player()
 void
 Player::init()
 {
-  Level* plevel = World::current()->get_level();
-
   holding_something = false;
 
   base.width = 32;
@@ -87,21 +145,24 @@ Player::init()
   size = SMALL;
   got_power = NONE_POWER;
 
-  base.x = plevel->start_pos_x;
-  base.y = plevel->start_pos_y;
+  base.x = 0;
+  base.y = 0;
   previous_base = old_base = base;
   dir = RIGHT;
   old_dir = dir;
   duck = false;
+  dead = false;
 
   dying   = DYING_NOT;
+  last_ground_y = 0;
+  fall_mode = ON_GROUND;
   jumping = false;
   can_jump = true;
   butt_jump = false;
-
+  
   frame_main = 0;
   frame_ = 0;
-  
+
   player_input_init(&input);
 
   invincible_timer.init(true);
@@ -109,6 +170,9 @@ Player::init()
   safe_timer.init(true);
   frame_timer.init(true);
   kick_timer.init(true);
+  shooting_timer.init(true);
+  growing_timer.init(true);
+  idle_timer.init(true);
 
   physic.reset();
 }
@@ -116,6 +180,8 @@ Player::init()
 int
 Player::key_event(SDLKey key, int state)
 {
+  idle_timer.start(IDLE_TIME);
+
   if(key == keymap.right)
     {
       input.right = state;
@@ -143,6 +209,23 @@ Player::key_event(SDLKey key, int state)
       input.fire = state;
       return true;
     }
+  else if(key == keymap.activate)
+    {
+      input.activate = state;
+
+      if(state == DOWN) {
+        /** check for interactive objects */
+        for(Sector::InteractiveObjects::iterator i 
+            = Sector::current()->interactive_objects.begin();
+            i != Sector::current()->interactive_objects.end(); ++i) {
+          if(rectcollision(base, (*i)->get_area())) {
+            (*i)->interaction(INTERACTION_ACTIVATE);
+          }
+        }
+      }
+      
+      return true;
+    }
   else
     return false;
 }
@@ -163,6 +246,8 @@ Player::level_begin()
   skidding_timer.init(true);
   safe_timer.init(true);
   frame_timer.init(true);
+  growing_timer.init(true);
+  idle_timer.init(true);
 
   physic.reset();
 }
@@ -172,6 +257,11 @@ Player::action(float elapsed_time)
 {
   bool jumped_in_solid = false;
 
+  if(dying && !dying_timer.check()) {
+    dead = true;
+    return;
+  }
+
   if (input.fire == UP)
     holding_something = false;
 
@@ -182,7 +272,7 @@ Player::action(float elapsed_time)
   if(dying == DYING_NOT)
     handle_input();
 
-  physic.apply(elapsed_time, base.x, base.y);
+  physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
 
   if(dying == DYING_NOT) 
     {
@@ -190,7 +280,7 @@ Player::action(float elapsed_time)
 
       collision_swept_object_map(&old_base, &base);
 
-      if (!invincible_timer.started()
+      if ((!invincible_timer.started() && !safe_timer.started())
           && (isspike(base.x, base.y) || isspike(base.x + base.width, base.y)
           ||  isspike(base.x, base.y + base.height)
           ||  isspike(base.x + base.width, base.y + base.height)))
@@ -222,6 +312,7 @@ Player::action(float elapsed_time)
               // fall down
               physic.set_velocity_y(0);
               jumped_in_solid = true;
+              jumping = false;
             }
         }
       else
@@ -244,26 +335,30 @@ Player::action(float elapsed_time)
           if (isbrick(base.x, base.y) ||
               isfullbox(base.x, base.y))
             {
-              World::current()->trygrabdistro(base.x, base.y - 32,BOUNCE);
-              World::current()->trybumpbadguy(base.x, base.y - 64);
+	      Sector::current()->trygrabdistro(
+                  Vector(base.x, base.y - 32), BOUNCE);
+              Sector::current()->trybumpbadguy(Vector(base.x, base.y - 64));
 
-              World::current()->trybreakbrick(base.x, base.y, size == SMALL);
+              Sector::current()->trybreakbrick(
+                  Vector(base.x, base.y), size == SMALL);
 
               bumpbrick(base.x, base.y);
-              World::current()->tryemptybox(base.x, base.y, RIGHT);
+              Sector::current()->tryemptybox(Vector(base.x, base.y), RIGHT);
             }
 
           if (isbrick(base.x+ 31, base.y) ||
               isfullbox(base.x+ 31, base.y))
             {
-              World::current()->trygrabdistro(base.x+ 31, base.y - 32,BOUNCE);
-              World::current()->trybumpbadguy(base.x+ 31, base.y - 64);
+	      Sector::current()->trygrabdistro(
+                  Vector(base.x+ 31, base.y - 32), BOUNCE);
+              Sector::current()->trybumpbadguy(Vector(base.x+ 31, base.y - 64));
 
               if(size == BIG)
-                World::current()->trybreakbrick(base.x+ 31, base.y, size == SMALL);
+                Sector::current()->trybreakbrick(
+                    Vector(base.x+ 31, base.y), size == SMALL);
 
               bumpbrick(base.x+ 31, base.y);
-              World::current()->tryemptybox(base.x+ 31, base.y, LEFT);
+              Sector::current()->tryemptybox(Vector(base.x+ 31, base.y), LEFT);
             }
         }
 
@@ -295,7 +390,7 @@ Player::on_ground()
 {
   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)  );
+           issolid(base.x + base.width - 1, base.y + base.height));
 }
 
 bool
@@ -306,6 +401,19 @@ Player::under_solid()
            issolid(base.x + base.width - 1, base.y)  );
 }
 
+bool
+Player::tiles_on_air(int tiles)
+{
+  for(int t = 0; t != tiles; t++)
+     {
+     if(issolid(base.x + base.width / 2, base.y + base.height + (tiles*32)) ||
+         issolid(base.x + 1, base.y + base.height + (tiles*32)) ||
+         issolid(base.x + base.width - 1, base.y + base.height + (tiles*32)))
+       return false;
+     }
+  return true;
+}
+
 void
 Player::handle_horizontal_input()
 {
@@ -356,7 +464,7 @@ Player::handle_horizontal_input()
   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);
+          SoundManager::get()->play_sound(IDToSound(SND_SKID));
           ax *= 2.5;
       } else {
           ax *= 2;
@@ -395,6 +503,17 @@ Player::handle_horizontal_input()
 void
 Player::handle_vertical_input()
 {
+  // set fall mode...
+  if(on_ground()) {
+    fall_mode = ON_GROUND;
+    last_ground_y = base.y;
+  } else {
+    if(base.y > last_ground_y)
+      fall_mode = FALLING;
+    else if(fall_mode == ON_GROUND)
+      fall_mode = JUMPING;
+  }
+
   // Press jump key
   if(input.up == DOWN && can_jump && on_ground())
     {
@@ -411,34 +530,66 @@ Player::handle_vertical_input()
       --base.y;
       jumping = true;
       can_jump = false;
-      butt_jump = true;  // player started jumping, enable butt jump
       if (size == SMALL)
-        play_sound(sounds[SND_JUMP], SOUND_CENTER_SPEAKER);
+        SoundManager::get()->play_sound(IDToSound(SND_JUMP));
       else
-        play_sound(sounds[SND_BIGJUMP], SOUND_CENTER_SPEAKER);
+        SoundManager::get()->play_sound(IDToSound(SND_BIGJUMP));
     }
   // Let go of jump key
   else if(input.up == UP && jumping && physic.get_velocity_y() > 0)
     {
       jumping = false;
       physic.set_velocity_y(0);
-      butt_jump = false;  // jump was not full, disable butt jump
     }
 
-   /* Do butt jump, in case the player has done the combination
-        (full jump and hold DOWN) */
-  if (input.down == UP && physic.get_velocity_y() == World::current()->get_level()->gravity && butt_jump)
-    butt_jump = false;  // in case DOWN is not hold after the full jump, disable it
-  
-  if (input.down == DOWN && butt_jump && on_ground() && size == BIG)
+   /* In case the player has pressed Down while in a certain range of air,
+      enable butt jump action */
+  if (input.down == DOWN && !butt_jump && !duck)
+    if(tiles_on_air(TILES_FOR_BUTTJUMP) && jumping)
+      butt_jump = true;
+
+   /* When Down is not held anymore, disable butt jump */
+  if(butt_jump && input.down == UP)
+    butt_jump = false;
+
+  // Do butt jump
+  if (butt_jump && on_ground() && size == BIG)
   {
-    if(World::current()->trybreakbrick(base.x, base.y + base.height, false)
-      || World::current()->trybreakbrick(
-          base.x + base.width, base.y + base.height, false)) {
-        // make tux jumping a little bit again after breaking the bricks
-        physic.set_velocity_y(2);
+    // Add a smoke cloud
+    if (duck) 
+      Sector::current()->add_smoke_cloud(Vector(base.x - 32, base.y));
+    else 
+      Sector::current()->add_smoke_cloud(Vector(base.x - 32, base.y + 32));
+    
+    butt_jump = false;
+
+    // Break bricks beneath Tux
+    if(Sector::current()->trybreakbrick(
+          Vector(base.x + 1, base.y + base.height), false)
+        || Sector::current()->trybreakbrick(
+           Vector(base.x + base.width - 1, base.y + base.height), false))
+    {
+      physic.set_velocity_y(2);
+      butt_jump = true;
+    }
+
+    // Kill nearby badguys
+    std::vector<GameObject*> gameobjects = Sector::current()->gameobjects;
+    for (std::vector<GameObject*>::iterator i = gameobjects.begin();
+         i != gameobjects.end();
+         i++)
+    {
+      BadGuy* badguy = dynamic_cast<BadGuy*> (*i);
+      if(badguy)
+      {
+        
+	if (fabsf(base.x - badguy->base.x) < 150 &&
+            fabsf(base.y - badguy->base.y) < 60 &&
+            (issolid(badguy->base.x + 1, badguy->base.y + badguy->base.height) ||
+              issolid(badguy->base.x + badguy->base.width - 1, badguy->base.y + badguy->base.height)))
+          badguy->kill_me(25);
+      }
     }
-//    butt_jump = false;
   }
 
   if ( (issolid(base.x + base.width / 2, base.y + base.height + 64) ||
@@ -473,9 +624,9 @@ Player::handle_input()
   /* Shoot! */
   if (input.fire == DOWN && input.old_fire == UP && got_power != NONE_POWER)
     {
-      holding_something = true;
-      World::current()->add_bullet(Vector(base.x, base.y + (base.height/2)),
-          physic.get_velocity_x(), dir);
+      if(Sector::current()->add_bullet(Vector(base.x, base.y + (base.height/2)),
+          physic.get_velocity_x(), dir))
+        shooting_timer.start(SHOOTING_TIME);
       input.old_fire = DOWN;
     }
 
@@ -529,7 +680,7 @@ Player::handle_input()
 }
 
 void
-Player::grow()
+Player::grow(bool animate)
 {
   if(size == BIG)
     return;
@@ -538,6 +689,9 @@ Player::grow()
   base.height = 64;
   base.y -= 32;
 
+  if(animate)
+    growing_timer.start(GROWING_TIME);
+
   old_base = previous_base = base;
 }
 
@@ -547,16 +701,19 @@ Player::grabdistros()
   /* Grab distros: */
   if (!dying)
     {
-      World::current()->trygrabdistro(base.x, base.y, NO_BOUNCE);
-      World::current()->trygrabdistro(base.x+ 31, base.y, 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);
+      Sector::current()->trygrabdistro(Vector(base.x, base.y), NO_BOUNCE);
+      Sector::current()->trygrabdistro(Vector(base.x+ 31, base.y), NO_BOUNCE);
+      Sector::current()->trygrabdistro(
+          Vector(base.x, base.y + base.height), NO_BOUNCE);
+      Sector::current()->trygrabdistro(
+          Vector(base.x+ 31, base.y + base.height), NO_BOUNCE);
 
       if(size == BIG)
         {
-          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);
+	  Sector::current()->trygrabdistro(
+              Vector(base.x, base.y + base.height / 2), NO_BOUNCE);
+          Sector::current()->trygrabdistro(
+              Vector(base.x+ 31, base.y + base.height / 2), NO_BOUNCE);
         }
 
     }
@@ -568,104 +725,162 @@ Player::grabdistros()
       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);
+      SoundManager::get()->play_sound(IDToSound(SND_LIFEUP));
     }
 }
 
 void
-Player::draw(ViewPort& viewport, int )
+Player::draw(DrawingContext& context)
 {
-  Vector pos = viewport.world2screen(Vector(base.x, base.y));
+  TuxBodyParts* tux_body;
+          
+  if (size == SMALL)
+    tux_body = small_tux;
+  else if (got_power == FIRE_POWER)
+    tux_body = fire_tux;
+  else if (got_power == ICE_POWER)
+    tux_body = ice_tux;
+  else
+    tux_body = big_tux;
+
+  int layer = LAYER_OBJECTS - 1;
+  Vector pos = Vector(base.x, base.y);
 
-  if (!safe_timer.started() || (global_frame_counter % 2) == 0)
+  /* Set Tux sprite action */
+  if (duck && size != SMALL)
     {
-      if (dying == DYING_SQUISHED)
-        {
-          smalltux_gameover->draw(pos);
-        }
+    if(dir == LEFT)
+      tux_body->set_action("duck-left");
+    else // dir == RIGHT
+      tux_body->set_action("duck-right");
+    }
+  else if (skidding_timer.started())
+    {
+    if(dir == LEFT)
+      tux_body->set_action("skid-left");
+    else // dir == RIGHT
+      tux_body->set_action("skid-right");
+    }
+  else if (kick_timer.started())
+    {
+    if(dir == LEFT)
+      tux_body->set_action("kick-left");
+    else // dir == RIGHT
+      tux_body->set_action("kick-right");
+    }
+  else if (butt_jump)
+    {
+    if(dir == LEFT)
+      tux_body->set_action("buttjump-left");
+    else // dir == RIGHT
+      tux_body->set_action("buttjump-right");
+    }
+  else if (physic.get_velocity_y() != 0)
+    {
+    if(dir == LEFT)
+      tux_body->set_action("jump-left");
+    else // dir == RIGHT
+      tux_body->set_action("jump-right");
+    }
+  else
+    {
+    if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
+      {
+      if(dir == LEFT)
+        tux_body->set_action("stand-left");
+      else // dir == RIGHT
+        tux_body->set_action("stand-right");
+      }
+    else // moving
+      {
+      if(dir == LEFT)
+        tux_body->set_action("walk-left");
+      else // dir == RIGHT
+        tux_body->set_action("walk-right");
+      }
+    }
+
+  if(idle_timer.get_left() < 0)
+    {
+    if(size == BIG)
+      {
+      if(dir == LEFT)
+        tux_body->head->set_action("idle-left");
+      else // dir == RIGHT
+        tux_body->set_action("idle-right");
+
+      tux_body->head->start_animation(1);
+      }
+
+    idle_timer.start(IDLE_TIME);
+    }
+
+  // Tux is holding something
+  if ((holding_something && physic.get_velocity_y() == 0) ||
+      shooting_timer.check())
+    {
+    if (duck)
+      {
+      if(dir == LEFT)
+        tux_body->arms->set_action("duck+grab");
+      else // dir == RIGHT
+        tux_body->set_action("duck-right");
+      }
+    else
+      {
+      if(dir == LEFT)
+        tux_body->arms->set_action("grab");
+      else // dir == RIGHT
+        tux_body->set_action("duck-right");
+      }
+    }
+
+  /* Draw Tux */
+  if (dying == DYING_SQUISHED)
+    {
+    smalltux_gameover->draw(context, pos, LAYER_FOREGROUNDTILES+1);
+    }
+  else if(growing_timer.check())
+    {
+    if(size == SMALL)
+      {
+      if (dir == RIGHT)
+        context.draw_surface(growingtux_right[GROWING_FRAMES-1 - 
+                 ((growing_timer.get_gone() *
+                 GROWING_FRAMES) / GROWING_TIME)], pos, layer);
       else
-        {
-          PlayerSprite* sprite;
-          
-          if (size == SMALL)
-            sprite = &smalltux;
-          else if (got_power == FIRE_POWER)
-            sprite = &firetux;
-          else if (got_power == ICE_POWER)
-            sprite = &icetux;
-          else
-            sprite = &largetux;
-          
-          if (duck && size != SMALL)
-            {
-              if (dir == RIGHT)
-                sprite->duck_right->draw(pos);
-              else 
-                sprite->duck_left->draw(pos);
-            }
-          else if (skidding_timer.started())
-            {
-              if (dir == RIGHT)
-                sprite->skid_right->draw(pos);
-              else
-                sprite->skid_left->draw(pos); 
-            }
-          else if (kick_timer.started())
-            {
-              if (dir == RIGHT)
-                sprite->kick_right->draw(pos);
-              else
-                sprite->kick_left->draw(pos); 
-            }
-          else if (physic.get_velocity_y() != 0)
-            {
-              if (dir == RIGHT)
-                sprite->jump_right->draw(pos);
-              else
-                sprite->jump_left->draw(pos);                   
-            }
-          else
-            {
-              if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
-                {
-                  if (dir == RIGHT)
-                    sprite->stand_right->draw(pos);
-                  else
-                    sprite->stand_left->draw(pos);
-                }
-              else // moving
-                {
-                  if (dir == RIGHT)
-                    sprite->walk_right->draw(pos);
-                  else
-                    sprite->walk_left->draw(pos);
-                }
-            }
-                      
-          // Draw arm overlay graphics when Tux is holding something
-          if (holding_something && physic.get_velocity_y() == 0)
-            {
-              if (dir == RIGHT)
-                sprite->grab_right->draw(pos);
-              else
-                sprite->grab_left->draw(pos);
-            }
+        context.draw_surface(growingtux_left[GROWING_FRAMES-1 - 
+                ((growing_timer.get_gone() *
+                GROWING_FRAMES) / GROWING_TIME)], pos, layer);
+      }
+    else
+      {
+      if (dir == RIGHT)
+        context.draw_surface(growingtux_right[(growing_timer.get_gone() *
+                GROWING_FRAMES) / GROWING_TIME], pos, layer);
+      else
+        context.draw_surface(growingtux_left[(growing_timer.get_gone() *
+                             GROWING_FRAMES) / GROWING_TIME], pos, layer);
+      }
+    }
+  else if (safe_timer.started() && global_frame_counter%2)
+    ;  // don't draw Tux
+  else
+    tux_body->draw(context, pos, layer, dir == LEFT ? HORIZONTAL_FLIP : NONE_EFFECT);
 
-          // 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(pos);
-              else
-                largetux_star->draw(pos);
-            }
-        }
-    }     
-  
+  // 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(context, pos, LAYER_OBJECTS + 2);
+    else
+      bigtux_star->draw(context, pos, LAYER_OBJECTS + 2);
+  }
+ 
   if (debug_mode)
-    fillrect(base.x - scroll_x, base.y - scroll_y, 
-             base.width, base.height, 75,75,75, 150);
+    context.draw_filled_rect(Vector(base.x, base.y),
+        Vector(base.width, base.height), Color(75,75,75, 150), LAYER_OBJECTS+1);
 }
 
 void
@@ -681,6 +896,7 @@ Player::collision(void* p_c_object, int c_object)
 {
   BadGuy* pbad_c = NULL;
   Trampoline* ptramp_c = NULL;
+  FlyingPlatform* pplatform_c = NULL;
 
   switch (c_object)
     {
@@ -771,7 +987,16 @@ Player::collision(void* p_c_object, int c_object)
         }
       }
 */
-
+      break;
+    case CO_FLYING_PLATFORM:
+      pplatform_c = (FlyingPlatform*) p_c_object;
+      
+      base.y = pplatform_c->base.y - base.height;
+      physic.set_velocity_x(pplatform_c->get_vel_x());
+      
+      physic.enable_gravity(false);
+      can_jump = true;
+      fall_mode = ON_GROUND;
       break;
 
     default:
@@ -785,7 +1010,10 @@ Player::collision(void* p_c_object, int c_object)
 void
 Player::kill(HurtMode mode)
 {
-  play_sound(sounds[SND_HURT], SOUND_CENTER_SPEAKER);
+  if(dying)
+    return;
+  
+  SoundManager::get()->play_sound(IDToSound(SND_HURT));
 
   physic.set_velocity_x(0);
 
@@ -793,43 +1021,29 @@ Player::kill(HurtMode mode)
     {
       if (got_power != NONE_POWER)
         {
+          safe_timer.start(TUX_SAFE_TIME);
           got_power = NONE_POWER;
         }
       else
         {
+          growing_timer.start(GROWING_TIME);
+          safe_timer.start(TUX_SAFE_TIME + GROWING_TIME);
           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);
-      if(dying != DYING_SQUISHED)
       --player_status.lives;
       dying = DYING_SQUISHED;
+      dying_timer.start(3000);
     }
 }
 
-void
-Player::is_dying()
-{
-  remove_powerups();
-  dying = DYING_NOT;
-}
-
-bool Player::is_dead()
-{
-  if(base.y > screen->h + scroll_y || base.y > World::current()->get_level()->height*32 ||
-      base.x < scroll_x - AUTOSCROLL_DEAD_INTERVAL)  // can happen in auto-scrolling
-    return true;
-  else
-    return false;
-}
-
 /* Remove Tux's power ups */
 void
 Player::remove_powerups()
@@ -840,7 +1054,15 @@ Player::remove_powerups()
 }
 
 void
-Player::check_bounds(bool back_scrolling, bool hor_autoscroll)
+Player::move(const Vector& vector)
+{
+  base.x = vector.x;
+  base.y = vector.y;
+  old_base = previous_base = base;
+}
+
+void
+Player::check_bounds(Camera* camera)
 {
   /* Keep tux in bounds: */
   if (base.x < 0)
@@ -850,25 +1072,44 @@ Player::check_bounds(bool back_scrolling, bool hor_autoscroll)
     }
 
   /* Keep in-bounds, vertically: */
-  if (base.y > World::current()->get_level()->height * /*TILE_HEIGHT*/ 32)
+  if (base.y > Sector::current()->solids->get_height() * 32)
     {
       kill(KILL);
+      return;
     }
 
-  if(base.x < scroll_x && (!back_scrolling || hor_autoscroll))  // can happen if back scrolling is disabled
-    base.x = scroll_x;
-
-  if(hor_autoscroll)
-    {
-    if(base.x == scroll_x)
-      if(issolid(base.x+32, base.y) || (size != SMALL && issolid(base.x+32, base.y+32)))
-        kill(KILL);
+  bool adjust = false;
+  // can happen if back scrolling is disabled
+  if(base.x < camera->get_translation().x) {
+    base.x = camera->get_translation().x;
+    adjust = true;
+  }
+  if(base.x >= camera->get_translation().x + screen->w - base.width) {
+    base.x = camera->get_translation().x + screen->w - base.width;
+    adjust = true;
+  }
 
-    if(base.x + base.width > scroll_x + screen->w)
-      base.x = scroll_x + screen->w - base.width;
+  if(adjust) {
+    // squished now?
+    if(collision_object_map(base)) {
+      kill(KILL);
+      return;
     }
-    
+  }
+}
+
+void
+Player::bounce(BadGuy* badguy)
+{
+  if (input.up)
+    physic.set_velocity_y(5.2);
+  else
+    physic.set_velocity_y(2);
+
+  // Move the player a little bit above the badguy to avoid collision
+  // between badguy and player directly after the bounce has happend
+  base.y = badguy->base.y - base.height - 2;
 }
 
-// EOF //
+/* EOF */