Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

[supertux.git] / src / badguy / dispenser.hpp

diff --git a/src/badguy/dispenser.hpp b/src/badguy/dispenser.hpp
index 1066078..a67a1de 100644 (file)
--- 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,35 +12,32 @@
 //  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 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::vector<std::string> badguys;
   unsigned int next_badguy;
@@ -55,3 +50,5 @@ protected:
 };
 
 #endif
+
+/* EOF */