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

[supertux.git] / src / object / light.cpp

diff --git a/src/object/light.cpp b/src/object/light.cpp
index 4886861..5d7765d 100644 (file)
--- a/src/object/light.cpp
+++ b/src/object/light.cpp
@@ -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,19 +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.
-
-#include <config.h>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "light.hpp"
-#include "sprite/sprite_manager.hpp"
-#include "resources.hpp"
-#include "video/drawing_context.hpp"
-#include "object_factory.hpp"
-#include "player.hpp"
-#include "sector.hpp"
+#include "object/light.hpp"
 #include "sprite/sprite.hpp"
+#include "sprite/sprite_manager.hpp"
 
 Light::Light(const Vector& center, const Color& color) : position(center), color(color)
 {
@@ -35,7 +25,6 @@ Light::Light(const Vector& center, const Color& color) : position(center), color
 
 Light::~Light()
 {
-  delete sprite;
 }
 
 void
@@ -56,3 +45,5 @@ Light::draw(DrawingContext& context)
 
   context.pop_target();
 }
+
+/* EOF */