[Super-tux-commit] supertux/src player.cpp,1.182,1.183

[Ryan F. <sik...@us...>]

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

Modified Files:
	player.cpp 
Log Message:
- [sort of] reverted flapping to it's old form

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -d -r1.182 -r1.183
--- player.cpp	7 Oct 2004 17:50:21 -0000	1.182
+++ player.cpp	7 Oct 2004 23:03:07 -0000	1.183
@@ -603,14 +603,25 @@
 
                // XXX: magic numbers. should be a percent of gravity
                //      gravity is (by default) -0.1f
-               physic.set_acceleration_y(.05 + .06f*xr);
+               physic.set_acceleration_y(.12 + .01f*xr);
+
+#if 0
+               // To slow down x-vel when flapping (not working)
+               if (fabsf(physic.get_velocity_x()) > MAX_WALK_XM)
+               {
+                   if (physic.get_velocity_x() < 0)
+                       physic.set_acceleration_x(1.0f);
+                   else if (physic.get_velocity_x() > 0)
+                       physic.set_acceleration_x(-1.0f);
+               }
+#endif
             }
      }
     else
      {
         physic.set_acceleration_y(0);
      }
-   
+
    // 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