add variants and link executable to toplevel

[supertux.git] / src / player.cpp

diff --git a/src/player.cpp b/src/player.cpp
index 7dd4111..bb033ad 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -171,7 +171,7 @@ Player::init()
   flapping_velocity = 0;
 
   // temporary to help player's choosing a flapping
-  int flapping_mode = MAREK_FLAP;
+  flapping_mode = MAREK_FLAP;
 
   // Ricardo's flapping
   flaps_nb = 0;
@@ -352,12 +352,15 @@ Player::action(float elapsed_time)
           /* Reset score multiplier (for multi-hits): */
           if (!invincible_timer.started())
             {
-            /*if(player_status.score_multiplier > 2)
-              {  // show a message
+            if(player_status.score_multiplier > player_status.max_score_multiplier)
+              {
+              player_status.max_score_multiplier = player_status.score_multiplier;
+
+              // show a message
               char str[124];
-              sprintf(str, _("%d bad guys in a row!"), player_status.score_multiplier-1);
+              sprintf(str, _("New max combo: %d"), player_status.max_score_multiplier-1);
               Sector::current()->add_floating_text(base, str);
-              }*/
+              }
             player_status.score_multiplier = 1;
             }
         }
@@ -505,7 +508,8 @@ Player::handle_horizontal_input()
           Sector::current()->add_particles(
               Vector(base.x + (dir == RIGHT ? base.width : 0), base.y+base.height),
               dir == RIGHT ? 270+20 : 90-40, dir == RIGHT ? 270+40 : 90-20,
-              Vector(2.8,-2.6), Vector(0,0.030), 3, Color(100,100,100), 3, 800);
+              Vector(2.8,-2.6), Vector(0,0.030), 3, Color(100,100,100), 3, 800,
+              LAYER_OBJECTS+1);
 
           ax *= 2.5;
         }
@@ -659,6 +663,7 @@ Player::handle_vertical_input()
                 && physic.get_velocity_y() < 0)
             {
                float gravity = Sector::current()->gravity;
+               (void)gravity;
                float xr = (fabsf(physic.get_velocity_x()) / MAX_RUN_XM);
 
                // XXX: magic numbers. should be a percent of gravity
@@ -736,10 +741,8 @@ Player::handle_vertical_input()
         if(badguy->dying == DYING_NOT && badguy->mode != BadGuy::BOMB_TICKING &&
            badguy->mode != BadGuy::BOMB_EXPLODE)
           {
-            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)))
+            if (fabsf(base.x - badguy->base.x) < 96 &&
+                fabsf(base.y - badguy->base.y) < 64)
               badguy->kill_me(25);
           }
       }
@@ -1267,25 +1270,6 @@ Player::bounce(BadGuy* badguy)
   flapping = false;
   falling_from_flap = false;
   
-  if(player_status.score_multiplier >= 5)
-    {  // show a message
-    char str[124];
-//      if (player_status.score_multiplier <= 4) {sprintf(str, _("Combo x%d"), player_status.score_multiplier);}
-      if (player_status.score_multiplier == 5)
-        sprintf(str, _("Good! x%d"), player_status.score_multiplier);
-      else if (player_status.score_multiplier == 6)
-        sprintf(str, _("Great! x%d"), player_status.score_multiplier);
-      else if (player_status.score_multiplier == 7)
-        sprintf(str, _("Awesome! x%d"), player_status.score_multiplier);
-      else if (player_status.score_multiplier == 8)
-        sprintf(str, _("Incredible! x%d"), player_status.score_multiplier);
-      else if (player_status.score_multiplier == 9)
-        sprintf(str, _("Godlike! ;-) x%d"), player_status.score_multiplier);
-      else
-        sprintf(str, _("Unbelievable!! x%d"), player_status.score_multiplier);
-    Sector::current()->add_floating_text(base, str);
-    }
-
   if (input.jump)
     physic.set_velocity_y(5.2);
   else