X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fblock.hpp;h=4f326eb2ff73cefb37beb987f7efc041f8f667ba;hb=ae7bd4f460fdd93934fc0abc9589758a49309bda;hp=07b37cbb0fb03a2debb16e1203aaca71e2c369df;hpb=2743fdb7b15d53354fef5096de5438de4fac5ed6;p=supertux.git

diff --git a/src/object/block.hpp b/src/object/block.hpp
index 07b37cbb0..4f326eb2f 100644
--- a/src/object/block.hpp
+++ b/src/object/block.hpp
@@ -40,10 +40,13 @@ protected:
   friend class FlipLevelTransformer;
 
   virtual void hit(Player& player) = 0;
-  void start_bounce();
+  void start_bounce(GameObject* hitter);
+  void start_break(GameObject* hitter);
+  void break_me();
 
   Sprite* sprite;
   bool bouncing;
+  bool breaking;
   float bounce_dir;
   float bounce_offset;
   float original_y;
@@ -56,13 +59,10 @@ public:
   BonusBlock(const Vector& pos, int data);
   BonusBlock(const lisp::Lisp& lisp);
   virtual ~BonusBlock();
+  HitResponse collision(GameObject& other, const CollisionHit& hit);
 
   void try_open();
 
-protected:
-  virtual void hit(Player& player);
-
-private:
   enum Contents {
     CONTENT_COIN,
     CONTENT_FIREGROW,
@@ -73,6 +73,10 @@ private:
   };
 
   Contents contents;
+protected:
+  virtual void hit(Player& player);
+
+private:
   MovingObject* object;
 };
 
@@ -81,7 +85,8 @@ class Brick : public Block
 public:
   Brick(const Vector& pos, int data);
 
-  void try_break(bool playerhit = false);
+  void try_break(Player* player = false);
+  HitResponse collision(GameObject& other, const CollisionHit& hit);
 
 protected:
   virtual void hit(Player& player);
@@ -92,4 +97,3 @@ private:
 };
 
 #endif
-