[Pingus-CVS] r3375 - trunk/pingus/src/colliders

[grumbel at BerliOS]

Author: grumbel
Date: 2007-10-29 04:37:44 +0100 (Mon, 29 Oct 2007)
New Revision: 3375

Modified:
   trunk/pingus/src/colliders/pingu_collider.cpp
Log:
- fixed jumper vs bridge issue (maybe), needs testing

Modified: trunk/pingus/src/colliders/pingu_collider.cpp
===================================================================
--- trunk/pingus/src/colliders/pingu_collider.cpp       2007-10-29 03:31:10 UTC 
(rev 3374)
+++ trunk/pingus/src/colliders/pingu_collider.cpp       2007-10-29 03:37:44 UTC 
(rev 3375)
@@ -55,8 +55,8 @@
          // If there is something in the way, then Pingu has collided with
          // something.  However, if not falling and colliding with a
          // Bridge, allow Pingu to go through it.
-         if ((!falling || pixel != Groundtype::GP_BRIDGE)
-             && pixel != Groundtype::GP_NOTHING)
+         if (pixel != Groundtype::GP_NOTHING
+              && !(pixel == Groundtype::GP_BRIDGE && !falling))
            {
              collided = true;
              break;