X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fcandle.cpp;h=84535f64ad57ccaf2017a45a9f1fd5d350a83d35;hb=c88bea169adaf492d7e1da6567edee6f9b6a94d1;hp=e2899cb73203c44857baeb6827e0e1613d82a63d;hpb=729bc6717bf68314dc9fad25db3a9f728062263e;p=supertux.git

diff --git a/src/object/candle.cpp b/src/object/candle.cpp
index e2899cb73..84535f64a 100644
--- a/src/object/candle.cpp
+++ b/src/object/candle.cpp
@@ -24,12 +24,30 @@
 #include "util/reader.hpp"
 
 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")
+  : MovingSprite(lisp, "images/objects/candle/candle.sprite", LAYER_BACKGROUNDTILES+1, COLGROUP_DISABLED),
+    burning(true),
+    flicker(true),
+    lightcolor(1.0f, 1.0f, 1.0f),
+    candle_light_1(SpriteManager::current()->create("images/objects/candle/candle-light-1.sprite")),
+    candle_light_2(SpriteManager::current()->create("images/objects/candle/candle-light-2.sprite"))
 {
   lisp.get("name", name);
   lisp.get("burning", burning);
+  lisp.get("flicker", flicker);
+  //get color from lisp
+  std::vector<float> vColor;
+  lisp.get("color", vColor);
+  //change the light color if defined
+  if (vColor.size() >= 3) {
+    lightcolor = Color(vColor);
+    candle_light_1->set_blend(Blend(GL_SRC_ALPHA, GL_ONE));
+    candle_light_2->set_blend(Blend(GL_SRC_ALPHA, GL_ONE));
+    candle_light_1->set_color(lightcolor);
+    candle_light_2->set_color(lightcolor);
+    //the following allows the original candle appearance to be preserved
+    candle_light_1->set_action("white");
+    candle_light_2->set_action("white");
+  }
 
   if (burning) {
     sprite->set_action("on");
@@ -47,14 +65,16 @@ 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);
+    if (gameRandom.rand(10) != 0 || !flicker) {
+      //context.draw_surface(candle_light_1, pos, layer);
+      candle_light_1->draw(context, get_bbox().get_middle(), 0);
     } else {
-      context.draw_surface(&candle_light_2, pos, layer);
+      //context.draw_surface(candle_light_2, pos, layer);
+      candle_light_2->draw(context, get_bbox().get_middle(), 0);
     }
     context.pop_target();
   }
@@ -70,8 +90,8 @@ 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
@@ -97,17 +117,17 @@ Candle::get_burning()
 }
 
 void
-Candle::set_burning(bool burning)
+Candle::set_burning(bool burning_)
 {
-  if (this->burning == burning) return;
-  this->burning = burning;
-  if (burning) {
+  if (this->burning == burning_) return;
+  this->burning = burning_;
+  if (burning_) {
     sprite->set_action("on");
-    puff_smoke();
   } else {
     sprite->set_action("off");
-    puff_smoke();
   }
+  //puff smoke for flickering light sources only
+  if (flicker) puff_smoke();
 }
 
 /* EOF */