diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-08 06:31:48 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-08 06:31:48 +0000 |
| commit | 70a1e4b78a0dfd6a2b145340d002c4046e73755e (patch) | |
| tree | 0fc23eaa15ad74cac08c4caf548f400ba083a6ff /crawl-ref/source/mon-util.cc | |
| parent | 6d0956ae71b9cb324538d642616985487bffa892 (diff) | |
| download | crawl-ref-70a1e4b78a0dfd6a2b145340d002c4046e73755e.tar.gz crawl-ref-70a1e4b78a0dfd6a2b145340d002c4046e73755e.zip | |
Simplify.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7187 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 464abb8643..5c70b00cb2 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -576,7 +576,7 @@ corpse_effect_type mons_corpse_effect(int mc) monster_type mons_species(int mc) { const monsterentry *me = get_monster_data(mc); - return (me? me->species : MONS_PROGRAM_BUG); + return (me ? me->species : MONS_PROGRAM_BUG); } monster_type mons_genus(int mc) @@ -3357,8 +3357,9 @@ item_def *monsters::weapon(int which_attack) bool monsters::can_throw_rocks() const { - return (type == MONS_STONE_GIANT || type == MONS_CYCLOPS - || type == MONS_OGRE || type == MONS_POLYPHEMUS); + return (type == MONS_STONE_GIANT + || ::mons_species(this->type) == MONS_CYCLOPS + || ::mons_species(this->type) == MONS_OGRE); } bool monsters::has_spell_of_type(unsigned disciplines) const |