[crawl-ref-commits] master branch updated: 0.11-a0-2542-g41df555

[<gi...@cr...>]

       via  41df555bbb78fedde288caf20714ba43240bd347 (commit)
      from  c1762c3f1e3a6bd774587fefa208b3b1fd12de48 (commit)

-----------------------------------------------------------------------
commit 41df555bbb78fedde288caf20714ba43240bd347
Author: Chris Campbell <chr...@gm...>
Date:   Sat Jun 30 20:14:24 2012 +0100

    Change lantern of shadows effect to allow distinguishing LOS boundary and monster colours
    
    Lightgrey maybe isn't shadowy enough for the effect to be worth keeping,
    feel free to just disable the colour change if anyone thinks that'd be
    a better solution.

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/view.cc |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index ce13226..263cf8d 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -698,7 +698,7 @@ std::string screenshot()
 int viewmap_flash_colour()
 {
     if (you.attribute[ATTR_SHADOWS])
-        return (DARKGREY);
+        return (LIGHTGREY);
     else if (you.berserk())
         return (RED);
 
@@ -725,8 +725,7 @@ void view_update_at(const coord_def &pos)
     monster_type mons = env.map_knowledge(pos).monster();
     int cell_colour =
         flash_colour &&
-        (mons == MONS_NO_MONSTER || mons_class_is_firewood(mons) ||
-         !you.berserk())
+        (mons == MONS_NO_MONSTER || mons_class_is_firewood(mons))
             ? real_colour(flash_colour)
             : g.col;
 
@@ -1136,8 +1135,7 @@ void draw_cell(screen_cell_t *cell, const coord_def &gc,
             cell->colour = real_colour(flash_colour);
 #else
             monster_type mons = env.map_knowledge(gc).monster();
-            if (mons == MONS_NO_MONSTER || mons_class_is_firewood(mons) ||
-                !you.berserk())
+            if (mons == MONS_NO_MONSTER || mons_class_is_firewood(mons))
             {
                 cell->colour = real_colour(flash_colour);
             }


-- 
Dungeon Crawl Stone Soup