X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Finvisible_block.cpp;h=96be2e650f2920de2d67b60b298736a12e2cd1d7;hb=555d1b7bebb45326d82d934e07463209837309b0;hp=4db8c934d7ab6388102f6fe132609f5f85edaf5d;hpb=6fe1f3519eecbbb75eca97c45a6697eee36b2442;p=supertux.git

diff --git a/src/object/invisible_block.cpp b/src/object/invisible_block.cpp
index 4db8c934d..96be2e650 100644
--- a/src/object/invisible_block.cpp
+++ b/src/object/invisible_block.cpp
@@ -1,15 +1,38 @@
+//  $Id$
+//
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include <config.h>
 
-#include "invisible_block.h"
-#include "resources.h"
-#include "special/sprite.h"
-#include "special/sprite_manager.h"
-#include "video/drawing_context.h"
+#include "invisible_block.hpp"
+#include "resources.hpp"
+#include "sprite/sprite.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "video/drawing_context.hpp"
+#include "audio/sound_manager.hpp"
+#include "object_factory.hpp"
+#include "object/player.hpp"
 
 InvisibleBlock::InvisibleBlock(const Vector& pos)
-  : Block(pos, sprite_manager->create("invisibleblock")), visible(false)
+  : Block(sprite_manager->create("images/objects/bonus_block/invisibleblock.sprite")), visible(false)
 {
-  flags &= ~FLAG_SOLID;
+  bbox.set_pos(pos);
+  sound_manager->preload("sounds/brick.wav");
 }
 
 void
@@ -19,16 +42,41 @@ InvisibleBlock::draw(DrawingContext& context)
     sprite->draw(context, get_pos(), LAYER_OBJECTS);
 }
 
+bool
+InvisibleBlock::collides(GameObject& other, const CollisionHit& )
+{
+  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() - 7.0)) {
+    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");
+
   if(visible)
     return;
 
   sprite->set_action("empty");
-  SoundManager::get()->play_sound(IDToSound(SND_BRICK));
-  start_bounce();
-  flags |= FLAG_SOLID;
+  start_bounce(&player);
+  set_group(COLGROUP_STATIC);
   visible = true;
 }
 
+//IMPLEMENT_FACTORY(InvisibleBlock, "invisible_block");