summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-06 12:09:37 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-06 12:09:37 +0000
commit6e08da15bcedf8430bda16cbf2377e6ae9837967 (patch)
treedb8bb7d8eb083a04c138e9f07b46c6841c96406c
parentbbc3d962b7793b2a54e0e723049ecb706f945153 (diff)
downloadcrawl-ref-6e08da15bcedf8430bda16cbf2377e6ae9837967.tar.gz
crawl-ref-6e08da15bcedf8430bda16cbf2377e6ae9837967.zip
Apply trunk r6881 to 0.4.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6882 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/monstuff.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 9adc4b1123..0bf007ed85 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -1543,8 +1543,7 @@ bool monster_polymorph(monsters *monster, monster_type targetc,
}
// Messaging.
- bool invis = (!player_see_invis() && (mons_class_flag(targetc, M_INVIS)
- || monster->invisible()));
+ bool can_see = you.can_see(monster);
if (monster->has_ench(ENCH_GLOWING_SHAPESHIFTER, ENCH_SHAPESHIFTER))
str_polymon = " changes into ";
@@ -1553,7 +1552,7 @@ bool monster_polymorph(monsters *monster, monster_type targetc,
else
str_polymon = " evaporates and reforms as ";
- if (invis)
+ if (!can_see)
str_polymon += "something you cannot see!";
else
{