Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31799
Modified Files:
badguy.cpp
Log Message:
- fixed badguy collisions so they no longer get jammed
Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- badguy.cpp 14 May 2004 07:42:30 -0000 1.74
+++ badguy.cpp 14 May 2004 08:10:24 -0000 1.75
@@ -1018,13 +1018,14 @@
case CO_BADGUY:
pbad_c = (BadGuy*) p_c_object;
- /* If we're a kicked mriceblock, kill any badguys we hit */
- if(kind == BAD_MRICEBLOCK && mode == KICK)
+ /* If we're a kicked mriceblock, kill [almost] any badguys we hit */
+ if(kind == BAD_MRICEBLOCK && mode == KICK &&
+ kind != BAD_FLAME && kind != BAD_BOMB && kind != BAD_STALACTITE)
{
pbad_c->kill_me(25);
}
- // a held mriceblock gets kills the enemy too but falls to ground then
+ // a held mriceblock kills the enemy too but falls to ground then
else if(kind == BAD_MRICEBLOCK && mode == HELD)
{
pbad_c->kill_me(25);
@@ -1081,8 +1082,6 @@
physic.set_velocity(-fabsf(physic.get_velocity_x()), 2);
}
-
-
break;
}
else if (base.y + base.height > pbad_c->base.y + pbad_c->base.height)
@@ -1094,6 +1093,9 @@
{
dir = RIGHT;
physic.set_velocity_x(fabsf(physic.get_velocity_x()));
+
+ // in case badguys get "jammed"
+ base.x = pbad_c->base.x + pbad_c->base.width;
}
else if (dir == RIGHT)
{
|
