Eliminated it_name(), in_name(), item_name(). The function to use is

now item_def::name().
Cleaned up a lot of code in the process.


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

1 files changed, 3 insertions, 5 deletions

diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 0362cad36d..577b3afdbf 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -1011,8 +1011,7 @@ void melee_attack::player_weapon_auto_id()
         && random2(100) < you.skills[ wpn_skill ])
     {
         set_ident_flags( *weapon, ISFLAG_KNOW_PLUSES );
-        mprf("You are wielding %s.",
-             item_name(*weapon, DESC_NOCAP_A));
+        mprf("You are wielding %s.", weapon->name(DESC_NOCAP_A).c_str());
         more();
         you.wield_change = true;
     }
@@ -1980,8 +1979,7 @@ void melee_attack::player_apply_staff_damage()
         {
             set_ident_flags( *weapon, ISFLAG_KNOW_TYPE );
 
-            mprf("You are wielding %s.",
-                 item_name(*weapon, DESC_NOCAP_A));
+            mprf("You are wielding %s.", weapon->name(DESC_NOCAP_A).c_str());
             more();
             you.wield_change = true;
         }
@@ -2622,7 +2620,7 @@ std::string melee_attack::mons_attack_verb(const mon_attack_def &attk)
 std::string melee_attack::mons_weapon_desc()
 {
     if (weapon && attacker->id() != MONS_DANCING_WEAPON)
-        return make_stringf(" with %s", item_name(*weapon, DESC_NOCAP_A));
+        return std::string(" with ") + weapon->name(DESC_NOCAP_A);
 
     return ("");
 }