X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fplant.hpp;h=97aea8b67855bb7743e32f371a369739e838adb9;hb=2ad3ecbc14b77d373c796ad04d6389489666cc01;hp=311e8a7e7fe7dc9edc623e874ca00cbadd7d0814;hpb=cbbcc7dfbaca831dc4cbf714ff54b246135f7625;p=supertux.git

diff --git a/src/badguy/plant.hpp b/src/badguy/plant.hpp
index 311e8a7e7..97aea8b67 100644
--- a/src/badguy/plant.hpp
+++ b/src/badguy/plant.hpp
@@ -1,7 +1,7 @@
-//  $Id: plant.hpp 2642 2005-06-26 13:38:53Z matzebraun $
-// 
+//  $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,11 +12,10 @@
 //  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 __PLANT_H__
 #define __PLANT_H__
@@ -28,12 +27,14 @@ class Plant : public BadGuy
 public:
   Plant(const lisp::Lisp& reader);
 
-  void activate();
+  void initialize();
   void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
   void active_update(float elapsed_time);
 
+  virtual Plant* clone() const { return new Plant(*this); }
+
 protected:
   Timer timer;
 
@@ -43,7 +44,7 @@ protected:
     PLANT_WALKING
   };
   PlantState state;
-  
+
 };
 
 #endif