X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer.cpp;h=88b67611cd585d52dd247a6a0685ba66716525aa;hb=1d182a00d99d763a9c92ab5c73d183e1d4177cc6;hp=0c1599b05084abfcb7ea7f64e605d60f41cf2435;hpb=6c83e03d87c595495137b60d27966008f5afad19;p=supertux.git

diff --git a/src/player.cpp b/src/player.cpp
index 0c1599b05..88b67611c 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -18,7 +18,8 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <math.h>
-
+#include <iostream>
+#include <cassert>
 #include "gameloop.h"
 #include "globals.h"
 #include "player.h"
@@ -28,41 +29,23 @@
 #include "sprite.h"
 #include "screen.h"
 
+// behavior definitions:
+#define TILES_FOR_BUTTJUMP 3
+// animation times (in ms):
+#define SHOOTING_TIME 320
+// others stuff:
+#define AUTOSCROLL_DEAD_INTERVAL 300
+
 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*  smalltux_gameover;
-Sprite*  smalltux_skid_left;
-Sprite*  smalltux_skid_right;
-Sprite*  largetux_stand_left;
-Sprite*  largetux_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];
+
+Sprite* smalltux_gameover;
+Sprite* smalltux_star;
+Sprite* largetux_star;
+
+PlayerSprite smalltux;
+PlayerSprite largetux;
+PlayerSprite icetux;
+PlayerSprite firetux;
 
 PlayerKeymap keymap;
 
@@ -83,29 +66,45 @@ 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;
+}
+
+Player::Player(DisplayManager& display_manager)
+{
+  display_manager.add_drawable(this, LAYER_OBJECTS-1); // for tux himself
+  display_manager.add_drawable(this, LAYER_OBJECTS+1); // for the arm
+  init();
+}
+
+Player::~Player()
+{
 }
 
 void
 Player::init()
 {
-  Level* plevel = World::current()->get_level();
+  holding_something = false;
 
   base.width = 32;
   base.height = 32;
 
   size = SMALL;
-  got_coffee = false;
+  got_power = NONE_POWER;
 
-  base.x = plevel->start_pos_x;
-  base.y = plevel->start_pos_y;
-  base.xm = 0;
-  base.ym = 0;
+  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;
@@ -116,6 +115,8 @@ Player::init()
   skidding_timer.init(true);
   safe_timer.init(true);
   frame_timer.init(true);
+  kick_timer.init(true);
+  shooting_timer.init(true);
 
   physic.reset();
 }
@@ -145,6 +146,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;
     }
@@ -157,8 +160,6 @@ Player::level_begin()
 {
   base.x  = 100;
   base.y  = 170;
-  base.xm = 0;
-  base.ym = 0;
   previous_base = old_base = base;
   duck = false;
 
@@ -175,10 +176,18 @@ Player::level_begin()
 }
 
 void
-Player::action(double frame_ratio)
+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;
+
   /* Move tux: */
   previous_base = base;
 
@@ -186,7 +195,7 @@ Player::action(double frame_ratio)
   if(dying == DYING_NOT)
     handle_input();
 
-  physic.apply(frame_ratio, base.x, base.y);
+  physic.apply(elapsed_time, base.x, base.y);
 
   if(dying == DYING_NOT) 
     {
@@ -194,6 +203,14 @@ Player::action(double frame_ratio)
 
       collision_swept_object_map(&old_base, &base);
 
+      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)))
+      {
+         kill(SHRINK);
+      }
+
       // Don't accelerate Tux if he is running against a wall
       if (target.x != base.x)
         {
@@ -203,11 +220,11 @@ Player::action(double frame_ratio)
       // 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();
+         && collision_object_map(base))
+        {
+          base.x += elapsed_time * WALK_SPEED * (dir ? 1: -1);
+          previous_base = old_base = base;
+        }
 
       // Land:
       if (!on_ground())
@@ -231,7 +248,8 @@ Player::action(double frame_ratio)
 
           physic.enable_gravity(false);
           /* Reset score multiplier (for multi-hits): */
-          player_status.score_multiplier = 1;
+          if (!invincible_timer.started())
+            player_status.score_multiplier = 1;
         }
 
       if(jumped_in_solid)
