X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fflower.hpp;h=46a2e6c22fee178c254a8b32055ad488bbac5dd1;hb=77d00a6f464cc87c6b50cf1f3b38064a7ae9aead;hp=fadca518ad73ac2b26f256c2d425b0043f1f220b;hpb=5b7f9214cb929399f1a855ef5807018a9447d510;p=supertux.git

diff --git a/src/object/flower.hpp b/src/object/flower.hpp
index fadca518a..46a2e6c22 100644
--- a/src/object/flower.hpp
+++ b/src/object/flower.hpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,25 +12,23 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-//  02111-1307, USA.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef __FLOWER_H__
 #define __FLOWER_H__
 
 #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
-