summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/goditem.cc
diff options
context:
space:
mode:
authorChris Campbell <chriscampbell89@gmail.com>2014-01-16 01:55:24 +0000
committerChris Campbell <chriscampbell89@gmail.com>2014-01-16 01:55:24 +0000
commit787e0f343804a194f792dccbefc69546a80c908f (patch)
treec75fb8ce7ac50fa5784af72fe715e8e401f3d7f9 /crawl-ref/source/goditem.cc
parent66edf1ddf6bc20481a1b4c7e0c3b86f51975f674 (diff)
downloadcrawl-ref-787e0f343804a194f792dccbefc69546a80c908f.tar.gz
crawl-ref-787e0f343804a194f792dccbefc69546a80c908f.zip
Simplify illumination conducts
Don't care about minor sources of glow (mutagenic glow, glowing unrands). For illumination conducts, just look for halos and spells (corona, sunray, etc).
Diffstat (limited to 'crawl-ref/source/goditem.cc')
-rw-r--r--crawl-ref/source/goditem.cc23
1 files changed, 2 insertions, 21 deletions
diff --git a/crawl-ref/source/goditem.cc b/crawl-ref/source/goditem.cc
index 18bf47c35b..f7bbb90ba5 100644
--- a/crawl-ref/source/goditem.cc
+++ b/crawl-ref/source/goditem.cc
@@ -395,34 +395,15 @@ bool is_poisoned_item(const item_def& item)
bool is_illuminating_item(const item_def& item)
{
- // No halo for you! Also no glowy unrands.
+ // No halo for you!
if (is_unrandom_artefact(item)
- && (item.special == UNRAND_BRILLIANCE
- || item.special == UNRAND_PLUTONIUM_SWORD
- || item.special == UNRAND_STARLIGHT
- || item.special == UNRAND_HIGH_COUNCIL))
+ && (item.special == UNRAND_BRILLIANCE))
{
return true;
}
switch (item.base_type)
{
- case OBJ_WEAPONS:
- {
- const int item_brand = get_weapon_brand(item);
- if (item_brand == SPWPN_HOLY_WRATH) // divine radiance!
- {
- return true;
- }
- }
- break;
- case OBJ_MISSILES:
- {
- const int item_brand = get_ammo_brand(item);
- if (item_brand == SPMSL_FLAME)
- return true;
- }
- break;
case OBJ_BOOKS:
case OBJ_RODS:
return _is_bookrod_type(item, is_illuminating_spell);