@@ -282,6 +300,7 @@ Player::action(double frame_ratio)
   skidding_timer.check();
   invincible_timer.check();
   safe_timer.check();
+  kick_timer.check();
 }
 
 bool
@@ -300,6 +319,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()
 {
@@ -310,9 +342,11 @@ Player::handle_horizontal_input()
 
   float dirsign = 0;
   if(input.left == DOWN && input.right == UP && (!duck || physic.get_velocity_y() != 0)) {
+      old_dir = dir;
       dir = LEFT;
       dirsign = -1;
   } else if(input.left == UP && input.right == DOWN && (!duck || physic.get_velocity_y() != 0)) {
+      old_dir = dir;
       dir = RIGHT;
       dirsign = 1;
   }
@@ -387,31 +421,81 @@ Player::handle_horizontal_input()
 void
 Player::handle_vertical_input()
 {
-  if(input.up == DOWN)
+  // 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())
     {
-      if (on_ground())
-        {
-          // jump higher if we are running
-          if (physic.get_velocity_x() > MAX_WALK_XM)
-            physic.set_velocity_y(5.8);
-          else
-            physic.set_velocity_y(5.2);
+      if(duck) { // only jump a little bit when in duck mode {
+        physic.set_velocity_y(3);
+      } else {
+        // 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;
-          if (size == SMALL)
-            play_sound(sounds[SND_JUMP], SOUND_CENTER_SPEAKER);
-          else
-            play_sound(sounds[SND_BIGJUMP], SOUND_CENTER_SPEAKER);
-        }
+      --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);
     }
-  else if(input.up == UP && jumping)
+  // Let go of jump key
+  else if(input.up == UP && jumping && physic.get_velocity_y() > 0)
     {
       jumping = false;
-      if(physic.get_velocity_y() > 0) {
-        physic.set_velocity_y(0);
-      }
+      physic.set_velocity_y(0);
     }
+
+   /* In case the player has pressed Down while in a certain range of air,
+      enable butt jump action */
+  if (input.down == DOWN && !butt_jump)
+    if(tiles_on_air(TILES_FOR_BUTTJUMP))
+      butt_jump = true;
+
+   /* When Down is not held anymore, disable butt jump */
+  if(butt_jump && input.down == UP)
+    butt_jump = false;
+
+  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);
+    }
+//    butt_jump = false;   // comment this, in case you won't to disable the continued use of buttjump
+  }
+
+  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;
+    }
+
+  if(on_ground())   /* Make sure jumping is off. */
+    jumping = false;
+
+  input.old_up = input.up;
 }
 
 void
@@ -422,16 +506,17 @@ Player::handle_input()
 
   /* Jump/jumping? */
 
-  if ( input.up == DOWN || (input.up == UP && jumping))
-    {
-      handle_vertical_input();
-    }
+  if (on_ground() && input.up == UP)
+    can_jump = true;
+  handle_vertical_input();
 
   /* Shoot! */
-
-  if (input.fire == DOWN && input.old_fire == UP && got_coffee)
+  if (input.fire == DOWN && input.old_fire == UP && got_power != NONE_POWER)
     {
-      World::current()->add_bullet(base.x, base.y, physic.get_velocity_x(), dir);
+      if(World::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;
     }
 
   /* tux animations: */
@@ -457,7 +542,7 @@ Player::handle_input()
     }
 
   /* Duck! */
-  if (input.down == DOWN && size == BIG && !duck && physic.get_velocity_y() == 0)
+  if (input.down == DOWN && size == BIG && !duck && physic.get_velocity_y() == 0 && on_ground())
     {
       duck = true;
       base.height = 32;                             
@@ -465,16 +550,38 @@ Player::handle_input()
       // changing base size confuses collision otherwise
       old_base = previous_base = base;
     }
-  else if(input.down == UP && size == BIG && duck && physic.get_velocity_y() == 0)
+  else if(input.down == UP && size == BIG && duck)
     {
-      duck = false;
+      // try if we can really unduck
       base.y -= 32;
       base.height = 64;
-      old_base = previous_base = base;
+      // when unducking in air we need some space to do so
+      if(on_ground() || !collision_object_map(base)) {
+        duck = false;
+        // changing base size confuses collision otherwise
+        old_base = previous_base = base;                                
+      } else {
+        // undo the ducking changes
+        base.y += 32;
+        base.height = 32;
+      }   
     }
 }
 
 void
