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

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

diff --git a/src/object/pulsing_light.cpp b/src/object/pulsing_light.cpp
index b404273..75848d8 100644 (file)
--- a/src/object/pulsing_light.cpp
+++ b/src/object/pulsing_light.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - Pulsing Light
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.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,18 +12,19 @@
 //  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 "pulsing_light.hpp"
-#include "video/color.hpp"
+#include "object/pulsing_light.hpp"
 #include <math.h>
-#include "random_generator.hpp"
 
-PulsingLight::PulsingLight(const Vector& center, float cycle_len, float min_alpha, float max_alpha, const Color& color)
-        : Light(center, color), min_alpha(min_alpha), max_alpha(max_alpha), cycle_len(cycle_len), t(0)
+#include "math/random_generator.hpp"
+
+PulsingLight::PulsingLight(const Vector& center, float cycle_len, float min_alpha, float max_alpha, const Color& color) :
+  Light(center, color),
+  min_alpha(min_alpha),
+  max_alpha(max_alpha), 
+  cycle_len(cycle_len), 
+  t(0)
 {
   assert(cycle_len > 0);
 
@@ -56,3 +55,5 @@ PulsingLight::draw(DrawingContext& context)
 
   color = old_color;
 }
+
+/* EOF */