Missiles inscribed {poison} shouldn't be poisonous (probably in 0.2.x as well.)

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

4 files changed, 8 insertions, 6 deletions

diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h
index 05a1ae4209..fe87cc2560 100644
--- a/crawl-ref/source/externs.h
+++ b/crawl-ref/source/externs.h
@@ -515,7 +515,8 @@ public:
     }
 
     std::string name(description_level_type descrip,
-                     bool terse = false, bool ident = false) const;
+                     bool terse = false, bool ident = false,
+                     bool with_inscription = true ) const;
     bool has_spells() const;
     bool cursed() const;
     int  book_number() const;
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 676fb0cbd1..f3544c7acc 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -1441,7 +1441,7 @@ bool throw_it(struct bolt &pbolt, int throw_2, bool teleport, int acc_bonus)
     pbolt.source_y = you.y_pos;
     pbolt.colour = item.colour;
 
-    pbolt.name = item.name(DESC_PLAIN);
+    pbolt.name = item.name(DESC_PLAIN, false, false, false);
 
     pbolt.thrower = KILL_YOU_MISSILE;
     pbolt.aux_source.clear();
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index c1c12dba56..b9554065c9 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -84,7 +84,8 @@ std::string quant_name( const item_def &item, int quant,
 // buff must be at least ITEMNAME_SIZE if non-NULL. If NULL, a static
 // item buffer will be used.
 std::string item_def::name(description_level_type descrip,
-                           bool terse, bool ident) const
+                           bool terse, bool ident,
+                           bool with_inscription) const
 {
     std::ostringstream buff;
 
@@ -221,7 +222,7 @@ std::string item_def::name(description_level_type descrip,
         }
     }
 
-    if ( !(this->inscription.empty()) )
+    if ( with_inscription && !(this->inscription.empty()) )
     {
         buff << " {";        
         if ( is_tried_type(this->base_type, this->sub_type) )
@@ -232,7 +233,7 @@ std::string item_def::name(description_level_type descrip,
         buff << " {tried}";
 
     return buff.str();
-}                               // end item_name()
+}
 
 
 static const char* fixed_artefact_name( const item_def& item, bool ident )
diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc
index 03444dfd20..e128f70ae2 100644
--- a/crawl-ref/source/mstuff2.cc
+++ b/crawl-ref/source/mstuff2.cc
@@ -1247,7 +1247,7 @@ bool mons_throw(struct monsters *monster, struct bolt &pbolt, int hand_used)
         msg += item.name(DESC_NOCAP_A);
 
         // build beam name
-        pbolt.name = item.name(DESC_PLAIN);
+        pbolt.name = item.name(DESC_PLAIN, false, false, false);
     }
     msg += ".";
     if (monster->visible())