+Player::grow()
+{
+  if(size == BIG)
+    return;
+  
+  size = BIG;
+  base.height = 64;
+  base.y -= 32;
+
+  old_base = previous_base = base;
+}
+
+void
 Player::grabdistros()
 {
   /* Grab distros: */
@@ -506,189 +613,120 @@ Player::grabdistros()
 }
 
 void
-Player::draw()
+Player::draw(Camera& viewport, int layer)
 {
+  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;
+
+  Vector pos = viewport.world2screen(Vector(base.x, base.y));
+
+  if(layer == LAYER_OBJECTS + 1) {
+    // Draw arm overlay graphics when Tux is holding something
+    if ((holding_something && physic.get_velocity_y() == 0) || shooting_timer.check() && !duck)
+    {
+      if (dir == RIGHT)
+        sprite->grab_right->draw(pos);
+      else
+        sprite->grab_left->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(pos);
+      else
+        largetux_star->draw(pos);
+    }
+    
+    return;
+  }
+  
   if (!safe_timer.started() || (global_frame_counter % 2) == 0)
     {
       if (dying == DYING_SQUISHED)
         {
-          smalltux_gameover->draw(base.x - scroll_x, base.y);
+          smalltux_gameover->draw(pos);
         }
       else
         {
-          if (size == SMALL)
+          if (duck && size != SMALL)
             {
-              if (invincible_timer.started())
-                {
-                  if (dir == RIGHT)
-                    cape_right[global_frame_counter % 2]->draw(base.x- scroll_x, base.y);
-                  else
-                    cape_left[global_frame_counter % 2]->draw(base.x- scroll_x, base.y);
-                }
-
-              if (!got_coffee)
-                {
-                  if (!skidding_timer.started())
-                    {
-                      if (physic.get_velocity_y() != 0)
-                        {
-                          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
-                        {
-                          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
-                    {
-                      if (dir == RIGHT)
-                        smalltux_skid_right->draw(base.x - scroll_x, base.y);
-                      else
-                        smalltux_skid_left->draw(base.x - scroll_x, base.y); 
-                    }
-                }
+              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
-                {
-                  /* Tux got coffee! */
-
-                  if (dir == RIGHT)
-                    {
-                      firetux_right[frame_]->draw( base.x- scroll_x, base.y);
-                    }
-                  else
-                    {
-                      firetux_left[frame_]->draw( base.x- scroll_x, base.y);
-                    }
-                }
+                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 // Large Tux
+          else
             {
-              if (invincible_timer.started())
+              if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
                 {
-                  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
-                    bigcape_left[global_frame_counter % 2]->draw(capex, capey);
-                }
-
-              if (!got_coffee)
-                {
-                  if (!duck)
-                    {
-                      if (!skidding_timer.started())
-                        {
-                          if (physic.get_velocity_y() == 0)
-                            {
-                              if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
-                                {
-                                  if (dir == RIGHT)
-                                    largetux_stand_right->draw(base.x - scroll_x, base.y);
-                                  else
-                                    largetux_stand_left->draw(base.x - scroll_x, base.y);
-                                }
-                              else // walking
-                                {
-                                  if (dir == RIGHT)
-                                    bigtux_right->draw(base.x - scroll_x, base.y);
-                                  else
-                                    bigtux_left->draw(base.x - scroll_x, base.y);
-                                }
-                            }
-                          else
-                            {
-                              if (dir == RIGHT)
-                                bigtux_right_jump->draw(base.x - scroll_x, base.y);
-                              else
-                                bigtux_left_jump->draw(base.x - scroll_x, base.y);
-                            }
-                        }
-                      else
-                        {
-                          if (dir == RIGHT)
-                            skidtux_right->draw(base.x - scroll_x - 8, base.y);
-                          else
-                            skidtux_left->draw(base.x - scroll_x - 8, base.y);
-                        }
-                    }
+                    sprite->stand_right->draw(pos);
                   else
-                    {
-                      if (dir == RIGHT)
-                        ducktux_right->draw(base.x - scroll_x, base.y);
-                      else
-                        ducktux_left->draw(base.x - scroll_x, base.y);
-                    }
+                    sprite->stand_left->draw(pos);
                 }
-              else
+              else // moving
                 {
-                  /* Tux has coffee! */
-                  if (!duck)
-                    {
-                      if (!skidding_timer.started())
-                        {
-                          if (!jumping || physic.get_velocity_y() > 0)
-                            {
-                              if (dir == RIGHT)
-                                bigfiretux_right[frame_]->draw(base.x- scroll_x - 8, base.y);
-                              else
-                                bigfiretux_left[frame_]->draw(base.x- scroll_x - 8, base.y);
-                            }
-                          else
-                            {
-                              if (dir == RIGHT)
-                                bigfiretux_right_jump->draw(base.x- scroll_x - 8, base.y);
-                              else
-                                bigfiretux_left_jump->draw(base.x- scroll_x - 8, base.y);
-                            }
-                        }
-                      else
-                        {
-                          if (dir == RIGHT)
-                            skidfiretux_right->draw(base.x- scroll_x - 8, base.y);
-                          else
-                            skidfiretux_left->draw(base.x- scroll_x - 8, base.y);
-                        }
-                    }
+                  if (dir == RIGHT)
+                    sprite->walk_right->draw(pos);
                   else
-                    {
-                      if (dir == RIGHT)
-                        duckfiretux_right->draw( base.x- scroll_x - 8, base.y - 16);
-                      else
-                        duckfiretux_left->draw( base.x- scroll_x - 8, base.y - 16);
-                    }
+                    sprite->walk_left->draw(pos);
                 }
             }
         }
-    }
-
+    }     
+  
   if (debug_mode)
-    fillrect(base.x - scroll_x, base.y, 32, 32, 75,75,75, 150);
+    fillrect(base.x - viewport.get_translation().x,
+        base.y - viewport.get_translation().y, 
+             base.width, base.height, 75,75,75, 150);
+}
+
+void
+Player::collision(const MovingObject& other, int collision_type)
+{
+  (void) other;
+  (void) collision_type;
+  // will be implemented later
 }
 
 void
 Player::collision(void* p_c_object, int c_object)
 {
   BadGuy* pbad_c = NULL;
+  Trampoline* ptramp_c = NULL;
+  FlyingPlatform* pplatform_c = NULL;
 
   switch (c_object)
     {
@@ -700,8 +738,10 @@ Player::collision(void* p_c_object, int c_object)
           !safe_timer.started() &&
           pbad_c->mode != BadGuy::HELD)
         {
-          if (pbad_c->mode == BadGuy::FLAT && input.fire == DOWN)
+          if (pbad_c->mode == BadGuy::FLAT && input.fire == DOWN
+               && !holding_something)
             {
+              holding_something = true;
               pbad_c->mode = BadGuy::HELD;
               pbad_c->base.y-=8;
             }
@@ -717,14 +757,12 @@ Player::collision(void* p_c_object, int c_object)
                   kill(SHRINK);
                 }
               else
-                {
-                   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);
-                }
+                pbad_c->kill_me(20);
             }
+          else if (pbad_c->frozen_timer.check() && (pbad_c->kind == BAD_MRBOMB
+              || pbad_c->kind == BAD_JUMPY || pbad_c->kind == BAD_FISH
+              || pbad_c->kind == BAD_SPIKY))
+                pbad_c->kill_me(20);
           else
             {
               if (!invincible_timer.started())
@@ -733,12 +771,60 @@ Player::collision(void* p_c_object, int c_object)
                 }
               else
                 {
-                  pbad_c->kill_me();
+                  pbad_c->kill_me(25);
                 }
             }
           player_status.score_multiplier++;
         }
       break;
