X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Finvisible_block.cpp;h=1731a3954770f6eec1f1c0511b80d635b285c228;hb=657fc40723665c04b3150946f5bd66b6b0af9230;hp=621dfb4de6954eb5472b03badd2da483b034737a;hpb=8a627e73d824b5a14249cfe066dc2fdc643ce28d;p=supertux.git

diff --git a/src/object/invisible_block.cpp b/src/object/invisible_block.cpp
index 621dfb4de..1731a3954 100644
--- a/src/object/invisible_block.cpp
+++ b/src/object/invisible_block.cpp
@@ -27,13 +27,13 @@
 #include "audio/sound_manager.hpp"
 #include "object_factory.hpp"
 #include "object/player.hpp"
+#include "constants.hpp"
 
 InvisibleBlock::InvisibleBlock(const Vector& pos)
   : Block(sprite_manager->create("images/objects/bonus_block/invisibleblock.sprite")), visible(false)
 {
   bbox.set_pos(pos);
   sound_manager->preload("sounds/brick.wav");
-  sound_manager->preload("sounds/brick.wav");
 }
 
 void
@@ -43,24 +43,31 @@ InvisibleBlock::draw(DrawingContext& context)
     sprite->draw(context, get_pos(), LAYER_OBJECTS);
 }
 
-HitResponse
-InvisibleBlock::collision(GameObject& other, const CollisionHit& hit)
+bool
+InvisibleBlock::collides(GameObject& other, const CollisionHit& )
 {
-  if(!visible) {
-    Player* player = dynamic_cast<Player*> (&other);
-    if(player) {
-      if(player->get_movement().y > 0 ||
-          player->get_bbox().get_top() <= get_bbox().get_bottom() - 7.0) {
-        return PASSTHROUGH;
-      }
-    }
+  if(visible)
+    return true;
+
+  // if we're not visible, only register a collision if this will make us visible
+  Player* player = dynamic_cast<Player*> (&other);
+  if ((player) 
+          && (player->get_movement().y <= 0)
+          && (player->get_bbox().get_top() > get_bbox().get_bottom() - SHIFT_DELTA)) {
+    return true;
   }
 
+  return false;
+}
+
+HitResponse
+InvisibleBlock::collision(GameObject& other, const CollisionHit& hit)
+{
   return Block::collision(other, hit);
 }
 
 void
-InvisibleBlock::hit(Player& )
+InvisibleBlock::hit(Player& player)
 {
   sound_manager->play("sounds/brick.wav");
 
@@ -68,8 +75,7 @@ InvisibleBlock::hit(Player& )
     return;
 
   sprite->set_action("empty");
-  start_bounce();
-  set_solid(true);
+  start_bounce(&player);
   set_group(COLGROUP_STATIC);
   visible = true;
 }