diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-20 21:47:40 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-20 21:47:40 +0000 |
| commit | f382ac5fc0137d0a2a58be30a893dfa9aa2723bd (patch) | |
| tree | 8b709259cba53b49949b2c1f7f3b81984942be90 /crawl-ref/source/tilesdl.cc | |
| parent | 43e1f3ff5c4132023e80c6afe33e308f938a9860 (diff) | |
| download | crawl-ref-f382ac5fc0137d0a2a58be30a893dfa9aa2723bd.tar.gz crawl-ref-f382ac5fc0137d0a2a58be30a893dfa9aa2723bd.zip | |
Add tiles for the sewers' murky (deep and shallow) water, as well as a
yellow background for melded items in inventory.
Allow higher level transformations (level 5 and above) to work even
if your to-be-melded equipment is cursed, exempting weapons, as before.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7522 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilesdl.cc')
| -rw-r--r-- | crawl-ref/source/tilesdl.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc index 77c940bda7..e6f07a19a2 100644 --- a/crawl-ref/source/tilesdl.cc +++ b/crawl-ref/source/tilesdl.cc @@ -1115,9 +1115,12 @@ void TilesFramework::update_inventory() for (int eq = 0; eq < NUM_EQUIP; eq++) { - if (you.equip[eq] == i && you_tran_can_wear(you.inv[i])) + if (you.equip[eq] == i) { - desc.flag |= TILEI_FLAG_EQUIP; + if (you_tran_can_wear(you.inv[i])) + desc.flag |= TILEI_FLAG_EQUIP; + else + desc.flag |= TILEI_FLAG_MELDED; break; } } |