Oops, rings were getting doubled names, fixed.

The march towards ostringstream goes on.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1385 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 13 insertions, 11 deletions

diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 3132b1669a..07353d6d77 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -1299,18 +1299,20 @@ std::string item_def::name_aux( bool terse, bool ident ) const
 
             buff << jewellery_type_name(item_typ);
         }
-
-        if (item_typ < AMU_RAGE) // rings
-        {
-            buff << ring_secondary_string(this->special / 13)
-                 << ring_primary_string(this->special % 13)
-                 << " ring";
-        }
-        else                    // amulets
+        else
         {
-            buff << amulet_secondary_string(this->special / 13)
-                 << amulet_primary_string(this->special % 13)
-                 << " amulet";
+            if (item_typ < AMU_RAGE) // rings
+            {
+                buff << ring_secondary_string(this->special / 13)
+                     << ring_primary_string(this->special % 13)
+                     << " ring";
+            }
+            else                    // amulets
+            {
+                buff << amulet_secondary_string(this->special / 13)
+                     << amulet_primary_string(this->special % 13)
+                     << " amulet";
+            }
         }
         break;