Magicblock timeout does not count if offscreen.

Show lantern's color.

SVN-Revision: 4242

diff --git a/src/object/lantern.cpp b/src/object/lantern.cpp
index 7295c61..e877a72 100644 (file)
--- a/src/object/lantern.cpp
+++ b/src/object/lantern.cpp
@@ -49,6 +49,7 @@ Lantern::updateColor(){
      sprite->set_action("off");
   } else {
      sprite->set_action("normal");
+     sprite->set_color(lightcolor);
   }
 }
 

diff --git a/src/object/magicblock.cpp b/src/object/magicblock.cpp
index 352bf98..f424c67 100644 (file)
--- a/src/object/magicblock.cpp
+++ b/src/object/magicblock.cpp
@@ -73,6 +73,7 @@ MagicBlock::update(float elapsed_time)
   float screen_bottom = screen_top + SCREEN_HEIGHT;
   if((get_bbox().p1.x > screen_right ) || ( get_bbox().p1.y > screen_bottom) ||
      ( get_bbox().p2.x < screen_left) || ( get_bbox().p2.y < screen_top)) {
+    switch_delay = SWITCH_DELAY;
     return;
   }