diff options
| author | Neil Moore <neil@s-z.org> | 2014-05-20 22:44:08 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-05-20 22:44:08 -0400 |
| commit | 7cfc2843c471dbcd4a3786dc8bdcae7181863000 (patch) | |
| tree | 7d42dc68aaee7936de91f5ee9e3e357fdf0b03d1 /crawl-ref/source/item_use.cc | |
| parent | 62ff1c1baca441d659d811eda4d52c19417972ca (diff) | |
| download | crawl-ref-7cfc2843c471dbcd4a3786dc8bdcae7181863000.tar.gz crawl-ref-7cfc2843c471dbcd4a3786dc8bdcae7181863000.zip | |
Distinguish artefact from non- when swapping rings (#8062)
If the left ring was a artefact and the right ring a non-artefact of the
same base time, we failed to ask which to swap out.
Diffstat (limited to 'crawl-ref/source/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index ed3c6ce2c3..7e999a1456 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -1175,7 +1175,7 @@ static bool _swap_rings(int ring_slot) if (ring->sub_type != first_ring->sub_type || ring->plus != first_ring->plus || ring->plus2 != first_ring->plus2 - || is_artefact(*ring)) + || is_artefact(*ring) || is_artefact(*first_ring)) { all_same = false; } |