diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-11 18:03:58 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-11 18:03:58 +0000 |
| commit | f9ebc8f9bd830e27d2046c72425cc3b6d9dbb7eb (patch) | |
| tree | d454d9b9c19f96b8e881f49c1fdec2482860299f /crawl-ref/source/item_use.cc | |
| parent | 6358632409aa09a9d51dc501ac53736bdf771f63 (diff) | |
| download | crawl-ref-f9ebc8f9bd830e27d2046c72425cc3b6d9dbb7eb.tar.gz crawl-ref-f9ebc8f9bd830e27d2046c72425cc3b6d9dbb7eb.zip | |
Apply r9964 to trunk, and documentation update.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9965 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index d82638b0d0..f81196f13d 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -3493,6 +3493,8 @@ static bool _swap_rings(int ring_slot) // Don't prompt if both rings are of the same type. if (lring->sub_type == rring->sub_type + && lring->plus == rring->plus + && lring->plus2 == rring->plus2 && !is_artefact(*lring) && !is_artefact(*rring)) { if (item_cursed(*lring)) |