From 4277eaea5e02fb69d64193a0395357e2c346afdb Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Sat, 21 Nov 2009 12:37:25 -0600 Subject: Add formatting fixes. This mostly puts && and || on the proper lines, per the style guide. --- crawl-ref/source/monster.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'crawl-ref/source/monster.cc') diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index 68ef785fd8..322c57b2b1 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -1512,18 +1512,19 @@ bool monsters::pickup_armour(item_def &item, int near, bool force) break; // And another hack or two... case ARM_WIZARD_HAT: - if (this->type == MONS_GASTRONOK) + if (type == MONS_GASTRONOK) eq = EQ_BODY_ARMOUR; break; case ARM_CLOAK: - if (this->type == MONS_MAURICE || this->type == MONS_NIKOLA || - this->type == MONS_CRAZY_YIUF) + if (type == MONS_MAURICE + || type == MONS_NIKOLA + || type == MONS_CRAZY_YIUF) { eq = EQ_BODY_ARMOUR; } break; case ARM_GLOVES: - if (this->type == MONS_NIKOLA) + if (type == MONS_NIKOLA) eq = EQ_SHIELD; break; default: @@ -1580,7 +1581,7 @@ bool monsters::pickup_armour(item_def &item, int near, bool force) return (false); } - return pickup(item, mslot, near); + return (pickup(item, mslot, near)); } bool monsters::pickup_weapon(item_def &item, int near, bool force) -- cgit v1.2.3-54-g00ecf