From df0550c02366ae190426938737a3adc9eda3f6a6 Mon Sep 17 00:00:00 2001 From: Wolfgang Becker Date: Sun, 17 Sep 2006 20:37:13 +0000 Subject: [PATCH] Magicblock timeout does not count if offscreen. Show lantern's color. SVN-Revision: 4242 --- src/object/lantern.cpp | 1 + src/object/magicblock.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/object/lantern.cpp b/src/object/lantern.cpp index 7295c610f..e877a72d2 100644 --- 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 352bf9894..f424c67e4 100644 --- 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; } -- 2.11.0