diff options
26 files changed, 59 insertions, 60 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 232fca339c..d7a0c72932 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -2673,7 +2673,7 @@ static bool _do_ability(const ability_def& abil) case ABIL_JIYVA_SLIMIFY: { const item_def* const weapon = you.weapon(); - const std::string msg = (weapon) ? weapon->name(DESC_NOCAP_YOUR) + const std::string msg = (weapon) ? weapon->name(DESC_YOUR) : ("your " + you.hand_name(true)); mprf(MSGCH_DURATION, "A thick mucus forms on %s.", msg.c_str()); you.increase_duration(DUR_SLIMIFY, diff --git a/crawl-ref/source/attack.cc b/crawl-ref/source/attack.cc index 540c191f17..f588565de6 100644 --- a/crawl-ref/source/attack.cc +++ b/crawl-ref/source/attack.cc @@ -77,8 +77,8 @@ std::string attack::anon_name(description_level_type desc, { case DESC_NONE: return (""); - case DESC_NOCAP_YOUR: - case DESC_NOCAP_ITS: + case DESC_YOUR: + case DESC_ITS: return ("its"); case DESC_THE: case DESC_A: diff --git a/crawl-ref/source/attack.h b/crawl-ref/source/attack.h index 6d769dabb1..ffb9d0eccd 100644 --- a/crawl-ref/source/attack.h +++ b/crawl-ref/source/attack.h @@ -123,7 +123,7 @@ protected: // Ouput methods std::string atk_name(description_level_type desc); std::string def_name(description_level_type desc); - std::string wep_name(description_level_type desc = DESC_NOCAP_YOUR, + std::string wep_name(description_level_type desc = DESC_YOUR, iflags_t ignore_flags = ISFLAG_KNOW_CURSE | ISFLAG_KNOW_PLUSES); diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index 3dfc4831ef..5ae731d3fd 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -1919,7 +1919,7 @@ static void _blade_card(int power, deck_rarity_type rarity) if (wpn) { mprf("%s vibrate%s crazily for a second.", - wpn->name(DESC_CAP_YOUR).c_str(), + wpn->name(DESC_YOUR).c_str(), wpn->quantity == 1 ? "s" : ""); } else diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index a950b741cb..233c48bfff 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -855,12 +855,12 @@ void handle_delay() { case DELAY_ARMOUR_ON: mprf(MSGCH_MULTITURN_ACTION, "You continue putting on %s.", - you.inv[delay.parm1].name(DESC_NOCAP_YOUR).c_str()); + you.inv[delay.parm1].name(DESC_YOUR).c_str()); break; case DELAY_ARMOUR_OFF: mprf(MSGCH_MULTITURN_ACTION, "You continue taking off %s.", - you.inv[delay.parm1].name(DESC_NOCAP_YOUR).c_str()); + you.inv[delay.parm1].name(DESC_YOUR).c_str()); break; case DELAY_BUTCHER: @@ -986,7 +986,7 @@ static void _finish_delay(const delay_queue_item &delay) ASSERT(you.equip[slot] == delay.parm1); mprf("You finish taking off %s.", - you.inv[delay.parm1].name(DESC_NOCAP_YOUR).c_str()); + you.inv[delay.parm1].name(DESC_YOUR).c_str()); unequip_item(slot); break; @@ -1288,7 +1288,7 @@ static void _armour_wear_effects(const int item_slot) if (Options.autoinscribe_artefacts && is_artefact(arm)) add_autoinscription(arm, artefact_auto_inscription(arm)); } - mprf("You finish putting on %s.", arm.name(DESC_NOCAP_YOUR).c_str()); + mprf("You finish putting on %s.", arm.name(DESC_YOUR).c_str()); if (eq_slot == EQ_BODY_ARMOUR) { diff --git a/crawl-ref/source/dgn-shoals.cc b/crawl-ref/source/dgn-shoals.cc index 59fe46bd5d..aa4f019b1c 100644 --- a/crawl-ref/source/dgn-shoals.cc +++ b/crawl-ref/source/dgn-shoals.cc @@ -1115,7 +1115,7 @@ void shoals_release_tide(monster* mons) if (player_can_hear(mons->pos())) { mprf(MSGCH_SOUND, "The tide is released from %s call.", - apostrophise(mons->name(DESC_NOCAP_YOUR, true)).c_str()); + apostrophise(mons->name(DESC_YOUR, true)).c_str()); if (you.see_cell(mons->pos())) flash_view_delay(ETC_WATER, 150); } diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index c49a8b3d5b..7254e6e1a2 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -847,7 +847,7 @@ void random_uselessness(int scroll_slot) if (you.weapon()) { mprf("%s glows %s for a moment.", - you.weapon()->name(DESC_CAP_YOUR).c_str(), + you.weapon()->name(DESC_YOUR).c_str(), weird_glowing_colour().c_str()); } else @@ -946,7 +946,7 @@ int recharge_wand(int item_slot, bool known, std::string *pre_msg) mpr(pre_msg->c_str()); mprf("%s %s for a moment%s.", - wand.name(DESC_CAP_YOUR).c_str(), + wand.name(DESC_YOUR).c_str(), charged ? "glows" : "flickers", desc.c_str()); @@ -991,7 +991,7 @@ int recharge_wand(int item_slot, bool known, std::string *pre_msg) if (pre_msg) mpr(pre_msg->c_str()); - mprf("%s glows for a moment.", wand.name(DESC_CAP_YOUR).c_str()); + mprf("%s glows for a moment.", wand.name(DESC_YOUR).c_str()); } you.wield_change = true; diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index c7262e9328..4865765ace 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -952,8 +952,7 @@ enum description_level_type { DESC_THE, DESC_A, - DESC_CAP_YOUR, - DESC_NOCAP_YOUR, + DESC_YOUR, DESC_PLAIN, DESC_NOCAP_ITS, DESC_INVENTORY_EQUIP, diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 2764286aaf..ee017ea7ec 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -254,7 +254,7 @@ bool wielded_weapon_check(item_def *weapon, bool no_message) if (unarmed_warning) prompt += "being unarmed?"; else - prompt += "wielding " + weapon->name(DESC_NOCAP_YOUR) + "? "; + prompt += "wielding " + weapon->name(DESC_YOUR) + "? "; const bool result = yesno(prompt.c_str(), true, 'n'); diff --git a/crawl-ref/source/godprayer.cc b/crawl-ref/source/godprayer.cc index 4733f92c1b..8e63db4717 100644 --- a/crawl-ref/source/godprayer.cc +++ b/crawl-ref/source/godprayer.cc @@ -119,7 +119,7 @@ static bool _bless_weapon(god_type god, brand_type brand, int colour) return (false); } - std::string prompt = "Do you wish to have " + wpn.name(DESC_NOCAP_YOUR) + std::string prompt = "Do you wish to have " + wpn.name(DESC_YOUR) + " "; if (brand == SPWPN_PAIN) prompt += "bloodied with pain"; diff --git a/crawl-ref/source/hints.cc b/crawl-ref/source/hints.cc index d9d8d384cc..2e813adf0d 100644 --- a/crawl-ref/source/hints.cc +++ b/crawl-ref/source/hints.cc @@ -3712,7 +3712,7 @@ void hints_describe_item(const item_def &item) case OBJ_MISSILES: if (is_throwable(&you, item)) { - ostr << item.name(DESC_CAP_YOUR) + ostr << item.name(DESC_YOUR) << " can be <w>%</w>ired without the use of a launcher. "; ostr << _hints_throw_stuff(item); cmd.push_back(CMD_FIRE); diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 31b784e777..c296d4da5c 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -771,7 +771,7 @@ bool do_wear_armour(int item, bool quiet) if (!quiet) { mprf("%s is stuck to your body!", - you.inv[you.equip[EQ_BODY_ARMOUR]].name(DESC_CAP_YOUR) + you.inv[you.equip[EQ_BODY_ARMOUR]].name(DESC_YOUR) .c_str()); } return (false); @@ -840,7 +840,7 @@ bool takeoff_armour(int item) if (item == you.equip[slot] && you.melded[slot]) { mprf("%s is melded into your body!", - invitem.name(DESC_CAP_YOUR).c_str()); + invitem.name(DESC_YOUR).c_str()); return (false); } @@ -858,7 +858,7 @@ bool takeoff_armour(int item) // If we get here, we're wearing the item. if (invitem.cursed()) { - mprf("%s is stuck to your body!", invitem.name(DESC_CAP_YOUR).c_str()); + mprf("%s is stuck to your body!", invitem.name(DESC_YOUR).c_str()); return (false); } @@ -3610,7 +3610,7 @@ bool remove_ring(int slot, bool announce) if (announce) { mprf("%s is stuck to you!", - you.inv[you.equip[hand_used]].name(DESC_CAP_YOUR).c_str()); + you.inv[you.equip[hand_used]].name(DESC_YOUR).c_str()); } else mpr("It's stuck to you!"); @@ -3625,7 +3625,7 @@ bool remove_ring(int slot, bool announce) if (!safe_to_remove_or_wear(you.inv[ring_wear_2], true)) return (false); - mprf("You remove %s.", you.inv[ring_wear_2].name(DESC_NOCAP_YOUR).c_str()); + mprf("You remove %s.", you.inv[ring_wear_2].name(DESC_YOUR).c_str()); unequip_item(hand_used); you.time_taken /= 2; @@ -4218,7 +4218,7 @@ static bool _vorpalise_weapon(bool already_known) { alert_nearby_monsters(); mprf("%s emits a brilliant flash of light!", - wpn.name(DESC_CAP_YOUR).c_str()); + wpn.name(DESC_YOUR).c_str()); set_item_ego_type(wpn, OBJ_WEAPONS, SPWPN_VORPAL); return (true); } @@ -4228,7 +4228,7 @@ static bool _vorpalise_weapon(bool already_known) return (false); // There's a temporary brand, attempt to make it permanent. - const std::string itname = wpn.name(DESC_CAP_YOUR); + const std::string itname = wpn.name(DESC_YOUR); bool success = true; bool msg = true; @@ -4351,7 +4351,7 @@ bool enchant_weapon(enchant_stat_type which_stat, bool quiet, item_def &wpn) } // Get item name now before changing enchantment. - std::string iname = wpn.name(DESC_CAP_YOUR); + std::string iname = wpn.name(DESC_YOUR); if (!uncurse_only) { @@ -4393,7 +4393,7 @@ bool enchant_weapon(enchant_stat_type which_stat, bool quiet, item_def &wpn) if (!quiet) { mprf("%s glows silver for a moment.", - wpn.name(DESC_CAP_YOUR).c_str()); + wpn.name(DESC_YOUR).c_str()); } } @@ -4453,7 +4453,7 @@ bool enchant_armour(int &ac_change, bool quiet, item_def &arm) if (!quiet) { mprf("%s glows purple and changes!", - arm.name(DESC_CAP_YOUR).c_str()); + arm.name(DESC_YOUR).c_str()); } ac_change = property(arm, PARM_AC); @@ -4474,7 +4474,7 @@ bool enchant_armour(int &ac_change, bool quiet, item_def &arm) if (!quiet) { mprf("%s glows silver for a moment.", - arm.name(DESC_CAP_YOUR).c_str()); + arm.name(DESC_YOUR).c_str()); } do_uncurse_item(arm, true, true); @@ -4493,7 +4493,7 @@ bool enchant_armour(int &ac_change, bool quiet, item_def &arm) if (!quiet) { mprf("%s glows green for a moment.", - arm.name(DESC_CAP_YOUR).c_str()); + arm.name(DESC_YOUR).c_str()); } arm.plus++; @@ -5027,7 +5027,7 @@ void read_scroll(int slot) // and not fully enchanted, or at least needs to be uncursed. // Get item name now before changing enchantment. - std::string iname = wpn.name(DESC_CAP_YOUR); + std::string iname = wpn.name(DESC_YOUR); // Uncursing is always possible. bool success = is_cursed; @@ -5277,7 +5277,7 @@ bool stasis_blocks_effect(bool calc_unid, if (msg) { - const std::string name(amulet? amulet->name(DESC_CAP_YOUR) : + const std::string name(amulet? amulet->name(DESC_YOUR) : "Something"); const std::string message = make_stringf(msg, name.c_str()); diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc index 664d7e27b9..ee0c5c58e4 100644 --- a/crawl-ref/source/main.cc +++ b/crawl-ref/source/main.cc @@ -2157,7 +2157,7 @@ static void _decrement_durations() const int temp_effect = get_weapon_brand(weapon); set_item_ego_type(weapon, OBJ_WEAPONS, SPWPN_NORMAL); - std::string msg = weapon.name(DESC_CAP_YOUR); + std::string msg = weapon.name(DESC_YOUR); switch (temp_effect) { diff --git a/crawl-ref/source/melee_attack.cc b/crawl-ref/source/melee_attack.cc index f28f39409e..3c44c07454 100644 --- a/crawl-ref/source/melee_attack.cc +++ b/crawl-ref/source/melee_attack.cc @@ -2130,7 +2130,7 @@ void melee_attack::chaos_affects_defender() if (weapon && you.can_see(attacker)) { - beam.name = wep_name(DESC_NOCAP_YOUR); + beam.name = wep_name(DESC_YOUR); beam.item = weapon; } else @@ -2195,7 +2195,7 @@ void melee_attack::chaos_affects_attacker() // Create a colourful cloud. if (weapon && one_chance_in(1000)) { - mprf("Smoke pours forth from %s!", wep_name(DESC_NOCAP_YOUR).c_str()); + mprf("Smoke pours forth from %s!", wep_name(DESC_YOUR).c_str()); big_cloud(random_smoke_type(), &you, attacker->pos(), 20, 4 + random2(8)); #ifdef NOTE_DEBUG_CHAOS_EFFECTS @@ -2219,7 +2219,7 @@ void melee_attack::chaos_affects_attacker() else { msg = getSpeakString("weapon_noises"); - std::string wepname = wep_name(DESC_CAP_YOUR); + std::string wepname = wep_name(DESC_YOUR); if (!msg.empty()) { msg = replace_all(msg, "@Your_weapon@", wepname); @@ -2314,7 +2314,7 @@ void melee_attack::do_miscast() // Ignore a lot of item flags to make cause as short as possible, // so it will (hopefully) fit onto a single line in the death // cause screen. - cause += wep_name(DESC_NOCAP_YOUR, + cause += wep_name(DESC_YOUR, ignore_mask | ISFLAG_COSMETIC_MASK | ISFLAG_RACIAL_MASK); @@ -5510,7 +5510,7 @@ void melee_attack::_steal_item_from_player(monster* mon) mprf("%s steals %s!", mon->name(DESC_THE).c_str(), - new_item.name(DESC_NOCAP_YOUR).c_str()); + new_item.name(DESC_YOUR).c_str()); unlink_item(index); mon->inv[mslot] = index; diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 14ea9264c1..27af6656ee 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -3817,7 +3817,7 @@ std::string do_mon_str_replacements(const std::string &in_msg, && !mons_is_unique(m_foe->type) && !crawl_state.game_is_arena()) { - foe_name = foe->name(DESC_NOCAP_YOUR); + foe_name = foe->name(DESC_YOUR); const std::string::size_type pos = foe_name.find("'"); if (pos != std::string::npos) foe_name = foe_name.substr(0, pos); diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc index 6cfd079832..9c4a253626 100644 --- a/crawl-ref/source/ouch.cc +++ b/crawl-ref/source/ouch.cc @@ -443,9 +443,9 @@ static void _item_corrode(int slot) if (!suppress_msg) { if (it_resists) - mprf("%s resists.", item.name(DESC_CAP_YOUR).c_str()); + mprf("%s resists.", item.name(DESC_YOUR).c_str()); else - mprf("The acid corrodes %s!", item.name(DESC_NOCAP_YOUR).c_str()); + mprf("The acid corrodes %s!", item.name(DESC_YOUR).c_str()); } if (!it_resists) diff --git a/crawl-ref/source/player-act.cc b/crawl-ref/source/player-act.cc index f093ee239f..959fae7bda 100644 --- a/crawl-ref/source/player-act.cc +++ b/crawl-ref/source/player-act.cc @@ -569,7 +569,7 @@ bool player::can_go_berserk(bool intentional, bool potion) const { const item_def *amulet = you.slot_item(EQ_AMULET, false); mprf("You cannot go berserk with %s on.", - amulet? amulet->name(DESC_NOCAP_YOUR).c_str() : "your amulet"); + amulet? amulet->name(DESC_YOUR).c_str() : "your amulet"); } return (false); } diff --git a/crawl-ref/source/player-equip.cc b/crawl-ref/source/player-equip.cc index 81fe2c73ef..5b9e9ba9d9 100644 --- a/crawl-ref/source/player-equip.cc +++ b/crawl-ref/source/player-equip.cc @@ -698,7 +698,7 @@ static void _unequip_weapon_effect(item_def& item, bool showMsgs) if (brand != SPWPN_NORMAL) { - const std::string msg = item.name(DESC_CAP_YOUR); + const std::string msg = item.name(DESC_YOUR); switch (brand) { @@ -1075,7 +1075,7 @@ static void _remove_amulet_of_faith(item_def &item) { mprf(MSGCH_GOD, "%s leaches power out of you as you remove it.", - item.name(DESC_CAP_YOUR).c_str()); + item.name(DESC_YOUR).c_str()); dprf("%s: piety leach: %d", item.name(DESC_PLAIN).c_str(), piety_loss); lose_piety(piety_loss); diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 57a58ddf1b..9ebb89afca 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -842,7 +842,7 @@ bool berserk_check_wielded_weapon() || you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED]) { std::string prompt = "Do you really want to go berserk while " - "wielding " + weapon.name(DESC_NOCAP_YOUR) + "wielding " + weapon.name(DESC_YOUR) + "?"; if (!yesno(prompt.c_str(), true, 'n')) diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 81ad649272..7fa44f512e 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -941,7 +941,7 @@ static int _setup_evaporate_cast() else { mprf(MSGCH_PROMPT, "Where do you want to aim %s?", - you.inv[rc].name(DESC_NOCAP_YOUR).c_str()); + you.inv[rc].name(DESC_YOUR).c_str()); } return rc; } diff --git a/crawl-ref/source/spl-damage.cc b/crawl-ref/source/spl-damage.cc index 6408575c16..29a3a4cf6f 100644 --- a/crawl-ref/source/spl-damage.cc +++ b/crawl-ref/source/spl-damage.cc @@ -955,7 +955,7 @@ static int _ignite_poison_affect_item(item_def& item, bool in_inv) if (set_item_ego_type(item, OBJ_WEAPONS, SPWPN_FLAMING)) { mprf("%s bursts into flame!", - item.name(DESC_CAP_YOUR).c_str()); + item.name(DESC_YOUR).c_str()); you.wield_change = true; diff --git a/crawl-ref/source/spl-goditem.cc b/crawl-ref/source/spl-goditem.cc index 745d5a17a8..e3ae48a5c2 100644 --- a/crawl-ref/source/spl-goditem.cc +++ b/crawl-ref/source/spl-goditem.cc @@ -688,7 +688,7 @@ bool detect_curse(int scroll, bool suppress_msg) item.quantity--; mprf("%s softly glows as it is inspected for curses.", - item.name(DESC_CAP_YOUR).c_str()); + item.name(DESC_YOUR).c_str()); } else mpr("Your items softly glow as they are inspected for curses."); diff --git a/crawl-ref/source/spl-summoning.cc b/crawl-ref/source/spl-summoning.cc index 48a2ccf804..c4250c6974 100644 --- a/crawl-ref/source/spl-summoning.cc +++ b/crawl-ref/source/spl-summoning.cc @@ -199,7 +199,7 @@ bool cast_sticks_to_snakes(int pow, god_type god) if (!check_warning_inscriptions(wpn, OPER_DESTROY)) { mprf("%s feel%s slithery for a moment!", - wpn.name(DESC_CAP_YOUR).c_str(), + wpn.name(DESC_YOUR).c_str(), wpn.quantity > 1 ? "" : "s"); return (false); } @@ -1039,7 +1039,7 @@ bool cast_tukimas_dance(int pow, god_type god, bool force_hostile) if (wpn) { mprf("%s vibrate%s crazily for a second.", - wpn->name(DESC_CAP_YOUR).c_str(), + wpn->name(DESC_YOUR).c_str(), wpn->quantity > 1 ? "" : "s"); } else @@ -1052,7 +1052,7 @@ bool cast_tukimas_dance(int pow, god_type god, bool force_hostile) // effects. unwield_item(); - mprf("%s dances into the air!", wpn->name(DESC_CAP_YOUR).c_str()); + mprf("%s dances into the air!", wpn->name(DESC_YOUR).c_str()); // Find out what our god thinks before killing the item. conduct_type why = good_god_hates_item_handling(*wpn); diff --git a/crawl-ref/source/spl-wpnench.cc b/crawl-ref/source/spl-wpnench.cc index e06231310c..21daa04395 100644 --- a/crawl-ref/source/spl-wpnench.cc +++ b/crawl-ref/source/spl-wpnench.cc @@ -131,7 +131,7 @@ bool brand_weapon(brand_type which_brand, int power) temp_brand = false; } - std::string msg = weapon.name(DESC_CAP_YOUR); + std::string msg = weapon.name(DESC_YOUR); bool emit_special_message = !temp_brand; int duration_affected = 0; @@ -219,7 +219,7 @@ bool brand_weapon(brand_type which_brand, int power) if (emit_special_message) mpr(msg.c_str()); else - mprf("%s flashes.", weapon.name(DESC_CAP_YOUR).c_str()); + mprf("%s flashes.", weapon.name(DESC_YOUR).c_str()); you.increase_duration(DUR_WEAPON_BRAND, duration_affected + roll_dice(2, power), 50); diff --git a/crawl-ref/source/transform.cc b/crawl-ref/source/transform.cc index 6733698782..ef6dba7338 100644 --- a/crawl-ref/source/transform.cc +++ b/crawl-ref/source/transform.cc @@ -177,7 +177,7 @@ static void _remove_equipment(const std::set<equipment_type>& removed, bool unequip = (e == EQ_WEAPON || !meld); - mprf("%s %s%s %s", equip->name(DESC_CAP_YOUR).c_str(), + mprf("%s %s%s %s", equip->name(DESC_YOUR).c_str(), unequip ? "fall" : "meld", equip->quantity > 1 ? "" : "s", unequip ? "away!" : "into your body."); @@ -261,7 +261,7 @@ static void _unmeld_equipment_slot(equipment_type e) if (force_remove) { mprf("%s is pushed off your body!", - item.name(DESC_CAP_YOUR).c_str()); + item.name(DESC_YOUR).c_str()); unequip_item(e); } else @@ -882,7 +882,7 @@ void untransform(bool skip_wielding, bool skip_move) const item_def *armour = you.slot_item(EQ_BODY_ARMOUR, false); mprf(MSGCH_DURATION, "%s cracks your icy armour.", - armour->name(DESC_CAP_YOUR).c_str()); + armour->name(DESC_YOUR).c_str()); } if (hp_downscale != 10 && you.hp != you.hp_max) diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 2a09a23c35..5be1154bb7 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -1649,7 +1649,7 @@ static int _xom_swap_weapons(bool debug = false) mprf("%s wields %s!", mon->name(DESC_THE).c_str(), - myweapon.name(DESC_NOCAP_YOUR).c_str()); + myweapon.name(DESC_YOUR).c_str()); mon->equip(myweapon, MSLOT_WEAPON, 0); // Item is gone from player's inventory. @@ -2637,11 +2637,11 @@ static void _xom_zero_miscast() std::string name; if (item.quantity == 1) - name = item.name(DESC_CAP_YOUR, false, false, false); + name = item.name(DESC_YOUR, false, false, false); else { name = "One of "; - name += item.name(DESC_NOCAP_YOUR, false, false, false); + name += item.name(DESC_YOUR, false, false, false); } messages.push_back(name + " falls out of your pack, then " "immediately jumps back in!"); @@ -2783,7 +2783,7 @@ static void _xom_zero_miscast() item = &you.inv[idx]; - std::string name = item->name(DESC_CAP_YOUR, false, false, false); + std::string name = item->name(DESC_YOUR, false, false, false); std::string verb = coinflip() ? "glow" : "vibrate"; if (item->quantity == 1) |