Fixed flip level transformer
[supertux.git] / src / object / player.cpp
index aee2daa..2005f51 100644 (file)
@@ -1,7 +1,7 @@
 //  $Id$
 //
-//  SuperTux -  A Jump'n Run
-//  Copyright (C) 2003 Tobias Glaesser <tobi.web@gmx.de>
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
 #include "sprite/sprite.hpp"
 #include "sector.hpp"
 #include "resources.hpp"
-#include "video/screen.hpp"
 #include "statistics.hpp"
 #include "game_session.hpp"
 #include "object/tilemap.hpp"
 #include "object/camera.hpp"
-#include "object/gameobjs.hpp"
+#include "object/particles.hpp"
 #include "object/portable.hpp"
+#include "object/bullet.hpp"
 #include "trigger/trigger_base.hpp"
 #include "control/joystickkeyboardcontroller.hpp"
+#include "scripting/squirrel_util.hpp"
 #include "main.hpp"
+#include "platform.hpp"
+#include "badguy/badguy.hpp"
 #include "player_status.hpp"
+#include "log.hpp"
+#include "falling_coin.hpp"
+#include "random_generator.hpp"
 
 static const int TILES_FOR_BUTTJUMP = 3;
 static const float SHOOTING_TIME = .150;
@@ -56,6 +62,10 @@ static const float MAX_WALK_XM = 230;
 static const float MAX_RUN_XM = 320;
 static const float WALK_SPEED = 100;
 
+static const float KICK_TIME = .3;
+
+static const float UNDUCK_HURT_TIME = 0.25; /**< if Tux cannot unduck for this long, he will get hurt */
+
 // growing animation
 Surface* growingtux_left[GROWING_FRAMES];
 Surface* growingtux_right[GROWING_FRAMES];
@@ -88,18 +98,24 @@ TuxBodyParts::draw(DrawingContext& context, const Vector& pos, int layer)
   if(body != NULL)
     body->draw(context, pos, layer-3);
   if(arms != NULL)
-    arms->draw(context, pos, layer);
+    arms->draw(context, pos, layer+10);
   if(feet != NULL)
     feet->draw(context, pos, layer-2);
 }
 
 Player::Player(PlayerStatus* _player_status)
-  : player_status(_player_status), grabbed_object(0)
+  : player_status(_player_status), grabbed_object(NULL), ghost_mode(false)
 {
   controller = main_controller;
-  smalltux_gameover = sprite_manager->create("smalltux-gameover");
-  smalltux_star = sprite_manager->create("smalltux-star");
-  bigtux_star = sprite_manager->create("bigtux-star");
+  smalltux_gameover = sprite_manager->create("images/creatures/tux_small/smalltux-gameover.sprite");
+  smalltux_star = sprite_manager->create("images/creatures/tux_small/smalltux-star.sprite");
+  bigtux_star = sprite_manager->create("images/creatures/tux_big/bigtux-star.sprite");
+
+  sound_manager->preload("sounds/bigjump.wav");
+  sound_manager->preload("sounds/jump.wav");
+  sound_manager->preload("sounds/hurt.wav");
+  sound_manager->preload("sounds/skid.wav");
+
   init();
 }
 
@@ -114,9 +130,9 @@ void
 Player::init()
 {
   if(is_big())
-    bbox.set_size(31.8, 63.8);
+    set_size(31.8, 62.8);
   else
-    bbox.set_size(31.8, 31.8);
+    set_size(31.8, 30.8);
 
   dir = RIGHT;
   old_dir = dir;
@@ -132,19 +148,49 @@ Player::init()
   deactivated = false;
   backflipping = false;
   backflip_direction = 0;
+  visible = true;
   
   on_ground_flag = false;
-  grabbed_object = 0;
+  grabbed_object = NULL;
+
+  floor_normal = Vector(0,-1);
 
   physic.reset();
 }
 
 void
+Player::expose(HSQUIRRELVM vm, SQInteger table_idx)
+{
+  Scripting::Player* interface = static_cast<Scripting::Player*> (this);
+  Scripting::expose_object(vm, table_idx, interface, "Tux", false);
+}
+
+void
+Player::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
+{
+  Scripting::unexpose_object(vm, table_idx, "Tux");
+}
+
+void
 Player::set_controller(Controller* controller)
 {
   this->controller = controller;
 }
 
