badguy.cpp: Badguys don't squish other badguys.

They still turn around when walking into one another, but Bouncy, Jumpy and
friends no longer squish their coworkers.

Badguys that madly wish to be squished by other badguys, should check if they
were hit from above in "collision_badguy" which is now called instead.

Some exception *might* be necessary for stalactites.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6554 837edb03-e0f3-0310-88ca-d4d4e8b29345

diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp
index 5ee5b99..b5d895f 100644 (file)
--- a/src/badguy/badguy.cpp
+++ b/src/badguy/badguy.cpp
@@ -240,12 +240,15 @@ BadGuy::collision(GameObject& other, const CollisionHit& hit)
   BadGuy* badguy = dynamic_cast<BadGuy*> (&other);
   if(badguy && badguy->is_active() && badguy->get_group() == COLGROUP_MOVING) {
 
+    /* Badguys don't let badguys squish other badguys. It's bad. */
+#if 0
     // hit from above?
     if (badguy->get_bbox().p2.y < (bbox.p1.y + 16)) {
       if(collision_squished(*badguy)) {
         return ABORT_MOVE;
       }
     }
+#endif
 
     return collision_badguy(*badguy, hit);
   }