diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-05 22:11:20 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-05 22:11:20 +0000 |
| commit | aff54353f3a6bbb21d059914413581d3ef324bbb (patch) | |
| tree | 10dc9569d72d0f212c88e78bf4fdc1a13fd33e5c /crawl-ref/source/describe.cc | |
| parent | 4f824cd14b7f0d6f53c5a5f28ff8676bd35f261c (diff) | |
| download | crawl-ref-aff54353f3a6bbb21d059914413581d3ef324bbb.tar.gz crawl-ref-aff54353f3a6bbb21d059914413581d3ef324bbb.zip | |
Forward-port applicable fixes from 0.5 r9896 to trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9897 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/describe.cc')
| -rw-r--r-- | crawl-ref/source/describe.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 52f0b4b3e2..6cb1ef937e 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -1220,7 +1220,7 @@ static std::string _describe_ammo( const item_def &item ) if (always_destroyed) description += "$It will always be destroyed upon impact."; - else + else if (item.sub_type != MI_THROWING_NET) append_missile_info(description); if (item_ident( item, ISFLAG_KNOW_PLUSES ) && item.plus >= MAX_WPN_ENCHANT) @@ -2848,12 +2848,12 @@ void get_monster_db_desc(const monsters& mons, describe_info &inf, case MONS_VAMPIRE: case MONS_VAMPIRE_KNIGHT: case MONS_VAMPIRE_MAGE: - if (you.is_undead == US_ALIVE) + if (you.is_undead == US_ALIVE && !mons_wont_attack(&mons)) inf.body << "$It wants to drink your blood!$"; break; case MONS_REAPER: - if (you.is_undead == US_ALIVE) + if (you.is_undead == US_ALIVE && !mons_wont_attack(&mons)) inf.body << "$It has come for your soul!$"; break; |