X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Ffirefly.hpp;h=f8b80b070b1d556c105a2d1c81bbb2ba5f67cec6;hb=9216f1fcdf1b42ad67f794c383d252b35c885df7;hp=f77a5745b894ccdf5f72696816fdd2e4e46fe704;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git

diff --git a/src/object/firefly.hpp b/src/object/firefly.hpp
index f77a5745b..f8b80b070 100644
--- a/src/object/firefly.hpp
+++ b/src/object/firefly.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,32 +12,30 @@
 //  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 __FIREFLY_H__
-#define __FIREFLY_H__
+#ifndef HEADER_SUPERTUX_OBJECT_FIREFLY_HPP
+#define HEADER_SUPERTUX_OBJECT_FIREFLY_HPP
 
-#include "lisp/lisp.hpp"
 #include "object/moving_sprite.hpp"
-#include "serializable.hpp"
-#include "badguy/badguy.hpp"
 
 /**
  * A Firefly: When tux touches it, it begins buzzing and you will respawn at this
  * position.
  */
-class Firefly : public MovingSprite, public Serializable
+class Firefly : public MovingSprite
 {
 public:
-  Firefly(const lisp::Lisp& lisp);
-  virtual Firefly* clone() const { return new Firefly(*this); }
+  Firefly(const Reader& lisp);
 
-  void write(lisp::Writer& writer);
   HitResponse collision(GameObject& other, const CollisionHit& hit);
 
 private:
   bool activated;
+  Vector initial_position; /**< position as in level file. This is where Tux will have to respawn, as the level is reset every time */
+  void reactivate();
 };
 
 #endif
+
+/* EOF */