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

diff --git a/src/badguy/dispenser.hpp b/src/badguy/dispenser.hpp
index 5313b4f53..106607806 100644
--- a/src/badguy/dispenser.hpp
+++ b/src/badguy/dispenser.hpp
@@ -40,11 +40,18 @@ 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;
+  std::vector<std::string> badguys;
+  unsigned int next_badguy;
   Timer dispense_timer;
+  bool autotarget;
+  bool swivel;
+  bool broken;
+  bool random;
+  std::string type;
 };
 
 #endif