diff options
| -rw-r--r-- | crawl-ref/source/directn.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/effects.cc | 2 |
2 files changed, 1 insertions, 3 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 = ""; diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index f5ca575a5b..046893fa3d 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -2029,7 +2029,6 @@ void yell(bool force) if (targ_prev) { mons_targd = you.prev_targ; - mpr("Attack!"); break; } @@ -2058,7 +2057,6 @@ void yell(bool force) } mons_targd = mgrd[targ.tx][targ.ty]; - mpr("Attack!"); break; default: |