Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

[supertux.git] / src / object / flower.hpp

diff --git a/src/object/flower.hpp b/src/object/flower.hpp
index fadca51..1437d2e 100644 (file)
--- a/src/object/flower.hpp
+++ b/src/object/flower.hpp
@@ -1,36 +1,30 @@
-//  $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
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  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.
-#ifndef __FLOWER_H__
-#define __FLOWER_H__
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_OBJECT_FLOWER_HPP
+#define HEADER_SUPERTUX_OBJECT_FLOWER_HPP
 
-#include "moving_object.hpp"
 #include "sprite/sprite.hpp"
-#include "physic.hpp"
+#include "supertux/moving_object.hpp"
+#include "supertux/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 +32,14 @@ public:
   virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
 
 private:
-  Type type;
-  Sprite* sprite;
+  BonusType type;
+  std::auto_ptr<Sprite> sprite;
+
+private:
+  Flower(const Flower&);
+  Flower& operator=(const Flower&);
 };
 
 #endif
 
+/* EOF */