summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/goditem.cc
diff options
context:
space:
mode:
authorCharles Otto <ottochar@gmail.com>2009-11-01 12:33:04 -0500
committerCharles Otto <ottochar@gmail.com>2009-11-01 12:33:04 -0500
commit1fb4a8139f535478e97e7b2fda9c81208b586804 (patch)
tree841c73d506c9af55d17b35c0b163bd9351817c8d /crawl-ref/source/goditem.cc
parent6e839a764ac329ad91994030a39a8e5516629210 (diff)
downloadcrawl-ref-1fb4a8139f535478e97e7b2fda9c81208b586804.tar.gz
crawl-ref-1fb4a8139f535478e97e7b2fda9c81208b586804.zip
Fix an assertion failure triggered via is_hasty_item
Diffstat (limited to 'crawl-ref/source/goditem.cc')
-rw-r--r--crawl-ref/source/goditem.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/goditem.cc b/crawl-ref/source/goditem.cc
index 5e344f191b..c04c023596 100644
--- a/crawl-ref/source/goditem.cc
+++ b/crawl-ref/source/goditem.cc
@@ -220,8 +220,8 @@ bool is_hasty_item(const item_def& item)
}
if (is_artefact(item)
- && artefact_wpn_property(item, ARTP_ANGRY)
- || artefact_wpn_property(item, ARTP_BERSERK))
+ && (artefact_wpn_property(item, ARTP_ANGRY)
+ || artefact_wpn_property(item, ARTP_BERSERK)))
{
retval = true;
}