diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-21 12:37:25 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-21 12:37:25 -0600 |
| commit | 4277eaea5e02fb69d64193a0395357e2c346afdb (patch) | |
| tree | 68806b639fbb4d2e08215b12517c86c2eee0fe94 /crawl-ref/source/monster.cc | |
| parent | 505571294e7ca02c0af89ff2b25f3cecde439448 (diff) | |
| download | crawl-ref-4277eaea5e02fb69d64193a0395357e2c346afdb.tar.gz crawl-ref-4277eaea5e02fb69d64193a0395357e2c346afdb.zip | |
Add formatting fixes.
This mostly puts && and || on the proper lines, per the style guide.
Diffstat (limited to 'crawl-ref/source/monster.cc')
| -rw-r--r-- | crawl-ref/source/monster.cc | 11 |
1 files changed, 6 insertions, 5 deletions
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) |