diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-07 11:16:07 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-07 11:16:07 +0000 |
| commit | a300efc63ded7eca8eaf7cfa74bc7918b1d05a7d (patch) | |
| tree | 912c91ab46b838e5163dec3715417eea02b98c03 /crawl-ref/source/fight.cc | |
| parent | c59c58e7a4e34a1f46ece4a45096b955d6caba65 (diff) | |
| download | crawl-ref-a300efc63ded7eca8eaf7cfa74bc7918b1d05a7d.tar.gz crawl-ref-a300efc63ded7eca8eaf7cfa74bc7918b1d05a7d.zip | |
Removed all uses of str_monam() outside of mon-util.cc; str_monam() is
now static.
Some description fixes (mainly for mummies and nagas.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1782 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 6a4664513c..8e3a564bdd 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -854,7 +854,7 @@ void melee_attack::player_announce_hit() verb_degree = " " + verb_degree; msg::stream << "You " << attack_verb << ' ' - << str_monam(*def, DESC_NOCAP_THE) + << def->name(DESC_NOCAP_THE) << verb_degree << debug_damage_number() << attack_strength_punctuation() << std::endl; @@ -877,7 +877,7 @@ void melee_attack::player_warn_miss() behaviour_event( def, ME_WHACK, MHITYOU ); msg::stream << player_why_missed() - << str_monam(*def, DESC_NOCAP_THE) + << def->name(DESC_NOCAP_THE) << "." << std::endl; } @@ -2009,7 +2009,7 @@ bool melee_attack::player_check_monster_died() if (def->type == MONS_GIANT_SPORE || def->type == MONS_BALL_LIGHTNING) msg::stream << "You " << attack_verb << ' ' - << str_monam(*def, DESC_NOCAP_THE) << '.' << std::endl; + << def->name(DESC_NOCAP_THE) << '.' << std::endl; monster_die(def, KILL_YOU, 0); return (true); @@ -3410,29 +3410,29 @@ static void stab_message( struct monsters *defender, int stab_bonus ) if (r<3) { mprf( "You strike %s from a blind spot!", - str_monam(*defender, DESC_NOCAP_THE).c_str() ); + defender->name(DESC_NOCAP_THE).c_str() ); } else { mprf( "You catch %s momentarily off-guard.", - str_monam(*defender, DESC_NOCAP_THE).c_str() ); + defender->name(DESC_NOCAP_THE).c_str() ); } break; case 2: // confused/fleeing if (r<4) { mprf( "You catch %s completely off-guard!", - str_monam(*defender, DESC_NOCAP_THE).c_str() ); + defender->name(DESC_NOCAP_THE).c_str() ); } else { mprf( "You strike %s from behind!", - str_monam(*defender, DESC_NOCAP_THE).c_str() ); + defender->name(DESC_NOCAP_THE).c_str() ); } break; case 1: mprf( "%s fails to defend %s.", - str_monam(*defender, DESC_CAP_THE).c_str(), + defender->name(DESC_CAP_THE).c_str(), mons_pronoun( defender->type, PRONOUN_REFLEXIVE ) ); break; } // end switch |