diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-25 11:48:21 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-25 11:48:21 +0000 |
| commit | fd7dc681f01391fac151867b2d9152d7795c6e76 (patch) | |
| tree | 136453f8c9bb22855d1a7a2f8e07bf98e077ac68 /crawl-ref/source/delay.cc | |
| parent | 5e50467df71766be3f79b72d59f93c797164834f (diff) | |
| download | crawl-ref-fd7dc681f01391fac151867b2d9152d7795c6e76.tar.gz crawl-ref-fd7dc681f01391fac151867b2d9152d7795c6e76.zip | |
Mention named orcs' base type in the monster descriptions.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5231 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/delay.cc')
| -rw-r--r-- | crawl-ref/source/delay.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index da87dfe510..2bfccaaab6 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -1542,7 +1542,7 @@ inline static void monster_warning(activity_interrupt_type ai, const activity_interrupt_data &at, int atype) { - if ( ai == AI_SEE_MONSTER && is_run_delay(atype) ) + if (ai == AI_SEE_MONSTER && is_run_delay(atype)) { const monsters* mon = static_cast<const monsters*>(at.data); if (!mon->visible()) @@ -1552,14 +1552,17 @@ inline static void monster_warning(activity_interrupt_type ai, // Only say "comes into view" if the monster wasn't in view // during the previous turn. if (testbits(mon->flags, MF_WAS_IN_VIEW)) + { mprf(MSGCH_WARN, "%s is too close now for your liking.", mon->name(DESC_CAP_THE).c_str()); + } } else { - const std::string mweap = - get_monster_desc(mon, false, DESC_NONE); std::string text = mon->name(DESC_CAP_A); + // For named monsters also mention the base type. + if (!(mon->mname).empty()) + text += ", " + mons_type_name(mon->type, DESC_NOCAP_A) + ","; if (at.context == "thin air") { @@ -1584,10 +1587,13 @@ inline static void monster_warning(activity_interrupt_type ai, else text += " comes into view."; + const std::string mweap = + get_monster_desc(mon, false, DESC_NONE); + if (!mweap.empty()) { text += " " + mon->pronoun(PRONOUN_CAP) - + " is" + mweap + "."; + + " is" + mweap + "."; } print_formatted_paragraph(text, get_number_of_cols(), |