X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fblock.hpp;h=94f87fb048b948abad0f3dd63a76dd33205dcc94;hb=ca967dcf4ee89f99880355be00782d1cd047be6a;hp=462e8ff63c755418a18677936dc5d02732236398;hpb=c8303cceed3279a3580829a28bbb2d7b8d89843b;p=supertux.git diff --git a/src/object/block.hpp b/src/object/block.hpp index 462e8ff63..94f87fb04 100644 --- a/src/object/block.hpp +++ b/src/object/block.hpp @@ -41,9 +41,12 @@ protected: virtual void hit(Player& player) = 0; void start_bounce(); + void start_break(); + void break_me(); Sprite* sprite; bool bouncing; + bool breaking; float bounce_dir; float bounce_offset; float original_y; @@ -60,10 +63,6 @@ public: void try_open(); -protected: - virtual void hit(Player& player); - -private: enum Contents { CONTENT_COIN, CONTENT_FIREGROW, @@ -74,6 +73,10 @@ private: }; Contents contents; +protected: + virtual void hit(Player& player); + +private: MovingObject* object; }; @@ -94,4 +97,3 @@ private: }; #endif -