fix cr/lfs and remove trailing whitespaces...

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

diff --git a/src/object/block.hpp b/src/object/block.hpp
index ac7bdd2..c00cce7 100644 (file)
--- a/src/object/block.hpp
+++ b/src/object/block.hpp
@@ -37,6 +37,8 @@ public:
   virtual void draw(DrawingContext& context);
 
 protected:
+  friend class FlipLevelTransformer;
+
   virtual void hit(Player& player) = 0;
   void start_bounce();
 
@@ -45,6 +47,7 @@ protected:
   float bounce_dir;
   float bounce_offset;
   float original_y;
+
 };
 
 class BonusBlock : public Block
@@ -53,6 +56,7 @@ public:
   BonusBlock(const Vector& pos, int data);
   BonusBlock(const lisp::Lisp& lisp);
   virtual ~BonusBlock();
+  HitResponse collision(GameObject& other, const CollisionHit& hit);
 
   void try_open();
 
@@ -79,6 +83,7 @@ public:
   Brick(const Vector& pos, int data);
 
   void try_break(bool playerhit = false);
+  HitResponse collision(GameObject& other, const CollisionHit& hit);
 
 protected:
   virtual void hit(Player& player);
@@ -89,4 +94,3 @@ private:
 };
 
 #endif
-