X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fcandle.cpp;h=f4b28a1e773a56e6ebf1bc39401d56a66d736ff5;hb=78ac7aef674f518549f96160c6354b589553f952;hp=614c42b04007a5c5e1751b829ef8485e5bf8e960;hpb=38105c22495d9439b30221732dd5d7b89f328a0c;p=supertux.git

diff --git a/src/object/candle.cpp b/src/object/candle.cpp
index 614c42b04..f4b28a1e7 100644
--- a/src/object/candle.cpp
+++ b/src/object/candle.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  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,23 +12,21 @@
 //  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 "candle.hpp"
+#include "math/random_generator.hpp"
+#include "object/candle.hpp"
+#include "object/sprite_particle.hpp"
 #include "scripting/candle.hpp"
 #include "scripting/squirrel_util.hpp"
-#include "sector.hpp"
-#include "object/sprite_particle.hpp"
-#include "object_factory.hpp"
-#include "random_generator.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
+#include "util/reader.hpp"
 
-Candle::Candle(const lisp::Lisp& lisp)
-        : MovingSprite(lisp, "images/objects/candle/candle.sprite", LAYER_BACKGROUNDTILES+1, COLGROUP_DISABLED), burning(true),
-        candle_light_1("images/objects/candle/candle-light-1.png"),
-        candle_light_2("images/objects/candle/candle-light-2.png")
+Candle::Candle(const Reader& lisp)
+  : MovingSprite(lisp, "images/objects/candle/candle.sprite", LAYER_BACKGROUNDTILES+1, COLGROUP_DISABLED), burning(true),
+    candle_light_1("images/objects/candle/candle-light-1.png"),
+    candle_light_2("images/objects/candle/candle-light-2.png")
 {
   lisp.get("name", name);
   lisp.get("burning", burning);
@@ -115,3 +111,5 @@ Candle::set_burning(bool burning)
 }
 
 IMPLEMENT_FACTORY(Candle, "candle");
+
+/* EOF */