don't remove trampolines twice

[supertux.git] / src / player.cpp

diff --git a/src/player.cpp b/src/player.cpp
index dd02bc2..790d42b 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -64,6 +64,16 @@ void player_input_init(player_input_type* pplayer_input)
   pplayer_input->old_up = UP;
 }
 
+Player::Player(DisplayManager& display_manager)
+{
+  display_manager.add_drawable(this, LAYER_OBJECTS);
+  init();
+}
+
+Player::~Player()
+{
+}
+
 void
 Player::init()
 {
@@ -79,8 +89,6 @@ Player::init()
 
   base.x = plevel->start_pos_x;
   base.y = plevel->start_pos_y;
-  base.xm = 0;
-  base.ym = 0;
   previous_base = old_base = base;
   dir = RIGHT;
   old_dir = dir;
@@ -144,8 +152,6 @@ Player::level_begin()
 {
   base.x  = 100;
   base.y  = 170;
-  base.xm = 0;
-  base.ym = 0;
   previous_base = old_base = base;
   duck = false;
 
@@ -162,7 +168,7 @@ Player::level_begin()
 }
 
 void
-Player::action(double frame_ratio)
+Player::action(float elapsed_time)
 {
   bool jumped_in_solid = false;
 
@@ -176,7 +182,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) 
     {
@@ -203,7 +209,7 @@ Player::action(double frame_ratio)
       if(!duck && on_ground() && old_base.x == base.x && old_base.y == base.y
          && collision_object_map(base))
         {
-          base.x += frame_ratio * WALK_SPEED;
+          base.x += elapsed_time * WALK_SPEED * (dir ? 1: -1);
           previous_base = old_base = base;
         }
 
@@ -405,6 +411,7 @@ 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);
       else
@@ -415,13 +422,15 @@ Player::handle_vertical_input()
     {
       jumping = false;
       physic.set_velocity_y(0);
+      butt_jump = false;  // jump was not full, disable butt jump
     }
 
-  if (input.down == DOWN && !on_ground() && !duck && size != SMALL)
-    butt_jump = true;
-  else if (input.down == UP)
-    butt_jump = false;
-  if (input.down == DOWN && butt_jump && on_ground())
+   /* 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)
   {
     if(World::current()->trybreakbrick(base.x, base.y + base.height, false)
       || World::current()->trybreakbrick(
@@ -429,7 +438,7 @@ Player::handle_vertical_input()
         // make tux jumping a little bit again after breaking the bricks
         physic.set_velocity_y(2);
     }
-    butt_jump = false;
+//    butt_jump = false;
   }
 
   if ( (issolid(base.x + base.width / 2, base.y + base.height + 64) ||
@@ -443,6 +452,9 @@ Player::handle_vertical_input()
       can_jump = true;
     }
 
+  if(on_ground())   /* Make sure jumping is off. */
+    jumping = false;
+
   input.old_up = input.up;
 }
 
@@ -461,7 +473,9 @@ Player::handle_input()
   /* Shoot! */
   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);
+      holding_something = true;
+      World::current()->add_bullet(Vector(base.x, base.y + (base.height/2)),
+          physic.get_velocity_x(), dir);
       input.old_fire = DOWN;
     }
 
@@ -559,13 +573,15 @@ Player::grabdistros()
 }
 
 void
-Player::draw()
+Player::draw(ViewPort& viewport, int )
 {
+  Vector pos = viewport.world2screen(Vector(base.x, base.y));
+
   if (!safe_timer.started() || (global_frame_counter % 2) == 0)
     {
       if (dying == DYING_SQUISHED)
         {
-          smalltux_gameover->draw(base.x, base.y);
+          smalltux_gameover->draw(pos);
         }
       else
         {
@@ -583,46 +599,46 @@ Player::draw()
           if (duck && size != SMALL)
             {
               if (dir == RIGHT)
-                sprite->duck_right->draw(base.x, base.y);
+                sprite->duck_right->draw(pos);
               else 
-                sprite->duck_left->draw(base.x, base.y);
+                sprite->duck_left->draw(pos);
             }
           else if (skidding_timer.started())
             {
               if (dir == RIGHT)
-                sprite->skid_right->draw(base.x, base.y);
+                sprite->skid_right->draw(pos);
               else
-                sprite->skid_left->draw(base.x, base.y); 
+                sprite->skid_left->draw(pos); 
             }
           else if (kick_timer.started())
             {
               if (dir == RIGHT)
-                sprite->kick_right->draw(base.x, base.y);
+                sprite->kick_right->draw(pos);
               else
-                sprite->kick_left->draw(base.x, base.y); 
+                sprite->kick_left->draw(pos); 
             }
           else if (physic.get_velocity_y() != 0)
             {
               if (dir == RIGHT)
-                sprite->jump_right->draw(base.x, base.y);
+                sprite->jump_right->draw(pos);
               else
-                sprite->jump_left->draw(base.x, base.y);                   
+                sprite->jump_left->draw(pos);                   
             }
           else
             {
               if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
                 {
                   if (dir == RIGHT)
-                    sprite->stand_right->draw( base.x, base.y);
+                    sprite->stand_right->draw(pos);
                   else
-                    sprite->stand_left->draw( base.x, base.y);
+                    sprite->stand_left->draw(pos);
                 }
               else // moving
                 {
                   if (dir == RIGHT)
-                    sprite->walk_right->draw(base.x, base.y);
+                    sprite->walk_right->draw(pos);
                   else
-                    sprite->walk_left->draw(base.x, base.y);
+                    sprite->walk_left->draw(pos);
                 }
             }
                       
@@ -630,9 +646,9 @@ Player::draw()
           if (holding_something && physic.get_velocity_y() == 0)
             {
               if (dir == RIGHT)
-                sprite->grab_right->draw(base.x, base.y);
+                sprite->grab_right->draw(pos);
               else
-                sprite->grab_left->draw(base.x, base.y);
+                sprite->grab_left->draw(pos);
             }
 
           // Draw blinking star overlay
@@ -640,9 +656,9 @@ Player::draw()
              (invincible_timer.get_left() > TUX_INVINCIBLE_TIME_WARNING || global_frame_counter % 3))
             {
               if (size == SMALL || duck)
-                smalltux_star->draw(base.x, base.y);
+                smalltux_star->draw(pos);
               else
-                largetux_star->draw(base.x, base.y);
+                largetux_star->draw(pos);
             }
         }
     }     
@@ -653,6 +669,14 @@ Player::draw()
 }
 
 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;