X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fflame.hpp;h=c3e63e82c26a329c8d2ddb98f0cbbfbdfb2e7ea3;hb=1240eda3ac57e6607b206e3c9cf7feb65c3be620;hp=c9e7a40f95aafe53fc68a385343eebc48fdbfce6;hpb=5b7f9214cb929399f1a855ef5807018a9447d510;p=supertux.git

diff --git a/src/badguy/flame.hpp b/src/badguy/flame.hpp
index c9e7a40f9..c3e63e82c 100644
--- a/src/badguy/flame.hpp
+++ b/src/badguy/flame.hpp
@@ -1,48 +1,52 @@
-//  $Id$
-// 
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  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
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  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 HEADER_SUPERTUX_BADGUY_FLAME_HPP
+#define HEADER_SUPERTUX_BADGUY_FLAME_HPP
 
-#ifndef __FLAME_H__
-#define __FLAME_H__
+#include "badguy/badguy.hpp"
 
-#include "badguy.hpp"
+#include "audio/sound_source.hpp"
 
 class Flame : public BadGuy
 {
 public:
-  Flame(const lisp::Lisp& reader);
-  ~Flame();
+  Flame(const Reader& reader);
+  Flame(const Flame& flame);
 
   void activate();
   void deactivate();
 
-  void write(lisp::Writer& write);
   void active_update(float elapsed_time);
+  void draw(DrawingContext& context);
   void kill_fall();
 
+  void freeze();
+  bool is_freezable() const;
+
 private:
   float angle;
   float radius;
   float speed;
+  Color light;
+  SpritePtr lightsprite;
 
-  SoundSource* source;
+  std::unique_ptr<SoundSource> sound_source;
 };
 
 #endif
 
+/* EOF */