diff options
| author | DracoOmega <draco_omega@live.com> | 2014-02-13 22:01:47 -0330 |
|---|---|---|
| committer | DracoOmega <draco_omega@live.com> | 2014-02-13 22:01:47 -0330 |
| commit | 8b692751aca0bde2d58bdba056c6b94661c3011b (patch) | |
| tree | d1bc81cf4af2cd5462fc563525b7d9da8a620e87 /crawl-ref/source/status.cc | |
| parent | 230ef3e62244bdff6adcb585676b0469e80f8b10 (diff) | |
| parent | b78098f4675f43661c4eadc0437d3c15462a63e2 (diff) | |
| download | crawl-ref-8b692751aca0bde2d58bdba056c6b94661c3011b.tar.gz crawl-ref-8b692751aca0bde2d58bdba056c6b94661c3011b.zip | |
Merge branch 'master' into summon_spells
Conflicts:
crawl-ref/source/enum.h
crawl-ref/source/spl-data.h
crawl-ref/source/spl-summoning.cc
Diffstat (limited to 'crawl-ref/source/status.cc')
| -rw-r--r-- | crawl-ref/source/status.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/crawl-ref/source/status.cc b/crawl-ref/source/status.cc index 3ebcbfd5d8..4d36a1c0d4 100644 --- a/crawl-ref/source/status.cc +++ b/crawl-ref/source/status.cc @@ -1101,30 +1101,22 @@ static void _describe_missiles(status_info* inf) if (!level) return; - bool expiring; if (level > 1) { - inf->light_colour = MAGENTA; + inf->light_colour = LIGHTMAGENTA; inf->light_text = "DMsl"; inf->short_text = "deflect missiles"; inf->long_text = "You deflect missiles."; - expiring = (you.attribute[ATTR_DEFLECT_MISSILES] == 0 - && dur_expiring(DUR_DEFLECT_MISSILES)); } else { bool perm = player_mutation_level(MUT_DISTORTION_FIELD) == 3 || you.scan_artefacts(ARTP_RMSL); - inf->light_colour = perm ? WHITE : BLUE; + inf->light_colour = perm ? WHITE : LIGHTBLUE; inf->light_text = "RMsl"; inf->short_text = "repel missiles"; inf->long_text = "You repel missiles."; - expiring = (!perm && you.attribute[ATTR_REPEL_MISSILES] == 0 - && dur_expiring(DUR_REPEL_MISSILES)); } - - inf->light_colour = _dur_colour(inf->light_colour, expiring); - _mark_expiring(inf, expiring); } static void _describe_invisible(status_info* inf) |