Dispenser no longer hurts Tux directly. Tux can climb on it.

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

diff --git a/src/badguy/dispenser.hpp b/src/badguy/dispenser.hpp
index 90f2a3a..38a26fe 100644 (file)
--- a/src/badguy/dispenser.hpp
+++ b/src/badguy/dispenser.hpp
@@ -29,6 +29,7 @@ public:
   Dispenser(const lisp::Lisp& reader);
 
   void activate();
+  void deactivate();
   void write(lisp::Writer& writer);
   void active_update(float elapsed_time);
 
@@ -39,11 +40,15 @@ public:
   virtual Dispenser* clone() const { return new Dispenser(*this); }
 
 protected:
-  bool collision_squished(Player& player);
+  bool collision_squished(GameObject& object);
+  HitResponse collision(GameObject& other, const CollisionHit& hit);
   void launch_badguy();
   float cycle;
   std::string badguy;
   Timer dispense_timer;
+  bool autotarget;
+  bool swivel;
+  bool broken;
 };
 
 #endif