X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fflower.hpp;h=46a2e6c22fee178c254a8b32055ad488bbac5dd1;hb=77d00a6f464cc87c6b50cf1f3b38064a7ae9aead;hp=637f1a98d26a0806bec94b1c83f99e604bbfcfe7;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git diff --git a/src/object/flower.hpp b/src/object/flower.hpp index 637f1a98d..46a2e6c22 100644 --- a/src/object/flower.hpp +++ b/src/object/flower.hpp @@ -23,14 +23,12 @@ #include "moving_object.hpp" #include "sprite/sprite.hpp" #include "physic.hpp" +#include "player_status.hpp" class Flower : public MovingObject { public: - enum Type { - FIREFLOWER, ICEFLOWER - }; - Flower(Type type); + Flower(BonusType type); ~Flower(); virtual void update(float elapsed_time); @@ -38,9 +36,8 @@ public: virtual HitResponse collision(GameObject& other, const CollisionHit& hit); private: - Type type; + BonusType type; Sprite* sprite; }; #endif -