Remove particles when they get off the screen.

[supertux.git] / src / player.cpp

diff --git a/src/player.cpp b/src/player.cpp
index 3bc23df..20a05d4 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -158,9 +158,9 @@ Player::init()
   last_ground_y = 0;
   fall_mode = ON_GROUND;
   jumping = false;
-  double_jumping = false;
+  flapping = false;
   can_jump = true;
-  can_double_jump = false;
+  can_flap = false;
   enable_hover = false;
   butt_jump = false;
   
@@ -177,6 +177,7 @@ Player::init()
   shooting_timer.init(true);
   growing_timer.init(true);
   idle_timer.init(true);
+  flapping_timer.init(true);
 
   physic.reset();
 }
@@ -521,8 +522,6 @@ Player::handle_vertical_input()
   // Press jump key
   if(input.up == DOWN && can_jump && on_ground())
     {
-      global_stats.add_points(JUMPS_STAT, 1);
-
       if(duck) { // only jump a little bit when in duck mode {
         physic.set_velocity_y(3);
       } else {
@@ -535,9 +534,9 @@ Player::handle_vertical_input()
 
       --base.y;
       jumping = true;
-               double_jumping = false;
+      flapping = false;
       can_jump = false;
-               can_double_jump = false;
+      can_flap = false;
       if (size == SMALL)
         SoundManager::get()->play_sound(IDToSound(SND_JUMP));
       else
@@ -546,31 +545,34 @@ Player::handle_vertical_input()
   // Let go of jump key
   else if(input.up == UP && jumping && physic.get_velocity_y() > 0)
     {
-      if (!double_jumping && !duck) {can_double_jump = true;}
-               jumping = false;
+      if (!flapping && !duck)
+         {
+            can_flap = true;
+         }
+      jumping = false;
       physic.set_velocity_y(0);
     }
-       
-       // Double jump
-       if (input.up == DOWN && can_double_jump)
-         {
-                       can_double_jump = false;
-                       jumping = true;
-                       double_jumping = true;
-                       if (size == SMALL)
-            SoundManager::get()->play_sound(IDToSound(SND_JUMP));
-         else
-            SoundManager::get()->play_sound(IDToSound(SND_BIGJUMP));
-                       physic.set_velocity_y(5.2);
-         }
-       
-       // Hover
+   
+   // Flapping
+   if (input.up == DOWN && can_flap)
+     {
+         if (!flapping_timer.started()) {flapping_timer.start(TUX_FLAPPING_TIME);}
+         if (!flapping_timer.check()) {can_flap = false;}
+         jumping = true;
+         flapping = true;
+         if (flapping_timer.get_gone() <= TUX_FLAPPING_TIME)
+            {
+               physic.set_velocity_y((float)flapping_timer.get_gone()/450);
+            }
+     }
+   
+   // Hover
    //(disabled by default, use cheat code "hover" to toggle on/off)
-       //TODO: needs some tweaking, especially when used together with double jump and jumping off badguys
-       if (enable_hover && input.up == DOWN && !jumping && !butt_jump && physic.get_velocity_y() <= 0)
-         {
-                       physic.set_velocity_y(-1);
-         }
+   //TODO: needs some tweaking, especially when used together with double jump and jumping off badguys
+   if (enable_hover && input.up == DOWN && !jumping && !butt_jump && physic.get_velocity_y() <= 0)
+      {
+         physic.set_velocity_y(-1);
+      }
 
    /* In case the player has pressed Down while in a certain range of air,
       enable butt jump action */