X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fobject%2Fblock.hpp;h=fecbd0f1469ee7a92535f15eedadce6b058c128c;hb=ce4e3bd4239ed1f122b0b39e247be8ee6850338d;hp=d31ba4d8c3606edd1d5ab3c7c35c83e750e76bc7;hpb=ae95118467c6af962f8eb3ea0cb06c27f56d59af;p=supertux.git diff --git a/src/object/block.hpp b/src/object/block.hpp index d31ba4d8c..fecbd0f14 100644 --- a/src/object/block.hpp +++ b/src/object/block.hpp @@ -55,53 +55,6 @@ private: Block& operator=(const Block&); }; -class BonusBlock : public Block -{ -public: - BonusBlock(const Vector& pos, int data); - BonusBlock(const Reader& lisp); - virtual ~BonusBlock(); - HitResponse collision(GameObject& other, const CollisionHit& hit); - - void try_open(); - - enum Contents { - CONTENT_COIN, - CONTENT_FIREGROW, - CONTENT_ICEGROW, - CONTENT_STAR, - CONTENT_1UP, - CONTENT_CUSTOM - }; - -protected: - virtual void hit(Player& player); - -public: - Contents contents; - MovingObject* object; - -private: - BonusBlock(const BonusBlock&); - BonusBlock& operator=(const BonusBlock&); -}; - -class Brick : public Block -{ -public: - Brick(const Vector& pos, int data); - - void try_break(Player* player = false); - HitResponse collision(GameObject& other, const CollisionHit& hit); - -protected: - virtual void hit(Player& player); - -private: - bool breakable; - int coin_counter; -}; - #endif /* EOF */