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

diff --git a/src/object/candle.cpp b/src/object/candle.cpp
index 4ac3010df..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,20 +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 "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), name("")
+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);
@@ -37,10 +36,32 @@ Candle::Candle(const lisp::Lisp& lisp)
   } else {
     sprite->set_action("off");
   }
+
+}
+
+void
+Candle::draw(DrawingContext& context)
+{
+  // draw regular sprite
+  sprite->draw(context, get_pos(), layer);
+
+  // draw on lightmap
+  if (burning) {
+    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);
+    } else {
+      context.draw_surface(&candle_light_2, pos, layer);
+    }
+    context.pop_target();
+  }
 }
 
 HitResponse
-Candle::collision(GameObject& , const CollisionHit& )
+Candle::collision(GameObject&, const CollisionHit& )
 {
   return FORCE_MOVE;
 }
@@ -48,7 +69,7 @@ Candle::collision(GameObject& , const CollisionHit& )
 void
 Candle::expose(HSQUIRRELVM vm, SQInteger table_idx)
 {
-  if (name == "") return;
+  if (name.empty()) return;
   Scripting::Candle* interface = new Scripting::Candle(this);
   expose_object(vm, table_idx, interface, name, true);
 }
@@ -56,7 +77,7 @@ Candle::expose(HSQUIRRELVM vm, SQInteger table_idx)
 void
 Candle::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
 {
-  if (name == "") return;
+  if (name.empty()) return;
   Scripting::unexpose_object(vm, table_idx, name);
 }
 
@@ -66,7 +87,7 @@ Candle::puff_smoke()
   Vector ppos = bbox.get_middle();
   Vector pspeed = Vector(0, -150);
   Vector paccel = Vector(0,0);
-  Sector::current()->add_object(new SpriteParticle("images/objects/particles/smoke.sprite", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_BACKGROUNDTILES+2));
+  Sector::current()->add_object(new SpriteParticle("images/objects/particles/smoke.sprite", "default", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_BACKGROUNDTILES+2));
 }
 
 bool
@@ -90,3 +111,5 @@ Candle::set_burning(bool burning)
 }
 
 IMPLEMENT_FACTORY(Candle, "candle");
+
+/* EOF */