X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrtree.hpp;h=0b884a1ceb865e4d827e94ba723ce3953e5d39fa;hb=013a5ca196545a094f27c1b708facd0084d58d55;hp=02a433d83bf73c1dcddf11d980d0b00b3c73df41;hpb=2892ebda09d24c977547159e34abf0244884b89e;p=supertux.git

diff --git a/src/badguy/mrtree.hpp b/src/badguy/mrtree.hpp
index 02a433d83..0b884a1ce 100644
--- a/src/badguy/mrtree.hpp
+++ b/src/badguy/mrtree.hpp
@@ -20,30 +20,18 @@
 #ifndef __MRTREE_H__
 #define __MRTREE_H__
 
-#include "badguy.hpp"
+#include "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);
-  void collision_solid(const CollisionHit& hit);
-  HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
-
   virtual MrTree* clone() const { return new MrTree(*this); }
 
 protected:
-  enum MyState {
-    STATE_BIG, STATE_INVINCIBLE, STATE_NORMAL
-  };
-  MyState mystate;
-
-  Timer invincible_timer;
+  bool collision_squished(GameObject& object);
 
-  bool collision_squished(Player& player);
 };
 
 #endif