[Super-tux-commit] supertux/src special.cpp,1.59,1.60

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

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

Modified Files:
	special.cpp 
Log Message:
Improved (?) ice bullet physics
Fixed design bug in level 11: tux could jump over the ending sequence which then wouldn't be played - code should be changed to generally prevent that from happening


Index: special.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- special.cpp	9 Jun 2004 05:23:20 -0000	1.59
+++ special.cpp	12 Jun 2004 21:13:34 -0000	1.60
@@ -84,7 +84,7 @@
   physic.apply(elapsed_time, base.x, base.y);
   collision_swept_object_map(&old_base,&base);
       
-  if (issolid(base.x, base.y + 4) || issolid(base.x, base.y))
+  if (issolid(base.x+2, base.y + 4) || issolid(base.x+2, base.y))
     {
       base.y  = old_y;
       physic.set_velocity_y(-physic.get_velocity_y());
@@ -118,7 +118,8 @@
          remove_me();
        else if (kind == ICE_BULLET)
          {
-	   physic.set_velocity_x(physic.get_velocity_x() * -1);
+	   physic.set_velocity_x(-physic.get_velocity_x());
+	   //physic.set_velocity_y(-physic.get_velocity_y());
 	 }
      }
 }