X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fdarttrap.hpp;h=c8d485f40d633488873dcc450af3a4adedc5fafc;hb=12a28b64dcce9c7ff706451b4f3aecd201cc8a5f;hp=7f2b80ebc104aaa28eae0bcb72f21a85fe692907;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git

diff --git a/src/badguy/darttrap.hpp b/src/badguy/darttrap.hpp
index 7f2b80ebc..c8d485f40 100644
--- a/src/badguy/darttrap.hpp
+++ b/src/badguy/darttrap.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  DartTrap - Shoots a Dart at regular intervals
-//  Copyright (C) 2006 Christoph Sommer <supertux@2006.expires.deltadevelopment.de>
+//  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.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,14 +12,10 @@
 //  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.
-
-#ifndef __DARTTRAP_H__
-#define __DARTTRAP_H__
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "badguy.hpp"
-#include "timer.hpp"
+#ifndef HEADER_SUPERTUX_BADGUY_DARTTRAP_HPP
+#define HEADER_SUPERTUX_BADGUY_DARTTRAP_HPP
 
 /**
  * Badguy "DartTrap" - Shoots a Dart at regular intervals
@@ -29,15 +23,13 @@
 class DartTrap : public BadGuy
 {
 public:
-  DartTrap(const lisp::Lisp& reader);
+  DartTrap(const Reader& reader);
 
+  void initialize();
   void activate();
-  void write(lisp::Writer& writer);
   void active_update(float elapsed_time);
   HitResponse collision_player(Player& player, const CollisionHit& hit);
 
-  virtual DartTrap* clone() const { return new DartTrap(*this); }
-
 protected:
   enum State {
     IDLE, LOADING
@@ -46,6 +38,7 @@ protected:
   void load(); /**< load a shot */
   void fire(); /**< fire a shot */
 
+private:
   float initial_delay; /**< time to wait before firing first shot */
   float fire_delay; /**< reload time */
   int ammo; /**< ammo left (-1 means unlimited) */
@@ -55,3 +48,5 @@ protected:
 };
 
 #endif
+
+/* EOF */