more work on the camera

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

diff --git a/src/object/lantern.cpp b/src/object/lantern.cpp
index 41c04f0..e877a72 100644 (file)
--- a/src/object/lantern.cpp
+++ b/src/object/lantern.cpp
@@ -29,12 +29,11 @@ Lantern::Lantern(const lisp::Lisp& reader)
 {
   //get color from lisp
   std::vector<float> vColor;
-  reader.get_vector("color", vColor );
-  lightcolor = Color( vColor );
-
+  reader.get_vector("color", vColor);
+  lightcolor = Color(vColor);
   lightsprite = sprite_manager->create("images/objects/lightmap_light/lightmap_light.sprite");
-  lightsprite->set_color(lightcolor);
   lightsprite->set_blend(Blend(GL_SRC_ALPHA, GL_ONE));
+  updateColor();
 }
 
 Lantern::~Lantern()
@@ -43,6 +42,18 @@ Lantern::~Lantern()
 }
 
 void
+Lantern::updateColor(){
+  lightsprite->set_color(lightcolor);
+  //Turn lantern off if light is black
+  if(lightcolor.red == 0 && lightcolor.green == 0 && lightcolor.blue == 0){
+     sprite->set_action("off");
+  } else {
+     sprite->set_action("normal");
+     sprite->set_color(lightcolor);
+  }
+}
+
+void
 Lantern::draw(DrawingContext& context){
   //Draw the Sprite.
   MovingSprite::draw(context);