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

[supertux.git] / src / object / lantern.hpp

diff --git a/src/object/lantern.hpp b/src/object/lantern.hpp
index 7daed4b..0c47dc3 100644 (file)
--- a/src/object/lantern.hpp
+++ b/src/object/lantern.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - Lantern
 //  Copyright (C) 2006 Wolfgang Becker <uafr@gmx.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,13 +12,11 @@
 //  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 __SUPERTUX_LANTERN_H__
-#define __SUPERTUX_LANTERN_H__
+#ifndef HEADER_SUPERTUX_OBJECT_LANTERN_HPP
+#define HEADER_SUPERTUX_OBJECT_LANTERN_HPP
 
-#include "object/moving_sprite.hpp"
 #include "object/rock.hpp"
 
 /**
@@ -30,7 +26,7 @@ class Lantern : public Rock
 {
 public:
   Lantern(const Vector& pos);
-  Lantern(const lisp::Lisp& reader);
+  Lantern(const Reader& reader);
   void draw(DrawingContext& context);
   ~Lantern();
 
@@ -53,8 +49,14 @@ public:
 
 private:
   Color lightcolor;
-  Sprite* lightsprite;
+  std::auto_ptr<Sprite> lightsprite;
   void updateColor();
+
+private:
+  Lantern(const Lantern&);
+  Lantern& operator=(const Lantern&);
 };
 
 #endif
+
+/* EOF */