summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-10 15:48:23 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-10 15:48:23 +0000
commit23d1983b880e9195c4844b4e27ca861ed3847207 (patch)
treeea537e73ed1423cd21ef7ac0182e76323aeb3a51
parent2578ca1d5e12121031db83c94339ef835267c6a3 (diff)
downloadcrawl-ref-23d1983b880e9195c4844b4e27ca861ed3847207.tar.gz
crawl-ref-23d1983b880e9195c4844b4e27ca861ed3847207.zip
Backport trunk r10132 to 0.5.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10133 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/describe.cc2
-rw-r--r--crawl-ref/source/directn.cc3
2 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 838a7731d7..d6cf594bd2 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -2079,9 +2079,7 @@ std::string get_item_description( const item_def &item, bool verbose,
"by magic or mundane means.";
}
else
- {
description << "$$It is an ancient artefact.";
- }
}
}
}
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 49e6007702..bf16ea1fbd 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -3105,6 +3105,9 @@ static std::string _get_monster_desc(const monsters *mon)
if (mon->haloed())
text += pronoun + " is illuminated by a divine halo.\n";
+ if (mons_intel(mon) <= I_PLANT)
+ text += pronoun + " is mindless.\n";
+
// Give an indication of monsters being capable of seeing/sensing
// invisible creatures.
if (mons_behaviour_perceptible(mon) && !mons_is_sleeping(mon)