summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-pick.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2014-07-05 21:59:31 -0400
committerNeil Moore <neil@s-z.org>2014-07-05 22:19:19 -0400
commitceea6a155e3bee001770670fc9f21dfe9ab668d8 (patch)
treef7d34f8c94d307daeaf6a00b661a3ff43cb07511 /crawl-ref/source/mon-pick.cc
parent359a1cb40b85dee48bc7f34a4d096bfb457dc7ad (diff)
downloadcrawl-ref-ceea6a155e3bee001770670fc9f21dfe9ab668d8.tar.gz
crawl-ref-ceea6a155e3bee001770670fc9f21dfe9ab668d8.zip
Simplify.
Diffstat (limited to 'crawl-ref/source/mon-pick.cc')
-rw-r--r--crawl-ref/source/mon-pick.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/crawl-ref/source/mon-pick.cc b/crawl-ref/source/mon-pick.cc
index 35ffe7e471..aeee5c20f9 100644
--- a/crawl-ref/source/mon-pick.cc
+++ b/crawl-ref/source/mon-pick.cc
@@ -179,11 +179,8 @@ monster_type pick_monster_all_branches(int absdepth0, monster_picker &picker,
if (depth < pop->minr || depth > pop->maxr)
continue;
- if (veto && (*veto)(pop->value)
- || !veto && picker.veto(pop->value))
- {
+ if (veto ? (*veto)(pop->value) : picker.veto(pop->value))
continue;
- }
int rar = picker.rarity_at(pop, depth);
ASSERT(rar > 0);