X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Flight.cpp;h=bd00ceff7e2e1d56afd7da60146a335564466b16;hb=78ac7aef674f518549f96160c6354b589553f952;hp=8b3983f9e84929ce77ac1ce759693903e48027bf;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git

diff --git a/src/object/light.cpp b/src/object/light.cpp
index 8b3983f9e..bd00ceff7 100644
--- 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,27 +12,22 @@
 //  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 "object/light.hpp"
+#include "sprite/sprite.hpp"
 #include "sprite/sprite_manager.hpp"
-#include "resources.hpp"
-#include "video/drawing_context.hpp"
-#include "object_factory.hpp"
-#include "player.hpp"
-#include "sector.hpp"
 
-Light::Light(const lisp::Lisp& )
+Light::Light(const Vector& center, const Color& color) : 
+  position(center), 
+  color(color),
+  sprite()
 {
   sprite = sprite_manager->create("images/objects/lightmap_light/lightmap_light.sprite");
 }
 
 Light::~Light()
 {
-  delete sprite;
 }
 
 void
@@ -47,10 +40,13 @@ Light::draw(DrawingContext& context)
 {
   context.push_target();
   context.set_target(DrawingContext::LIGHTMAP);
-  
-  sprite->draw(context, Sector::current()->player->get_pos(), 0);
-  
+
+  sprite->set_color(color);
+  sprite->set_blend(Blend(GL_SRC_ALPHA, GL_ONE));
+  sprite->set_angle(90); // FIXME: color won't get applied for angle=0
+  sprite->draw(context, position, 0);
+
   context.pop_target();
 }
 
-IMPLEMENT_FACTORY(Light, "light");
+/* EOF */