X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fdispenser.hpp;h=106607806b791f3f5c3bf793de5477215447bb9f;hb=198f758764fff064a47630b5d0f1e3d6aabe95a8;hp=95b5cad2b751d5c2077916d7caf50ea140d5c657;hpb=13cda6b24b2d8c7ea53d0fbe44dd8fc6aa8cbbec;p=supertux.git diff --git a/src/badguy/dispenser.hpp b/src/badguy/dispenser.hpp index 95b5cad2b..106607806 100644 --- a/src/badguy/dispenser.hpp +++ b/src/badguy/dispenser.hpp @@ -41,12 +41,17 @@ public: protected: bool collision_squished(GameObject& object); + HitResponse collision(GameObject& other, const CollisionHit& hit); void launch_badguy(); float cycle; - std::string badguy; + std::vector badguys; + unsigned int next_badguy; Timer dispense_timer; bool autotarget; bool swivel; + bool broken; + bool random; + std::string type; }; #endif