X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fspotlight.hpp;h=5edf7d95a79550751b9646c209ea1b85e02b91c7;hb=590d47c3c3cf4641d97ee1579af69edbc355e5a8;hp=520ad1a21101c99eb0a9783e4e3aa09023127a69;hpb=49796e6cc2385aea989d7c44c789b406190f2bf7;p=supertux.git

diff --git a/src/object/spotlight.hpp b/src/object/spotlight.hpp
index 520ad1a21..5edf7d95a 100644
--- a/src/object/spotlight.hpp
+++ b/src/object/spotlight.hpp
@@ -1,12 +1,10 @@
-//  $Id: light.hpp 3327 2006-04-13 15:02:40Z ravu_al_hemio $
-//
 //  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,33 +12,40 @@
 //  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 __SPOTLIGHT_HPP__
-#define __SPOTLIGHT_HPP__
+#ifndef HEADER_SUPERTUX_OBJECT_SPOTLIGHT_HPP
+#define HEADER_SUPERTUX_OBJECT_SPOTLIGHT_HPP
 
-#include "game_object.hpp"
-#include "lisp/lisp.hpp"
+#include <memory>
 
-class Sprite;
+#include "util/reader_fwd.hpp"
+#include "math/vector.hpp"
+#include "sprite/sprite_ptr.hpp"
+#include "supertux/game_object.hpp"
+#include "video/color.hpp"
 
 class Spotlight : public GameObject
 {
 public:
-  Spotlight(const lisp::Lisp& reader);
+  Spotlight(const Reader& reader);
   virtual ~Spotlight();
 
   void update(float elapsed_time);
   void draw(DrawingContext& context);
 
 private:
+  Vector  position;
   float   angle;
-  Sprite* center;
-  Sprite* base;
-  Sprite* lights;
-  Sprite* lightcone;
+  SpritePtr center;
+  SpritePtr base;
+  SpritePtr lights;
+  SpritePtr light;
+  SpritePtr lightcone;
+
+  Color   color;
 };
 
 #endif
 
+/* EOF */