X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fcandle.cpp;h=98c48c1953f1a8c450dbe23b57bd4bcca46d8515;hb=ab9eab4c870195c2b60ce76b77044c35b31e8806;hp=e11bcb61b6ddfc07e87c92eba0b8482c41425401;hpb=3e89eb527d5f3bca2cb8cd219784048764a148f5;p=supertux.git

diff --git a/src/object/candle.cpp b/src/object/candle.cpp
index e11bcb61b..98c48c195 100644
--- a/src/object/candle.cpp
+++ b/src/object/candle.cpp
@@ -25,9 +25,12 @@
 #include "sector.hpp"
 #include "object/sprite_particle.hpp"
 #include "object_factory.hpp"
+#include "random_generator.hpp"
 
 Candle::Candle(const lisp::Lisp& lisp)
-	: MovingSprite(lisp, "images/objects/candle/candle.sprite", LAYER_BACKGROUNDTILES+1, COLGROUP_DISABLED), burning(true), name("")
+	: 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 +40,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 +73,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 +81,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);
 }