X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fplant.hpp;h=84d857361a5a087d6638317e3872a652d6669f85;hb=08813a74da6ac1fd045a105e4e8105f1d7f716f0;hp=97aea8b67855bb7743e32f371a369739e838adb9;hpb=f406067af6cbeb0a638078fe1d386d092583909c;p=supertux.git

diff --git a/src/badguy/plant.hpp b/src/badguy/plant.hpp
index 97aea8b67..84d857361 100644
--- a/src/badguy/plant.hpp
+++ b/src/badguy/plant.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  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
@@ -14,37 +12,35 @@
 //  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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef __PLANT_H__
-#define __PLANT_H__
+#ifndef HEADER_SUPERTUX_BADGUY_PLANT_HPP
+#define HEADER_SUPERTUX_BADGUY_PLANT_HPP
 
-#include "badguy.hpp"
+#include "badguy/badguy.hpp"
 
 class Plant : public BadGuy
 {
 public:
-  Plant(const lisp::Lisp& reader);
+  Plant(const Reader& reader);
 
   void initialize();
-  void write(lisp::Writer& writer);
   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;
-
   enum PlantState {
     PLANT_SLEEPING,
     PLANT_WAKING,
     PLANT_WALKING
   };
-  PlantState state;
 
+private:
+  Timer timer;
+  PlantState state;
 };
 
 #endif
+
+/* EOF */