diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-06 23:05:48 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-06 23:05:48 +0000 |
| commit | 3eff30e2fc9f31e4b0813eda0a7c3b05f9f34cbf (patch) | |
| tree | 388ea57f699b792f0374e50b147731f24ad5da28 /crawl-ref/source/directn.cc | |
| parent | 82d8dad204b5e36201a706fb5123053d85e46270 (diff) | |
| download | crawl-ref-3eff30e2fc9f31e4b0813eda0a7c3b05f9f34cbf.tar.gz crawl-ref-3eff30e2fc9f31e4b0813eda0a7c3b05f9f34cbf.zip | |
Bug 1986918: Fix "Player's ghost the Player's ghost" monster naming problem,
and "Attack!" being given twice when ordering allies to attack.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5509 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/directn.cc')
| -rw-r--r-- | crawl-ref/source/directn.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index c696cfea46..9f80ac29e4 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -2207,7 +2207,7 @@ std::string get_monster_desc(const monsters *mon, bool full_desc, // Note that the only difference between DESC_BASENAME and DESC_PLAIN // is that basename will ignore mname, so the monster _must_ be named // for this to make any sense. - if (!(mon->mname).empty()) + if (!(mon->mname).empty() && desc != mon->name(DESC_BASENAME)) desc += " the " + mon->name(DESC_BASENAME); } std::string weap = ""; |