+
+    case CO_TRAMPOLINE:
+      ptramp_c = (Trampoline*) p_c_object;
+      
+      // Pick up trampoline
+      if (ptramp_c->mode != Trampoline::M_HELD && input.fire == DOWN && !holding_something && on_ground())
+      {
+        holding_something = true;
+        ptramp_c->mode = Trampoline::M_HELD;
+        ptramp_c->base.y -= 8;
+      }
+      // Set down trampoline
+      else if (ptramp_c->mode == Trampoline::M_HELD && input.fire != DOWN)
+      {
+        holding_something = false;
+        ptramp_c->mode = Trampoline::M_NORMAL;
+        ptramp_c->base.y += 8;
+        ptramp_c->physic.set_velocity(physic.get_velocity_x(), physic.get_velocity_y());
+
+        //if (dir == RIGHT)
+        //  ptramp_c->base.x = base.x + base.width+1;
+        //else /* LEFT */
+        //  ptramp_c->base.x = base.x - base.width-1;
+      }
+/*
+      // Don't let tux walk through trampoline
+      else if (ptramp_c->mode != Trampoline::M_HELD && on_ground())
+      {
+        if (physic.get_velocity_x() > 0) // RIGHT
+        {
+          physic.set_velocity_x(0);
+          base.x = ptramp_c->base.x - base.width;
+        }
+        else if (physic.get_velocity_x() < 0) // LEFT
+        {
+          physic.set_velocity_x(0);
+          base.x = ptramp_c->base.x + ptramp_c->base.width;
+        }
+      }
+*/
+      break;
+    case CO_FLYING_PLATFORM:
+      pplatform_c = (FlyingPlatform*) p_c_object;
+      
+      base.y = pplatform_c->base.y - base.height;
+      physic.enable_gravity(false);
+      break;
+
     default:
       break;
     }
