super-tux-commit

[Marek M. <wa...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12237/src

Modified Files:
	player.cpp player.h 
Log Message:
fixed problems with the flapping key not responding
you can now also use flapping after just walking into a gap without jumping


Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- player.cpp	17 Sep 2004 12:22:40 -0000	1.172
+++ player.cpp	17 Sep 2004 23:14:23 -0000	1.173
@@ -161,6 +161,7 @@
   flapping = false;
   can_jump = true;
   can_flap = false;
+  falling_from_flap = false;
   enable_hover = false;
   butt_jump = false;
   
@@ -318,6 +319,7 @@
               physic.set_velocity_y(0);
               jumped_in_solid = true;
               jumping = false;
+              flapping = false;
             }
         }
       else
@@ -377,6 +379,7 @@
             {
               /* Make sure jumping is off. */
               jumping = false;
+              flapping = false;
             }
         }
     }
@@ -508,6 +511,7 @@
 void
 Player::handle_vertical_input()
 {
+  
   // set fall mode...
   if(on_ground()) {
     fall_mode = ON_GROUND;
@@ -543,21 +547,28 @@
         SoundManager::get()->play_sound(IDToSound(SND_BIGJUMP));
     }
   // Let go of jump key
-  else if(input.up == UP && jumping && physic.get_velocity_y() > 0)
+  else if(input.up == UP)
     {
-      if (!flapping && !duck)
+      if (!flapping && !duck && !falling_from_flap && !on_ground())
          {
             can_flap = true;
          }
-      jumping = false;
-      physic.set_velocity_y(0);
+      if (jumping && physic.get_velocity_y() > 0)
+         {
+            jumping = false;
+            physic.set_velocity_y(0);
+         }
     }
-   
+
    // Flapping
    if (input.up == DOWN && can_flap)
      {
          if (!flapping_timer.started()) {flapping_timer.start(TUX_FLAPPING_TIME);}
-         if (!flapping_timer.check()) {can_flap = false;}
+         if (!flapping_timer.check()) 
+            {
+               can_flap = false;
+               falling_from_flap = true;
+            }
          jumping = true;
          flapping = true;
          if (flapping_timer.get_gone() <= TUX_FLAPPING_TIME)
@@ -636,7 +647,11 @@
     }
 
   if(on_ground())   /* Make sure jumping is off. */
-    jumping = false;
+    {
+      jumping = false;
+      flapping = false;
+      falling_from_flap = false;
+    }
 
   input.old_up = input.up;
 }

Index: player.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.h,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- player.h	16 Sep 2004 23:26:26 -0000	1.87
+++ player.h	17 Sep 2004 23:14:23 -0000	1.88
@@ -151,6 +151,7 @@
   bool flapping;
   bool can_jump;
   bool can_flap;
+  bool falling_from_flap;
   bool enable_hover;
   bool butt_jump;
   int frame_;