X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fdispenser.hpp;h=a67a1de94273f8f7437c17de001ed8e8cdecf4d8;hb=77b5a67fccb8ce3a5ba43280105031a46560a5c8;hp=fc1a4245ffcd0c956a807119833778b03b7330e4;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git

diff --git a/src/badguy/dispenser.hpp b/src/badguy/dispenser.hpp
index fc1a4245f..a67a1de94 100644
--- a/src/badguy/dispenser.hpp
+++ b/src/badguy/dispenser.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  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,31 +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 <http://www.gnu.org/licenses/>.
 
-#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 write(lisp::Writer& writer);
+  void deactivate();
   void active_update(float elapsed_time);
 
+  void freeze();
+  void unfreeze();
+  bool is_freezable() const;
+
 protected:
-  bool collision_squished(Player& player);
+  bool collision_squished(GameObject& object);
+  HitResponse collision(GameObject& other, const CollisionHit& hit);
   void launch_badguy();
+
+private:
   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
 
+/* EOF */