diff options
| author | Florian Diebold <flodiebold@gmail.com> | 2011-12-14 13:04:32 +0100 |
|---|---|---|
| committer | Florian Diebold <flodiebold@gmail.com> | 2011-12-14 13:04:32 +0100 |
| commit | 6feda7a9be5957681075d17469f7135115b97cbc (patch) | |
| tree | b92576565737013940910f3416d876fcc02accdf /crawl-ref/source/tiledoll.cc | |
| parent | d5a93c807e89bdccfd61b3871aca95d6088c56f4 (diff) | |
| download | crawl-ref-6feda7a9be5957681075d17469f7135115b97cbc.tar.gz crawl-ref-6feda7a9be5957681075d17469f7135115b97cbc.zip | |
Fix monster weapons not showing when the player's weapon is melded (#5038).
tilep_equ_weapon checked if the player's weapon is melded even though
it was also used for monster weapons. I also removed redundant checks
for the player's respective equipment slots from the other tilep_equ_*
functions.
Diffstat (limited to 'crawl-ref/source/tiledoll.cc')
| -rw-r--r-- | crawl-ref/source/tiledoll.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/tiledoll.cc b/crawl-ref/source/tiledoll.cc index 4d32801a58..885e28640d 100644 --- a/crawl-ref/source/tiledoll.cc +++ b/crawl-ref/source/tiledoll.cc @@ -277,7 +277,7 @@ void fill_doll_equipment(dolls_data &result) // Main hand. if (result.parts[TILEP_PART_HAND1] == TILEP_SHOW_EQUIP) { - const int item = you.equip[EQ_WEAPON]; + const int item = you.melded[EQ_WEAPON] ? -1 : you.equip[EQ_WEAPON]; if (you.form == TRAN_BLADE_HANDS) { result.parts[TILEP_PART_HAND1] = TILEP_HAND1_BLADEHAND; |