diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-06 18:19:03 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-06 18:19:03 -0600 |
| commit | dfa1f6979fc8164652f29248b5f55f6ee100dd0b (patch) | |
| tree | f02885ce25f3f78d63fcadbd0bdbf641084c03d8 | |
| parent | e47db99b5c0e09041d8747b8aad9ce04ae7313dd (diff) | |
| download | crawl-ref-dfa1f6979fc8164652f29248b5f55f6ee100dd0b.tar.gz crawl-ref-dfa1f6979fc8164652f29248b5f55f6ee100dd0b.zip | |
Simplify.
| -rw-r--r-- | crawl-ref/source/monster.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index f886e0699a..034a76ad46 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -641,8 +641,8 @@ bool monsters::could_wield(const item_def &item, bool ignore_brand, bool monsters::can_throw_large_rocks() const { return (type == MONS_STONE_GIANT - || ::mons_species(this->type) == MONS_CYCLOPS - || ::mons_species(this->type) == MONS_OGRE); + || ::mons_species(type) == MONS_CYCLOPS + || ::mons_species(type) == MONS_OGRE); } bool monsters::has_spell_of_type(unsigned disciplines) const @@ -1478,13 +1478,12 @@ bool monsters::pickup_armour(item_def &item, int near, bool force) switch (item.sub_type) { case ARM_NAGA_BARDING: - if (::mons_species(this->type) == MONS_NAGA - || ::mons_species(this->type) == MONS_GUARDIAN_NAGA) + if (::mons_genus(type) == MONS_NAGA) eq = EQ_BODY_ARMOUR; break; case ARM_CENTAUR_BARDING: - if (::mons_species(this->type) == MONS_CENTAUR - || ::mons_species(this->type) == MONS_YAKTAUR) + if (::mons_species(type) == MONS_CENTAUR + || ::mons_species(type) == MONS_YAKTAUR) { eq = EQ_BODY_ARMOUR; } |