X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrtree.hpp;h=4eae54948f4d0eeb73a320aeb800fb1409da02c2;hb=d84d73b701cc7fa2bd74f3490b9be1bf8b6f705a;hp=b6437cad6b3e93b6565192cbfffc072ac4728ca0;hpb=dde03feb2d56f02e1515612a0c7e4ee9a4238563;p=supertux.git diff --git a/src/badguy/mrtree.hpp b/src/badguy/mrtree.hpp index b6437cad6..4eae54948 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; - - Timer invincible_timer; - bool collision_squished(Player& player); + }; #endif