merged new collision detection branch back into mainline

[supertux.git] / src / object / block.cpp

diff --git a/src/object/block.cpp b/src/object/block.cpp
index 3ab0d1b..95520d6 100644 (file)
--- a/src/object/block.cpp
+++ b/src/object/block.cpp
@@ -64,12 +64,11 @@ Block::~Block()
 }
 
 HitResponse
-Block::collision(GameObject& other, const CollisionHit& hitdata)
+Block::collision(GameObject& other, const CollisionHit& )
 {
   Player* player = dynamic_cast<Player*> (&other);
   if(player) {
-    // collided from below?
-    if(hitdata.normal.x == 0 && hitdata.normal.y < 0) {
+    if(player->get_bbox().get_top() > get_bbox().get_bottom() - 7.0) {
       hit(*player);
     }
   }
@@ -85,7 +84,7 @@ Block::collision(GameObject& other, const CollisionHit& hitdata)
     }
   }
 
-  return FORCE_MOVE;
+  return SOLID;
 }
 
 void
@@ -225,7 +224,7 @@ BonusBlock::try_open()
         sector->add_object(riser);
       } else {
         SpecialRiser* riser = new SpecialRiser(
-            get_pos(), new Flower(Flower::FIREFLOWER));
+            get_pos(), new Flower(FIRE_BONUS));
         sector->add_object(riser);
       }
       sound_manager->play("sounds/upgrade.wav");
@@ -237,7 +236,7 @@ BonusBlock::try_open()
         sector->add_object(riser);                                            
       } else {
         SpecialRiser* riser = new SpecialRiser(
-            get_pos(), new Flower(Flower::ICEFLOWER));
+            get_pos(), new Flower(ICE_BONUS));
         sector->add_object(riser);
       }      
       sound_manager->play("sounds/upgrade.wav");
@@ -257,9 +256,6 @@ BonusBlock::try_open()
       sector->add_object(riser);
       sound_manager->play("sounds/upgrade.wav");
       break;
-
-    //default:
-      //assert(false);
   }
 
   start_bounce();