summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-10 23:59:27 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-10 23:59:27 +0000
commit2b93c0385f7eb0389d98b2444a123951f9a578ed (patch)
tree0cc3e6356f6ae1c168978487dd21838e24997fbd
parent4b1fdd0b46fec3894de67b7a0dfaa62bda48c998 (diff)
downloadcrawl-ref-2b93c0385f7eb0389d98b2444a123951f9a578ed.tar.gz
crawl-ref-2b93c0385f7eb0389d98b2444a123951f9a578ed.zip
Trunk->0.3 merge: don't describe weapons of invisible monsters.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2416 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/fight.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 0dfb910968..56dbff8e3b 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -2922,6 +2922,8 @@ std::string melee_attack::mons_attack_verb(const mon_attack_def &attk)
std::string melee_attack::mons_weapon_desc()
{
+ if (!player_monster_visible(atk))
+ return("");
if (weapon && attacker->id() != MONS_DANCING_WEAPON)
{
std::string result = "";