fix collision against spikes too wide, fix paths, try to fix jumping on badguys that...

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

diff --git a/src/badguy/mrtree.hpp b/src/badguy/mrtree.hpp
index 058e261..f297a50 100644 (file)
--- a/src/badguy/mrtree.hpp
+++ b/src/badguy/mrtree.hpp
@@ -29,16 +29,20 @@ 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);
 
 protected:
   enum MyState {
-    STATE_BIG, STATE_NORMAL
+    STATE_BIG, STATE_INVINCIBLE, STATE_NORMAL
   };
   MyState mystate;
-  
+  bool stay_on_platform;
+
+  Timer invincible_timer;
+
   bool collision_squished(Player& player);
 };