X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fdispenser.hpp;h=106607806b791f3f5c3bf793de5477215447bb9f;hb=198f758764fff064a47630b5d0f1e3d6aabe95a8;hp=2ba8ba21958a0226bf035675f2baa37b39a0e6dd;hpb=12966e3f986f7202125ae590c74a4d0c227441dd;p=supertux.git

diff --git a/src/badguy/dispenser.hpp b/src/badguy/dispenser.hpp
index 2ba8ba219..106607806 100644
--- a/src/badguy/dispenser.hpp
+++ b/src/badguy/dispenser.hpp
@@ -29,21 +29,29 @@ public:
   Dispenser(const lisp::Lisp& reader);
 
   void activate();
+  void deactivate();
   void write(lisp::Writer& writer);
   void active_update(float elapsed_time);
 
+  void freeze();
+  void unfreeze();
+  bool is_freezable() const;
+
   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;
+  std::vector<std::string> badguys;
+  unsigned int next_badguy;
   Timer dispense_timer;
-  bool set_direction;
-  Direction initial_direction;  
-  std::string direction;
+  bool autotarget;
+  bool swivel;
+  bool broken;
+  bool random;
+  std::string type;
 };
 
 #endif
-