[Super-tux-commit] supertux/src player.cpp,1.103,1.104

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

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

Modified Files:
	player.cpp 
Log Message:
Changed it so that only big Tux is able to butt-jump
Prevented big Tux from being able to slide under one-tile-wide spaces
Now he will just slide out again the direction he came from
That allows to create places where being small Tux is an advantage


Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- player.cpp	18 May 2004 16:57:57 -0000	1.103
+++ player.cpp	18 May 2004 17:12:54 -0000	1.104
@@ -203,7 +203,7 @@
       if(!duck && on_ground() && old_base.x == base.x && old_base.y == base.y
          && collision_object_map(base))
         {
-          base.x += frame_ratio * WALK_SPEED * (dir ? 1 : -1);
+          base.x += frame_ratio * WALK_SPEED;
           previous_base = old_base = base;
         }
 
@@ -417,7 +417,7 @@
       physic.set_velocity_y(0);
     }
 
-  if (input.down == DOWN && !on_ground() && !duck)
+  if (input.down == DOWN && !on_ground() && !duck && size == BIG)
     butt_jump = true;
   else if (input.down == UP)
     butt_jump = false;