+bool
+Player::adjust_height(float new_height)
+{
+  Rect bbox2 = bbox;
+  bbox2.move(Vector(0, bbox.get_height() - new_height));
+  bbox2.set_height(new_height);
+  if (!Sector::current()->is_free_space(bbox2)) return false;
+  // adjust bbox accordingly
+  // note that we use members of moving_object for this, so we can run this during CD, too
+  set_pos(bbox2.p1);
+  set_size(bbox2.get_width(), bbox2.get_height());
+  return true;
+}
+
 void
 Player::update(float elapsed_time)
 {
@@ -153,44 +199,23 @@ Player::update(float elapsed_time)
     return;
   }
 
-  if(!controller->hold(Controller::ACTION) && grabbed_object) {
-    grabbed_object = 0;
-    // move the grabbed object a bit away from tux
-    Vector pos = get_pos() + 
-        Vector(dir == LEFT ? -bbox.get_width() : bbox.get_width(),
-                bbox.get_height()*0.66666 - 32);
-    MovingObject* object = dynamic_cast<MovingObject*> (grabbed_object);
-    if(object) {
-      object->set_pos(pos);
-    } else {
-#ifdef DEBUG
-      std::cout << "Non MovingObjetc grabbed?!?\n";
-#endif
-    }
-  }
-
   if(!dying && !deactivated)
     handle_input();
 
   movement = physic.get_movement(elapsed_time);
-  on_ground_flag = false;
 
-#if 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 += elapsed_time * WALK_SPEED * (dir ? 1: -1);
-    previous_base = old_base = base;
-  }
-#endif
-
-  if(grabbed_object != 0) {
+  if(grabbed_object != NULL && !dying) {
     Vector pos = get_pos() + 
-      Vector(dir == LEFT ? -16 : 16,
-             bbox.get_height()*0.66666 - 32);
-    grabbed_object->grab(*this, pos);
+      Vector(dir == LEFT ? -16 : 16, get_bbox().get_height()*0.66666 - 32);
+    grabbed_object->grab(*this, pos, dir);
+  }
+  
+  if(grabbed_object != NULL && dying){
+    grabbed_object->ungrab(*this, dir);
+    grabbed_object = NULL;
   }
+
+  on_ground_flag = false;
 }
 
 bool
@@ -266,10 +291,9 @@ Player::handle_horizontal_input()
       // dust some particles
       Sector::current()->add_object(
         new Particles(
-          Vector(bbox.p1.x + (dir == RIGHT ? bbox.get_width() : 0),
-                 bbox.p2.y),
+          Vector(dir == RIGHT ? get_bbox().p2.x : get_bbox().p1.x, get_bbox().p2.y),
           dir == RIGHT ? 270+20 : 90-40, dir == RIGHT ? 270+40 : 90-20,
-          Vector(280,-260), Vector(0,0.030), 3, Color(100,100,100), 3, .8,
+          Vector(280, -260), Vector(0, 300), 3, Color(.4, .4, .4), 3, .8,
           LAYER_OBJECTS+1));
       
       ax *= 2.5;
