X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fplayer.cpp;h=427c6532bfacd58c70bd3679e6bfd2f754cf4a2f;hb=b9a95f9ce5940051dec5dd5bfb936ee7e0bd4565;hp=397aa54ec73a64290783dcd1e946f6273c40730f;hpb=026504c85701653667d9f1977562974905abec05;p=supertux.git

diff --git a/src/object/player.cpp b/src/object/player.cpp
index 397aa54ec..427c6532b 100644
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -74,7 +74,7 @@ static const float MAX_WALK_XM = 230;
 /** maximum run velocity (pixel/s) */
 static const float MAX_RUN_XM = 320;
 /** maximum horizontal climb velocity */
-static const float MAX_CLIMB_XM = 48;
+static const float MAX_CLIMB_XM = 96;
 /** maximum vertical climb velocity */
 static const float MAX_CLIMB_YM = 128;
 /** instant velocity when tux starts to walk */
@@ -99,6 +99,13 @@ static const float JUMP_EARLY_APEX_FACTOR = 3.0;
 
 static const float JUMP_GRACE_TIME = 0.25f; /**< time before hitting the ground that the jump button may be pressed (and still trigger a jump) */
 
+/* Tux's collision rectangle */
+static const float TUX_WIDTH = 31.8f;
+static const float RUNNING_TUX_WIDTH = 34;
+static const float SMALL_TUX_HEIGHT = 30.8f;
+static const float BIG_TUX_HEIGHT = 62.8f;
+static const float DUCKED_TUX_HEIGHT = 31.8f;
+
 bool no_water = true;
 }
 
@@ -182,9 +189,9 @@ void
 Player::init()
 {
   if(is_big())
-    set_size(31.8f, 62.8f);
+    set_size(TUX_WIDTH, BIG_TUX_HEIGHT);
   else
-    set_size(31.8f, 30.8f);
+    set_size(TUX_WIDTH, SMALL_TUX_HEIGHT);
 
   dir = RIGHT;
   old_dir = dir;
@@ -192,6 +199,7 @@ Player::init()
   dead = false;
 
   dying = false;
+  winning = false;
   peekingX = AUTO;
   peekingY = AUTO;
   last_ground_y = 0;
@@ -255,6 +263,15 @@ Player::set_controller(Controller* controller)
   this->controller = controller;
 }
 
+void
+Player::set_winning()
+{
+  if( ! is_winning() ){
+    winning = true;
+    invincible_timer.start(10000.0f);
+  }
+}
+
 void 
 Player::use_scripting_controller(bool use_or_release)
 {
@@ -285,6 +302,7 @@ Player::adjust_height(float new_height)
   bbox2.move(Vector(0, bbox.get_height() - new_height));
   bbox2.set_height(new_height);
 
+
   if(new_height > bbox.get_height()) {
     Rectf additional_space = bbox2;
     additional_space.set_height(new_height - bbox.get_height());
@@ -331,9 +349,9 @@ Player::update(float elapsed_time)
   // extend/shrink tux collision rectangle so that we fall through/walk over 1
   // tile holes
   if(fabsf(physic.get_velocity_x()) > MAX_WALK_XM) {
-    set_width(34);
+    set_width(RUNNING_TUX_WIDTH);
   } else {
-    set_width(31.8f);
+    set_width(TUX_WIDTH);
   }
 
   // on downward slopes, adjust vertical velocity so tux walks smoothly down
@@ -417,6 +435,14 @@ Player::update(float elapsed_time)
     if (sprite->animation_done()) growing = false;
   }
 
+  // when climbing animate only while moving
+  if(climbing){
+    if((physic.get_velocity_x()==0)&&(physic.get_velocity_y()==0))
+      sprite->stop_animation();
+    else
+      sprite->set_animation_loops(-1);
+  }
+
 }
 
 bool
@@ -472,8 +498,8 @@ Player::handle_horizontal_input()
     }
   }
 
