diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-03-19 15:35:10 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-03-19 15:35:10 +0100 |
| commit | 27d75b11f9383a9a3d0065e1d6a218d10c770bbb (patch) | |
| tree | 2622d86cc2dce37582adaa9c18dcc8480193147d /crawl-ref/source/tiledoll.cc | |
| parent | 2d626dd73c59c866d6aa576197efe43c9d16d738 (diff) | |
| download | crawl-ref-27d75b11f9383a9a3d0065e1d6a218d10c770bbb.tar.gz crawl-ref-27d75b11f9383a9a3d0065e1d6a218d10c770bbb.zip | |
Properly heed meldedness of armour (all slots) in tiles.
Diffstat (limited to 'crawl-ref/source/tiledoll.cc')
| -rw-r--r-- | crawl-ref/source/tiledoll.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/tiledoll.cc b/crawl-ref/source/tiledoll.cc index dba6ab820b..7678e20edb 100644 --- a/crawl-ref/source/tiledoll.cc +++ b/crawl-ref/source/tiledoll.cc @@ -299,7 +299,7 @@ void fill_doll_equipment(dolls_data &result) // Off hand. if (result.parts[TILEP_PART_HAND2] == TILEP_SHOW_EQUIP) { - const int item = you.equip[EQ_SHIELD]; + const int item = you.melded[EQ_SHIELD] ? -1 : you.equip[EQ_SHIELD]; if (you.form == TRAN_BLADE_HANDS) result.parts[TILEP_PART_HAND2] = TILEP_HAND2_BLADEHAND; else if (item == -1) @@ -310,7 +310,7 @@ void fill_doll_equipment(dolls_data &result) // Body armour. if (result.parts[TILEP_PART_BODY] == TILEP_SHOW_EQUIP) { - const int item = you.equip[EQ_BODY_ARMOUR]; + const int item = you.melded[EQ_BODY_ARMOUR] ? -1 : you.equip[EQ_BODY_ARMOUR]; if (item == -1) result.parts[TILEP_PART_BODY] = 0; else @@ -319,7 +319,7 @@ void fill_doll_equipment(dolls_data &result) // Cloak. if (result.parts[TILEP_PART_CLOAK] == TILEP_SHOW_EQUIP) { - const int item = you.equip[EQ_CLOAK]; + const int item = you.melded[EQ_CLOAK] ? -1 : you.equip[EQ_CLOAK]; if (item == -1) result.parts[TILEP_PART_CLOAK] = 0; else @@ -328,7 +328,7 @@ void fill_doll_equipment(dolls_data &result) // Helmet. if (result.parts[TILEP_PART_HELM] == TILEP_SHOW_EQUIP) { - const int item = you.equip[EQ_HELMET]; + const int item = you.melded[EQ_HELMET] ? -1 : you.equip[EQ_HELMET]; if (item != -1) result.parts[TILEP_PART_HELM] = tilep_equ_helm(you.inv[item]); else if (player_mutation_level(MUT_HORNS) > 0) @@ -364,7 +364,7 @@ void fill_doll_equipment(dolls_data &result) // Boots. if (result.parts[TILEP_PART_BOOTS] == TILEP_SHOW_EQUIP) { - const int item = you.equip[EQ_BOOTS]; + const int item = you.melded[EQ_BOOTS] ? -1 : you.equip[EQ_BOOTS]; if (item != -1) result.parts[TILEP_PART_BOOTS] = tilep_equ_boots(you.inv[item]); else if (player_mutation_level(MUT_HOOVES) >= 3) @@ -375,7 +375,7 @@ void fill_doll_equipment(dolls_data &result) // Gloves. if (result.parts[TILEP_PART_ARM] == TILEP_SHOW_EQUIP) { - const int item = you.equip[EQ_GLOVES]; + const int item = you.melded[EQ_GLOVES] ? -1 : you.equip[EQ_GLOVES]; if (item != -1) result.parts[TILEP_PART_ARM] = tilep_equ_gloves(you.inv[item]); else if (player_mutation_level(MUT_TENTACLE_SPIKE)) |