@@ -280,7 +304,7 @@ Player::handle_horizontal_input()
 
   // we get slower when not pressing any keys
   if(dirsign == 0) {
-    if(fabs(vx) < WALK_SPEED) {
+    if ((on_ground()) && (fabs(vx) < WALK_SPEED)) {
       vx = 0;
       ax = 0;
     } else if(vx < 0) {
@@ -308,9 +332,19 @@ Player::handle_horizontal_input()
   // extend/shrink tux collision rectangle so that we fall through/walk over 1
   // tile holes
   if(fabsf(vx) > MAX_WALK_XM) {
-    bbox.set_width(33);
+    set_width(34);
   } else {
-    bbox.set_width(31.8);
+    set_width(31.8);
+  }
+
+  // on downward slopes, adjust vertical velocity to match slope angle
+  if (on_ground()) {
+    if (floor_normal.y != 0) {
+      if ((floor_normal.x * vx) > 0) {
+        // we overdo it a little, just to be on the safe side
+        vy = vx * (floor_normal.x / floor_normal.y) * 2;
+      }
+    }
   }
 
   physic.set_velocity(vx, vy);
@@ -441,6 +475,29 @@ Player::handle_vertical_input()
 void
 Player::handle_input()
 {
+  if (ghost_mode) {
+    handle_input_ghost();
+    return;
+  }
+
+  if(!controller->hold(Controller::ACTION) && grabbed_object) {
+    // move the grabbed object a bit away from tux
+    Vector pos = get_pos() + 
+        Vector(dir == LEFT ? -bbox.get_width()-1 : bbox.get_width()+1,
+                bbox.get_height()*0.66666 - 32);
+    Rect dest(pos, pos + Vector(32, 32));
+    if(Sector::current()->is_free_space(dest)) {
+      MovingObject* moving_object = dynamic_cast<MovingObject*> (grabbed_object);
+      if(moving_object) {
+        moving_object->set_pos(pos);
+      } else {
+        log_debug << "Non MovingObjetc grabbed?!?" << std::endl;
+      }
+      grabbed_object->ungrab(*this, dir);
+      grabbed_object = NULL;
+    }
+  }
   /* Handle horizontal movement: */
   if (!backflipping) handle_horizontal_input();
   else {
@@ -469,47 +526,129 @@ Player::handle_input()
   /* Duck! */
   if (controller->hold(Controller::DOWN) && is_big() && !duck 
       && physic.get_velocity_y() == 0 && on_ground()) {
-    duck = true;
-    bbox.move(Vector(0, 32));
-    bbox.set_height(31.8);
-  } else if(!controller->hold(Controller::DOWN) && is_big() && duck) {
-    // try if we can really unduck
-    bbox.move(Vector(0, -32));
-    bbox.set_height(63.8);
-    duck = false;
-    // FIXME
-#if 0
-    // when unducking in air we need some space to do so
-    if(on_ground() || !collision_object_map(bbox)) {
+    if (adjust_height(31.8)) {
+      duck = true;
+      unduck_hurt_timer.stop();
+    } else {
+      // FIXME: what now?
+    }
+  }
+  /* Unduck! */
+  else if(!controller->hold(Controller::DOWN) && is_big() && duck) {
+    if (adjust_height(63.8)) {
       duck = false;
+      unduck_hurt_timer.stop();
     } else {
-      // undo the ducking changes
-      bbox.move(Vector(0, 32));
-      bbox.set_height(31.8);
+      // if timer is not already running, start it.
+      if (unduck_hurt_timer.get_period() == 0) {
+        unduck_hurt_timer.start(UNDUCK_HURT_TIME);
+      } 
+      else if (unduck_hurt_timer.check()) {
+        kill(false);
+      }
     }
-#endif
   }
 }
 
 void
-Player::set_bonus(BonusType type, bool animate)
+Player::handle_input_ghost()
+{
+  float vx = 0;
+  float vy = 0;
+  if (controller->hold(Controller::LEFT)) vx -= MAX_RUN_XM;
+  if (controller->hold(Controller::RIGHT)) vx += MAX_RUN_XM;
+  if ((controller->hold(Controller::UP)) || (controller->hold(Controller::JUMP))) vy += MAX_RUN_XM;
+  if (controller->hold(Controller::DOWN)) vy -= MAX_RUN_XM;
+  if (controller->hold(Controller::ACTION)) set_ghost_mode(false);
+  physic.set_velocity(vx, vy);
+  physic.set_acceleration(0, 0);
+}
+
+void
+Player::add_coins(int count)
+{
+  player_status->add_coins(count);
+}
+
+void
+Player::add_bonus(const std::string& bonustype)
 {
-  if(player_status->bonus >= type)
+  if(bonustype == "grow") {
+    add_bonus(GROWUP_BONUS);
+  } else if(bonustype == "fireflower") {
+    add_bonus(FIRE_BONUS);
+  } else if(bonustype == "iceflower") {
+    add_bonus(ICE_BONUS);
+  } else if(bonustype == "none") {
+    add_bonus(NO_BONUS);
+  } else {
+    std::ostringstream msg;
+    msg << "Unknown bonus type "  << bonustype;
+    throw std::runtime_error(msg.str());
+  }
+}
+
+void
+Player::add_bonus(BonusType type, bool animate)
+{
+  // always ignore NO_BONUS
+  if (type == NO_BONUS) {
     return;
-  
+  }
+
+  // ignore GROWUP_BONUS if we're already big
+  if (type == GROWUP_BONUS) {
+    if (player_status->bonus == GROWUP_BONUS) return; 
+    if (player_status->bonus == FIRE_BONUS) return;
+    if (player_status->bonus == ICE_BONUS) return;
+  }
+
+  set_bonus(type, animate);
+}
+
+void
+Player::set_bonus(BonusType type, bool animate)
+{
   if(player_status->bonus == NO_BONUS) {
-    bbox.set_height(63.8);
-    bbox.move(Vector(0, -32));
+    if (!adjust_height(62.8)) return;
     if(animate)
       growing_timer.start(GROWING_TIME);
   }
-  
+
+  if ((type == NO_BONUS) || (type == GROWUP_BONUS)) {
+    player_status->max_fire_bullets = 0;
+    player_status->max_ice_bullets = 0;
+  }
+  if (type == FIRE_BONUS) player_status->max_fire_bullets++;
+  if (type == ICE_BONUS) player_status->max_ice_bullets++;
+
   player_status->bonus = type;
 }
 
 void
+Player::set_visible(bool visible)
+{
+  this->visible = visible;
+}
+
+bool
+Player::get_visible()
+{
+  return visible;
+}
+
+void
+Player::kick()
+{
+  kick_timer.start(KICK_TIME);
+}
+
+void
 Player::draw(DrawingContext& context)
 {
+  if(!visible)
+    return;
+
   TuxBodyParts* tux_body;
           
   if (player_status->bonus == GROWUP_BONUS)
@@ -521,7 +660,7 @@ Player::draw(DrawingContext& context)
   else
     tux_body = small_tux;
 
-  int layer = LAYER_OBJECTS + 10;
+  int layer = LAYER_OBJECTS + 1;
 
   /* Set Tux sprite action */
   if (duck && is_big())
@@ -552,7 +691,7 @@ Player::draw(DrawingContext& context)
     else // dir == RIGHT
       tux_body->set_action("buttjump-right");
     }
-  else if (physic.get_velocity_y() != 0)
+  else if (!on_ground())
     {
     if(dir == LEFT)
       tux_body->set_action("jump-left");
@@ -611,31 +750,16 @@ Player::draw(DrawingContext& context)
 
   /* Draw Tux */
   if(dying) {
-    smalltux_gameover->draw(context, get_pos(), layer);
-  } else if(growing_timer.get_timeleft() > 0) {
-    if(!is_big())
-      {
-      if (dir == RIGHT)
-        context.draw_surface(growingtux_right[GROWING_FRAMES-1 - 
-                 int((growing_timer.get_timegone() *
+    smalltux_gameover->draw(context, get_pos(), LAYER_FLOATINGOBJECTS + 1);
+  } 
+  else if ((growing_timer.get_timeleft() > 0) && (!duck)) {
+      if (dir == RIGHT) {
+        context.draw_surface(growingtux_right[int((growing_timer.get_timegone() *
                  GROWING_FRAMES) / GROWING_TIME)], get_pos(), layer);
-      else
-        context.draw_surface(growingtux_left[GROWING_FRAMES-1 - 
-                int((growing_timer.get_timegone() *
+      } else {
+        context.draw_surface(growingtux_left[int((growing_timer.get_timegone() *
                 GROWING_FRAMES) / GROWING_TIME)], get_pos(), layer);
       }
-    else
-      {
-      if (dir == RIGHT)
-        context.draw_surface(growingtux_right[
-            int((growing_timer.get_timegone() *
-                GROWING_FRAMES) / GROWING_TIME)], get_pos(), layer);
-      else
-        context.draw_surface(growingtux_left[
-            int((growing_timer.get_timegone() *
-                             GROWING_FRAMES) / GROWING_TIME)],
-            get_pos(), layer);
-      }
     }
   else if (safe_timer.started() && size_t(game_time*40)%2)
     ;  // don't draw Tux
@@ -655,47 +779,117 @@ Player::draw(DrawingContext& context)
   } 
 }
 
+void
+Player::collision_tile(uint32_t tile_attributes)
+{
+  if(tile_attributes & Tile::HURTS)
+    kill(false);
+}
+
 HitResponse
 Player::collision(GameObject& other, const CollisionHit& hit)
 {
-  Portable* portable = dynamic_cast<Portable*> (&other);
-  if(portable && grabbed_object == 0 && controller->hold(Controller::ACTION)
-     && fabsf(hit.normal.x) > .9) {
-    grabbed_object = portable;
-    return CONTINUE;
+  Bullet* bullet = dynamic_cast<Bullet*> (&other);
+  if(bullet) {
+    return FORCE_MOVE;
   }
-  if(other.get_flags() & FLAG_SOLID) {
-    TileMap* tilemap = dynamic_cast<TileMap*> (&other);
-    if(tilemap) {
-      const TilemapCollisionHit* thit = 
-        static_cast<const TilemapCollisionHit*> (&hit);
-      if(thit->tileflags & Tile::SPIKE)
-        kill(SHRINK);
 
-      if(! (thit->tileflags & Tile::SOLID))
-        return FORCE_MOVE;
+  if(other.get_flags() & FLAG_PORTABLE) {
+    Portable* portable = dynamic_cast<Portable*> (&other);
+    assert(portable != NULL);
+    if(portable && grabbed_object == NULL
+        && controller->hold(Controller::ACTION)
+        && fabsf(hit.normal.x) > .9) {
+      grabbed_object = portable;
+      grabbed_object->grab(*this, get_pos(), dir);
+      return CONTINUE;
     }
+  }
+  if(other.get_flags() & FLAG_SOLID) {
+    /*
+    printf("Col %p: HN: %3.1f %3.1f D %.1f P: %3.1f %3.1f M: %3.1f %3.1f\n",
+        &other,
+        hit.normal.x, hit.normal.y, hit.depth,
+        get_pos().x, get_pos().y,
+        movement.x, movement.y);
+    */
     
     if(hit.normal.y < 0) { // landed on floor?
-      if (physic.get_velocity_y() < 0)
+      if(physic.get_velocity_y() < 0)
         physic.set_velocity_y(0);
+
       on_ground_flag = true;
+
+      // remember normal of this tile
+      if (hit.normal.y > -0.9) {
+        floor_normal.x = hit.normal.x;
+        floor_normal.y = hit.normal.y;
+      } else {
+        // slowly adjust to unisolid tiles. 
+        // Necessary because our bounding box sometimes reaches through slopes and thus hits unisolid tiles
+        floor_normal.x = (floor_normal.x * 0.9) + (hit.normal.x * 0.1);
+        floor_normal.y = (floor_normal.y * 0.9) + (hit.normal.y * 0.1);
+      }
+
+      // hack platforms so that we stand normally on them when going down...
+      Platform* platform = dynamic_cast<Platform*> (&other);
+      if(platform != NULL) {
+        if(platform->get_speed().y > 0)
+          physic.set_velocity_y(-platform->get_speed().y);
+        //physic.set_velocity_x(platform->get_speed().x);
+      }
     } else if(hit.normal.y > 0) { // bumped against the roof
       physic.set_velocity_y(.1);
+
+      // hack platform so that we are not glued to it from below
+      Platform* platform = dynamic_cast<Platform*> (&other);
+      if(platform != NULL) {
+        physic.set_velocity_y(-platform->get_speed().y);
+      }      
     }
     
     if(fabsf(hit.normal.x) > .9) { // hit on the side?
       physic.set_velocity_x(0);
     }
 
+    MovingObject* omov = dynamic_cast<MovingObject*> (&other);
+    if(omov != NULL) {
+      Vector mov = movement - omov->get_movement();
+      /*
+      printf("W %p - HITN: %3.1f %3.1f D:%3.1f TM: %3.1f %3.1f TD: %3.1f %3.1f PM: %3.2f %3.1f\n",
+          omov,
+          hit.normal.x, hit.normal.y,
+          hit.depth,
+          movement.x, movement.y,
+          dest.p1.x, dest.p1.y,
+          omov->get_movement().x, omov->get_movement().y);
+      */
+    }
+    
     return CONTINUE;
   }
 
-  TriggerBase* trigger = dynamic_cast<TriggerBase*> (&other);
-  if(trigger) {
-    if(controller->pressed(Controller::UP))
-      trigger->event(*this, TriggerBase::EVENT_ACTIVATE);
+#ifdef DEBUG
+  assert(dynamic_cast<MovingObject*> (&other) != NULL);
+#endif
+  MovingObject* moving_object = static_cast<MovingObject*> (&other); 
+  if(moving_object->get_group() == COLGROUP_TOUCHABLE) {
+    TriggerBase* trigger = dynamic_cast<TriggerBase*> (&other);
+    if(trigger) {
+      if(controller->pressed(Controller::UP))
+        trigger->event(*this, TriggerBase::EVENT_ACTIVATE);
+    }
+
+    return FORCE_MOVE;
+  }
+
+  BadGuy* badguy = dynamic_cast<BadGuy*> (&other);
+  if(badguy != NULL) {
+    if(safe_timer.started() || invincible_timer.started())
+      return FORCE_MOVE;
+
+    return CONTINUE;
   }
 
   return FORCE_MOVE;
@@ -711,58 +905,64 @@ Player::make_invincible()
 
 /* Kill Player! */
 void
-Player::kill(HurtMode mode)
+Player::kill(bool completely)
 {
   if(dying || deactivated)
     return;
 
-  if(mode != KILL && 
-          safe_timer.get_timeleft() > 0 || invincible_timer.get_timeleft() > 0)
+  if(!completely && safe_timer.started() || invincible_timer.started())
     return;                          
   
   sound_manager->play("sounds/hurt.wav");
 
   physic.set_velocity_x(0);
 
-  if (mode == SHRINK && is_big())
-    {
-      if (player_status->bonus == FIRE_BONUS
-          || player_status->bonus == ICE_BONUS)
-        {
-          safe_timer.start(TUX_SAFE_TIME);
-          player_status->bonus = GROWUP_BONUS;
-        }
-      else 
-        {
-          growing_timer.start(GROWING_TIME);
-          safe_timer.start(TUX_SAFE_TIME + GROWING_TIME);
-          bbox.set_height(31.8);
-          duck = false;
-          player_status->bonus = NO_BONUS;
-        }
+  if(!completely && is_big()) {
+    if(player_status->bonus == FIRE_BONUS
+        || player_status->bonus == ICE_BONUS) {
+      safe_timer.start(TUX_SAFE_TIME);
+      set_bonus(GROWUP_BONUS);
+    } else {
+      //growing_timer.start(GROWING_TIME);
+      safe_timer.start(TUX_SAFE_TIME /* + GROWING_TIME */);
+      adjust_height(30.8);
+      duck = false;
+      set_bonus(NO_BONUS);
     }
-  else
+  } else {
+    for (int i = 0; (i < 5) && (i < player_status->coins); i++)
     {
-      physic.enable_gravity(true);
-      physic.set_acceleration(0, 0);
-      physic.set_velocity(0, 700);
-      player_status->lives -= 1;
-      player_status->bonus = NO_BONUS;
-      dying = true;
-      dying_timer.start(3.0);
-      flags |= FLAG_NO_COLLDET;
+      // the numbers: starting x, starting y, velocity y
+      Sector::current()->add_object(new FallingCoin(get_pos() + 
+            Vector(systemRandom.rand(5), systemRandom.rand(-32,18)), 
+            systemRandom.rand(-100,100)));
     }
+    physic.enable_gravity(true);
+    physic.set_acceleration(0, 0);
+    physic.set_velocity(0, 700);
+    player_status->coins -= 25;
+    set_bonus(NO_BONUS);
+    dying = true;
+    dying_timer.start(3.0);
+    set_group(COLGROUP_DISABLED);
+
+    DisplayEffect* effect = new DisplayEffect();
+    effect->fade_out(3.0);
+    Sector::current()->add_object(effect);
+    sound_manager->stop_music(3.0);
+  }
 }
 
 void
 Player::move(const Vector& vector)
 {
-  bbox.set_pos(vector);
+  set_pos(vector);
+
+  // TODO: do we need the following? Seems irrelevant to moving the player
   if(is_big())
-    bbox.set_size(31.8, 63.8);
+    set_size(31.8, 63.8);
   else
-    bbox.set_size(31.8, 31.8);
-  on_ground_flag = false;
+    set_size(31.8, 31.8);
   duck = false;
   last_ground_y = vector.y;
 
@@ -773,28 +973,27 @@ void
 Player::check_bounds(Camera* camera)
 {
   /* Keep tux in bounds: */
-  if (get_pos().x < 0)
-    // Lock Tux to the size of the level, so that he doesn't fall of
-      // on the left side
-      bbox.set_pos(Vector(0, get_pos().y));
-    }
+  if (get_pos().x < 0) {
+    // Lock Tux to the size of the level, so that he doesn't fall of
+    // on the left side
+    set_pos(Vector(0, get_pos().y));
+  }
 
   /* Keep in-bounds, vertically: */
-  if (get_pos().y > Sector::current()->solids->get_height() * 32)
-    {
-      kill(KILL);
-      return;
-    }
+  if (get_pos().y > Sector::current()->solids->get_height() * 32) {
+    kill(true);
+    return;
+  }
 
   bool adjust = false;
   // can happen if back scrolling is disabled
   if(get_pos().x < camera->get_translation().x) {
-    bbox.set_pos(Vector(camera->get_translation().x, get_pos().y));
+    set_pos(Vector(camera->get_translation().x, get_pos().y));
     adjust = true;
   }
   if(get_pos().x >= camera->get_translation().x + SCREEN_WIDTH - bbox.get_width())
   {
-    bbox.set_pos(Vector(
+    set_pos(Vector(
           camera->get_translation().x + SCREEN_WIDTH - bbox.get_width(),
           get_pos().y));
     adjust = true;
@@ -813,6 +1012,21 @@ Player::check_bounds(Camera* camera)
 }
 
 void
+Player::add_velocity(const Vector& velocity)
+{
+  physic.set_velocity(physic.get_velocity() + velocity);
+}
+
+void
+Player::add_velocity(const Vector& velocity, const Vector& end_speed)
+{
+  if (end_speed.x > 0) physic.set_velocity_x(std::min(physic.get_velocity_x() + velocity.x, end_speed.x));
+  if (end_speed.x < 0) physic.set_velocity_x(std::max(physic.get_velocity_x() + velocity.x, end_speed.x));
+  if (end_speed.y > 0) physic.set_velocity_y(std::min(physic.get_velocity_y() + velocity.y, end_speed.y));
+  if (end_speed.y < 0) physic.set_velocity_y(std::max(physic.get_velocity_y() + velocity.y, end_speed.y));
+}
+
+void
 Player::bounce(BadGuy& )
 {
   if(controller->hold(Controller::JUMP))
@@ -829,6 +1043,8 @@ Player::deactivate()
   deactivated = true;
   physic.set_velocity_x(0);
   physic.set_velocity_y(0);
+  physic.set_acceleration_x(0);
+  physic.set_acceleration_y(0);
 }
 
 void
@@ -841,3 +1057,21 @@ void Player::walk(float speed)
 {
   physic.set_velocity_x(speed);
 }
+
+void
+Player::set_ghost_mode(bool enable)
+{
+  if (ghost_mode == enable) return;
+  if (enable) {
+    ghost_mode = true;
+    set_group(COLGROUP_DISABLED);
+    physic.enable_gravity(false);
+    log_debug << "You feel lightheaded. Use movement controls to float around, press ACTION to scare badguys." << std::endl;
+  } else {
+    ghost_mode = false;
+    set_group(COLGROUP_MOVING);
+    physic.enable_gravity(true);
+    log_debug << "You feel solid again." << std::endl;
+  }
+}
+