X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fdispenser.hpp;h=a67a1de94273f8f7437c17de001ed8e8cdecf4d8;hb=b68ea04f34c5a0ec258f09b67993dc0d54edbe8c;hp=e553d545d4c38634bf00f6cb1abe666cf22fdee5;hpb=fea3446f05e1e7673607b835c269d3e8d1929ab3;p=supertux.git diff --git a/src/badguy/dispenser.hpp b/src/badguy/dispenser.hpp index e553d545d..a67a1de94 100644 --- a/src/badguy/dispenser.hpp +++ b/src/badguy/dispenser.hpp @@ -1,12 +1,10 @@ -// $Id$ -// // SuperTux // Copyright (C) 2006 Matthias Braun // -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,37 +12,43 @@ // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// along with this program. If not, see . -#ifndef __DISPENSER_H__ -#define __DISPENSER_H__ +#ifndef HEADER_SUPERTUX_BADGUY_DISPENSER_HPP +#define HEADER_SUPERTUX_BADGUY_DISPENSER_HPP -#include "badguy.hpp" -#include "timer.hpp" +#include "badguy/badguy.hpp" class Dispenser : public BadGuy { public: - Dispenser(const lisp::Lisp& reader); + Dispenser(const Reader& 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(GameObject& object); + HitResponse collision(GameObject& other, const CollisionHit& hit); void launch_badguy(); + +private: 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 + +/* EOF */