diff options
author | Adam Borowski <kilobyte@angband.pl> | 2014-01-09 22:46:14 +0100 |
---|---|---|
committer | Adam Borowski <kilobyte@angband.pl> | 2014-01-10 01:27:07 +0100 |
commit | 08cb1a4dcf80dd9784e1cfd26729a000c13fe767 (patch) | |
tree | 1bac450446aa22ba68f871d3c239694929d1b24f /crawl-ref/source/mon-info.cc | |
parent | a735ae8250517f301fbf828a4f4cbc4924df3adb (diff) | |
download | crawl-ref-08cb1a4dcf80dd9784e1cfd26729a000c13fe767.tar.gz crawl-ref-08cb1a4dcf80dd9784e1cfd26729a000c13fe767.zip |
Drop some useless parentheses around comparisons.
Diffstat (limited to 'crawl-ref/source/mon-info.cc')
-rw-r--r-- | crawl-ref/source/mon-info.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/mon-info.cc b/crawl-ref/source/mon-info.cc index 549132c9a2..b4067ac699 100644 --- a/crawl-ref/source/mon-info.cc +++ b/crawl-ref/source/mon-info.cc @@ -1165,7 +1165,7 @@ bool monster_info::less_than(const monster_info& m1, const monster_info& m2, return m1.number > m2.number; if (m1.type == MONS_BALLISTOMYCETE) - return (m1.number > 0) > (m2.number > 0); + return m1.number > 0 > (m2.number > 0); // Shifters after real monsters of the same type. if (m1.is(MB_SHAPESHIFTER) != m2.is(MB_SHAPESHIFTER)) @@ -1653,8 +1653,8 @@ int monster_info::res_magic() const item_def *jewellery = inv[MSLOT_JEWELLERY].get(); - if (jewellery && (jewellery->base_type == OBJ_JEWELLERY) - && (jewellery->sub_type == RING_PROTECTION_FROM_MAGIC)) + if (jewellery && jewellery->base_type == OBJ_JEWELLERY + && jewellery->sub_type == RING_PROTECTION_FROM_MAGIC) { mr += 40; } @@ -1734,7 +1734,7 @@ bool monster_info::cannot_move() const bool monster_info::airborne() const { - return (fly == FL_LEVITATE) || (fly == FL_WINGED && !cannot_move()); + return fly == FL_LEVITATE || (fly == FL_WINGED && !cannot_move()); } bool monster_info::ground_level() const |