Bug 562: Collision detection for unisolid tiles doesn't handle tilemap offset

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

diff --git a/src/object/candle.cpp b/src/object/candle.cpp
index 98c48c1..1123ce0 100644 (file)
--- 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(Surface::create("images/objects/candle/candle-light-1.png")),
+    candle_light_2(Surface::create("images/objects/candle/candle-light-2.png"))
 {
   lisp.get("name", name);
   lisp.get("burning", burning);
@@ -51,14 +47,14 @@ Candle::draw(DrawingContext& context)
 
   // draw on lightmap
   if (burning) {
-    Vector pos = get_pos() + (bbox.get_size() - candle_light_1.get_size()) / 2;
+    Vector pos = get_pos() + (bbox.get_size() - candle_light_1->get_size()) / 2;
     context.push_target();
     context.set_target(DrawingContext::LIGHTMAP);
     // draw approx. 1 in 10 frames darker. Makes the candle flicker
     if (systemRandom.rand(10) != 0) {
-      context.draw_surface(&candle_light_1, pos, layer);
+      context.draw_surface(candle_light_1, pos, layer);
     } else {
-      context.draw_surface(&candle_light_2, pos, layer);
+      context.draw_surface(candle_light_2, pos, layer);
     }
     context.pop_target();
   }
@@ -74,15 +70,15 @@ void
 Candle::expose(HSQUIRRELVM vm, SQInteger table_idx)
 {
   if (name.empty()) return;
-  Scripting::Candle* interface = new Scripting::Candle(this);
-  expose_object(vm, table_idx, interface, name, true);
+  scripting::Candle* _this = new scripting::Candle(this);
+  expose_object(vm, table_idx, _this, name, true);
 }
 
 void
 Candle::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
 {
   if (name.empty()) return;
-  Scripting::unexpose_object(vm, table_idx, name);
+  scripting::unexpose_object(vm, table_idx, name);
 }
 
 void
@@ -114,4 +110,4 @@ Candle::set_burning(bool burning)
   }
 }
 
-IMPLEMENT_FACTORY(Candle, "candle");
+/* EOF */