@@ -748,21 +834,27 @@ Player::collision(void* p_c_object, int c_object)
 /* Kill Player! */
 
 void
-Player::kill(int mode)
+Player::kill(HurtMode mode)
 {
+  if(dying)
+    return;
+  
   play_sound(sounds[SND_HURT], SOUND_CENTER_SPEAKER);
 
   physic.set_velocity_x(0);
 
   if (mode == SHRINK && size == BIG)
     {
-      if (got_coffee)
-        got_coffee = false;
-
-      size = SMALL;
-      base.height = 32;
-      duck = false;
-
+      if (got_power != NONE_POWER)
+        {
+          got_power = NONE_POWER;
+        }
+      else
+        {
+          size = SMALL;
+          base.height = 32;
+          duck = false;
+        }
       safe_timer.start(TUX_SAFE_TIME);
     }
   else
@@ -770,87 +862,76 @@ Player::kill(int mode)
       physic.enable_gravity(true);
       physic.set_acceleration(0, 0);
       physic.set_velocity(0, 7);
+      --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)
-    return true;
-  else
-    return false;
-}
-
 /* Remove Tux's power ups */
 void
 Player::remove_powerups()
 {
-  got_coffee = false;
+  got_power = NONE_POWER;
   size = SMALL;
   base.height = 32;
 }
 
 void
-Player::keep_in_bounds()
+Player::move(const Vector& vector)
 {
-  Level* plevel = World::current()->get_level();
+  base.x = vector.x;
+  base.y = vector.y;
+  old_base = previous_base = base;
+}
 
+void
+Player::check_bounds(Camera& viewport,
+    bool back_scrolling, bool hor_autoscroll)
+{
   /* 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 < scroll_x)
-    { 
-      base.x = scroll_x;
-    }
 
   /* Keep in-bounds, vertically: */
-  if (base.y > screen->h)
+  if (base.y > World::current()->get_level()->height * /*TILE_HEIGHT*/ 32)
     {
       kill(KILL);
+      return;
     }
 
-  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;
+  bool adjust = false;
+  // can happen if back scrolling is disabled
+  if(base.x < viewport.get_translation().x) {
+    base.x = viewport.get_translation().x;
+    adjust = true;
+  }
+  if(base.x >= viewport.get_translation().x + screen->w - base.width) {
+    base.x = viewport.get_translation().x + screen->w - base.width;
+    adjust = true;
+  }
+
+  if(adjust) {
+    // squished now?
+    if(collision_object_map(base)) {
+      kill(KILL);
+      return;
     }
-  else
+  }
+
+  if(hor_autoscroll)
     {
-      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;
-        }
+    if(base.x == viewport.get_translation().x)
+      if(issolid(base.x+32, base.y) || (size != SMALL && issolid(base.x+32, base.y+32)))
+        kill(KILL);
+
+    if(base.x + base.width > viewport.get_translation().x + screen->w)
+      base.x = viewport.get_translation().x + screen->w - base.width;
     }
+    
 }
 
 // EOF //