summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-util.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-02 13:17:35 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-02 13:17:35 +0000
commitd764d49f10bab7f7c52cd2bf162dce86d02d822e (patch)
treee1879123bc0110ced91bb9cfe1e28643f10e9fb1 /crawl-ref/source/mon-util.cc
parent1198a598b6048d2f181508cd1c610dbb1a3275b1 (diff)
downloadcrawl-ref-d764d49f10bab7f7c52cd2bf162dce86d02d822e.tar.gz
crawl-ref-d764d49f10bab7f7c52cd2bf162dce86d02d822e.zip
If a monster wields a non-branded launcher there is no message, so we
*know* it is a plain one -> it is now auto-identified which enables us to autoidentify branded ammo shot from it. Fix Trolls starting out wearing bucklers and remove the stat checks during (normal) random weapon choice. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6333 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
-rw-r--r--crawl-ref/source/mon-util.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index e6f118a6ef..a19ca4cd6c 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -3295,7 +3295,7 @@ void monsters::equip_weapon(item_def &item, int near, bool msg)
if (brand == SPWPN_PROTECTION)
ac += 5;
- if (msg && brand != SPWPN_NORMAL)
+ if (msg)
{
bool message_given = true;
switch (brand)
@@ -3331,8 +3331,11 @@ void monsters::equip_weapon(item_def &item, int near, bool msg)
mpr("Its appearance distorts for a moment.");
break;
default:
- message_given = false;
+ // A ranged weapon without special message is known to be unbranded.
+ if (!is_range_weapon(item))
+ message_given = false;
}
+
if (message_given)
set_ident_flags(item, ISFLAG_KNOW_TYPE);
}