diff options
| -rw-r--r-- | crawl-ref/source/itemname.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/skills2.cc | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 354c8b54f5..b6cbb48e9d 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -90,9 +90,6 @@ std::string item_def::name(description_level_type descrip, if (descrip == DESC_NONE) return (""); - const bool is_artefact = (is_fixed_artefact( *this ) - || (is_random_artefact( *this ))); - std::ostringstream buff; const std::string auxname = this->name_aux(descrip, terse, ident, @@ -151,7 +148,7 @@ std::string item_def::name(description_level_type descrip, || (ident || item_type_known( *this )) && (this->base_type == OBJ_MISCELLANY && this->sub_type == MISC_HORN_OF_GERYON - || is_artefact)) + || is_artefact(*this))) { // Artefacts always get "the" unless we just want the plain name. switch (descrip) diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc index df8a11a05e..43e2be7226 100644 --- a/crawl-ref/source/skills2.cc +++ b/crawl-ref/source/skills2.cc @@ -2253,7 +2253,17 @@ void wield_warning(bool newWeapon) if (effective_stat_bonus() > -4) return; - std::string msg = (newWeapon ? "this " : "your ") + wep.name(DESC_BASENAME); + std::string msg; + + // We know if it's an artefact because we just wielded + // it, so no information leak. + if (is_artefact(wep)) + msg = "the"; + else if (newWeapon) + msg = "this"; + else + msg = "your"; + msg += " " + wep.name(DESC_BASENAME); const char* mstr = msg.c_str(); if (you.strength < you.dex) |