Made trampolines less likely to interfere with level design:

[supertux.git] / src / badguy / mrtree.hpp

diff --git a/src/badguy/mrtree.hpp b/src/badguy/mrtree.hpp
index 9795a6d..4eae549 100644 (file)
--- a/src/badguy/mrtree.hpp
+++ b/src/badguy/mrtree.hpp
@@ -20,33 +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);
-  HitResponse collision_solid(GameObject& other, 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(Player& player);
-  std::string direction;
-  bool set_direction;
-  Direction initial_direction;  
+
 };
 
 #endif