X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrtree.hpp;h=8b78ab9f2f6ce54d2390f38a3a25293d25c525aa;hb=fbfe2d469988518ba7e58b7230a3ce68e9ca5da5;hp=058e26141ab8da8189993c14c69ac63b27e353f4;hpb=5b7f9214cb929399f1a855ef5807018a9447d510;p=supertux.git

diff --git a/src/badguy/mrtree.hpp b/src/badguy/mrtree.hpp
index 058e26141..8b78ab9f2 100644
--- a/src/badguy/mrtree.hpp
+++ b/src/badguy/mrtree.hpp
@@ -1,45 +1,34 @@
-//  $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.
+//  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 write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
-  HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
+  MrTree(const Reader& reader);
 
 protected:
-  enum MyState {
-    STATE_BIG, STATE_NORMAL
-  };
-  MyState mystate;
-  
-  bool collision_squished(Player& player);
+  bool collision_squished(GameObject& object);
+
 };
 
 #endif
+
+/* EOF */