summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/melee_attack.cc
diff options
context:
space:
mode:
authorShmuale Mark <shm.mark@gmail.com>2014-08-03 13:59:36 -0400
committerShmuale Mark <shm.mark@gmail.com>2014-08-03 14:17:14 -0400
commit2e52a0c19d866a6a15b36163fa145a94bbf9721f (patch)
tree1ad40aea10861227400db415ab1c2adaef44252b /crawl-ref/source/melee_attack.cc
parent2091673ee858097442a1668a947626a489639ece (diff)
downloadcrawl-ref-2e52a0c19d866a6a15b36163fa145a94bbf9721f.tar.gz
crawl-ref-2e52a0c19d866a6a15b36163fa145a94bbf9721f.zip
Hide a hack better.
Ideally, we wouldn't be using special for unrands totally different from how items of the same type do, but that's less trivial than this commit. A centralised place to check for being an unrand should at least make such a change easier.
Diffstat (limited to 'crawl-ref/source/melee_attack.cc')
-rw-r--r--crawl-ref/source/melee_attack.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/crawl-ref/source/melee_attack.cc b/crawl-ref/source/melee_attack.cc
index e592b92261..36368910b4 100644
--- a/crawl-ref/source/melee_attack.cc
+++ b/crawl-ref/source/melee_attack.cc
@@ -147,8 +147,7 @@ bool melee_attack::handle_phase_attempted()
{
// These checks are handled in fight_jump() for jump attacks
if (!jumping_attack && weapon
- && is_unrandom_artefact(*weapon)
- && weapon->special == UNRAND_DEVASTATOR)
+ && is_unrandom_artefact(*weapon, UNRAND_DEVASTATOR))
{
const char* verb = "attack";
string junk1, junk2;