super-tux-commit

[Ingo R. <gr...@us...>]

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

Modified Files:
	player.cpp special.cpp 
Log Message:
- bullet tweaks

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- player.cpp	25 Apr 2004 16:46:55 -0000	1.64
+++ player.cpp	25 Apr 2004 22:10:30 -0000	1.65
@@ -121,6 +121,8 @@
     }
   else if(key == keymap.fire)
     {
+      if (state == UP)
+        input.old_fire = UP;
       input.fire = state;
       return true;
     }
@@ -412,6 +414,7 @@
   if (input.fire == DOWN && input.old_fire == UP && got_coffee)
     {
       World::current()->add_bullet(base.x, base.y, physic.get_velocity_x(), dir);
+      input.old_fire = DOWN;
     }
 
   /* tux animations: */

Index: special.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- special.cpp	25 Apr 2004 21:55:39 -0000	1.27
+++ special.cpp	25 Apr 2004 22:10:32 -0000	1.28
@@ -95,10 +95,10 @@
     {
       base.y  = old_y;
       base.ym = -base.ym;     
-      if (base.ym > 13)
-        base.ym = 13;
-      else if (base.ym < -13)
-        base.ym = -13;
+      if (base.ym > 9)
+        base.ym = 9;
+      else if (base.ym < -9)
+        base.ym = -9;
     }
 
   base.ym = base.ym + 0.5 * frame_ratio;