X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrtree.hpp;h=e57a9315f5bdb462399b29603f5ae2b15ca9ce18;hb=2b4d3758e0f8d3a8de962f85eea5a4ada723706d;hp=9795a6d6bd88db6dd94f3e7f7e65643bd1d8bb37;hpb=12966e3f986f7202125ae590c74a4d0c227441dd;p=supertux.git

diff --git a/src/badguy/mrtree.hpp b/src/badguy/mrtree.hpp
index 9795a6d6b..e57a9315f 100644
--- a/src/badguy/mrtree.hpp
+++ b/src/badguy/mrtree.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,39 +12,25 @@
 //  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 __MRTREE_H__
-#define __MRTREE_H__
+#ifndef HEADER_SUPERTUX_BADGUY_MRTREE_HPP
+#define HEADER_SUPERTUX_BADGUY_MRTREE_HPP
 
-#include "badguy.hpp"
+#include "badguy/walking_badguy.hpp"
 
-class MrTree : public BadGuy
+class MrTree : public WalkingBadguy
 {
 public:
-  MrTree(const lisp::Lisp& reader);
-
-  void activate();
-  void active_update(float elapsed_time);
-  void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
-  HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
+  MrTree(const Reader& reader);
 
-  virtual MrTree* clone() const { return new MrTree(*this); }
+  bool is_freezable() const;
 
 protected:
-  enum MyState {
-    STATE_BIG, STATE_INVINCIBLE, STATE_NORMAL
-  };
-  MyState mystate;
+  bool collision_squished(GameObject& object);
 
-  Timer invincible_timer;
-
-  bool collision_squished(Player& player);
-  std::string direction;
-  bool set_direction;
-  Direction initial_direction;  
 };
 
 #endif
+
+/* EOF */