-  // do not run if we're holding something
-  if ( false /* grabbed_extra_heavy_object */) {
+  // do not run if we're holding something which slows us down
+  if ( grabbed_object && grabbed_object->is_hampering() ) {
     ax = dirsign * WALK_ACCELERATION_X;
     // limit speed
     if(vx >= MAX_WALK_XM && dirsign > 0) {
@@ -566,7 +592,7 @@ Player::do_duck() {
   if (does_buttjump)
     return;
 
-  if (adjust_height(31.8f)) {
+  if (adjust_height(DUCKED_TUX_HEIGHT)) {
     duck = true;
     growing = false;
     unduck_hurt_timer.stop();
@@ -584,7 +610,7 @@ Player::do_standup() {
   if (backflipping)
     return;
 
-  if (adjust_height(63.8f)) {
+  if (adjust_height(BIG_TUX_HEIGHT)) {
     duck = false;
     unduck_hurt_timer.stop();
   } else {
@@ -790,7 +816,7 @@ Player::handle_input()
         dest.p1.x = bbox.get_right() + 1;
         dest.p2.x = dest.p1.x + grabbed_bbox.get_width();
       }
-      if(Sector::current()->is_free_of_movingstatics(dest)) {
+      if(Sector::current()->is_free_of_tiles(dest, true)) {
         moving_object->set_pos(dest.p1);
         if(controller->hold(Controller::UP)) {
           grabbed_object->ungrab(*this, UP);
@@ -946,9 +972,9 @@ Player::add_bonus(BonusType type, bool animate)
 bool
 Player::set_bonus(BonusType type, bool animate)
 {
-  if(player_status->bonus == NO_BONUS) {
-    if (!adjust_height(62.8f)) {
-      printf("can't adjust\n");
+  if((player_status->bonus == NO_BONUS) && (type != NO_BONUS)) {
+    if (!adjust_height(BIG_TUX_HEIGHT)) {
+      log_debug << "Can't adjust Tux height" << std::endl;
       return false;
     }
     if(animate) {
@@ -1055,7 +1081,7 @@ Player::draw(DrawingContext& context)
     // update() will take care of cancelling when growing completed
   }
   else if (climbing) {
-    sprite->set_action(sa_prefix+"-skid"+sa_postfix);
+    sprite->set_action(sa_prefix+"-climbing"+sa_postfix);
   }
   else if (backflipping) {
     sprite->set_action(sa_prefix+"-backflip"+sa_postfix);
@@ -1250,7 +1276,7 @@ Player::make_invincible()
 void
 Player::kill(bool completely)
 {
-  if(dying || deactivated)
+  if(dying || deactivated || is_winning() )
     return;
 
   if(!completely && (safe_timer.started() || invincible_timer.started()))
@@ -1271,13 +1297,13 @@ Player::kill(bool completely)
       set_bonus(GROWUP_BONUS, true);
     } else if(player_status->bonus == GROWUP_BONUS) {
       safe_timer.start(TUX_SAFE_TIME /* + GROWING_TIME */);
-      adjust_height(30.8f);
+      adjust_height(SMALL_TUX_HEIGHT);
       duck = false;
       backflipping = false;
       set_bonus(NO_BONUS, true);
     } else if(player_status->bonus == NO_BONUS) {
       safe_timer.start(TUX_SAFE_TIME);
-      adjust_height(30.8f);
+      adjust_height(SMALL_TUX_HEIGHT);
       duck = false;
     }
   } else {
@@ -1289,6 +1315,21 @@ Player::kill(bool completely)
       return;
     }
 
+    if (player_status->coins >= 25 && !GameSession::current()->get_reset_point_sectorname().empty())
+    {
+      for (int i = 0; i < 5; i++)
+      {
+        // the numbers: starting x, starting y, velocity y
+        Sector::current()->add_object(new FallingCoin(get_pos() +
+                                                      Vector(graphicsRandom.rand(5), graphicsRandom.rand(-32,18)),
+                                                      graphicsRandom.rand(-100,100)));
+      }
+      player_status->coins -= std::max(player_status->coins/10, 25);
+    }
+    else
+    {
+      GameSession::current()->set_reset_point("", Vector());
+    }
     physic.enable_gravity(true);
     physic.set_gravity_modifier(1.0f); // Undo jump_early_apex
     safe_timer.stop();
@@ -1311,11 +1352,11 @@ Player::move(const Vector& vector)
 {
   set_pos(vector);
 
-  // TODO: do we need the following? Seems irrelevant to moving the player
+  // Reset size to get correct hitbox if Tux was eg. ducked before moving
   if(is_big())
-    set_size(31.8f, 63.8f);
+    set_size(TUX_WIDTH, BIG_TUX_HEIGHT);
   else
-    set_size(31.8f, 31.8f);
+    set_size(TUX_WIDTH, SMALL_TUX_HEIGHT);
   duck = false;
   backflipping = false;
   last_ground_y = vector.y;
@@ -1439,12 +1480,16 @@ Player::set_edit_mode(bool enable)
 void 
 Player::start_climbing(Climbable& climbable)
 {
-  if (climbing == &climbable) return;
+  if (climbing || !&climbable) return;
 
   climbing = &climbable;
   physic.enable_gravity(false);
   physic.set_velocity(0, 0);
   physic.set_acceleration(0, 0);
+  if (backflipping) {
+    backflipping = false;
+    backflip_direction = 0;
+  }
 }
 
 void