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

diff --git a/src/badguy/mrtree.hpp b/src/badguy/mrtree.hpp
index b6437cad6..0b884a1ce 100644
--- a/src/badguy/mrtree.hpp
+++ b/src/badguy/mrtree.hpp
@@ -26,24 +26,12 @@ 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;
+  bool collision_squished(GameObject& object);
 
-  Timer invincible_timer;
-   
-  bool collision_squished(Player& player);
 };
 
 #endif