X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fflame.hpp;h=bc04b7e9cc80f2215dad61fd5ebcdb6fc08e5863;hb=08813a74da6ac1fd045a105e4e8105f1d7f716f0;hp=bfb0ed2b2ef1772139c78356d59f1b2725759d57;hpb=f406067af6cbeb0a638078fe1d386d092583909c;p=supertux.git

diff --git a/src/badguy/flame.hpp b/src/badguy/flame.hpp
index bfb0ed2b2..bc04b7e9c 100644
--- a/src/badguy/flame.hpp
+++ b/src/badguy/flame.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,25 +12,24 @@
 //  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 __FLAME_H__
-#define __FLAME_H__
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_BADGUY_FLAME_HPP
+#define HEADER_SUPERTUX_BADGUY_FLAME_HPP
 
-#include "badguy.hpp"
+#include "badguy/badguy.hpp"
 
 #include "audio/sound_source.hpp"
 
 class Flame : public BadGuy
 {
 public:
-  Flame(const lisp::Lisp& reader);
+  Flame(const Reader& reader);
   Flame(const Flame& flame);
 
   void activate();
   void deactivate();
 
-  void write(lisp::Writer& write);
   void active_update(float elapsed_time);
   void kill_fall();
 
@@ -45,3 +42,5 @@ private:
 };
 
 #endif
+
+/* EOF */