[Super-tux-commit] supertux/src player.cpp,1.110,1.111

[Ricardo C. <rm...@us...>]

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

Modified Files:
	player.cpp 
Log Message:
Just improved a bit the butt jump control.
You don't have to press Down while pressing Up, but still you've to press it right away...

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- player.cpp	18 May 2004 23:45:30 -0000	1.110
+++ player.cpp	19 May 2004 13:46:45 -0000	1.111
@@ -421,10 +421,10 @@
 
    /* Do butt jump, in case the player has done the combination
         (full jump and hold DOWN) */
-  if (input.down == UP && physic.get_velocity_y() < 0 && butt_jump)
+  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 (butt_jump && on_ground() && size == BIG)
+  if (input.down == DOWN && butt_jump && on_ground() && size == BIG)
   {
     if(World::current()->trybreakbrick(base.x, base.y + base.height, false)
       || World::current()->trybreakbrick(