diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-18 19:49:01 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-18 19:49:01 +0000 |
| commit | 01fe8d9fc1ecb9ecdfe81ab0547d56c25a320382 (patch) | |
| tree | 9c0bf376f826930e798adec5e2bd8f0515db19eb /crawl-ref/source/mon-util.cc | |
| parent | 6d7627cb65e54dae22237da82ea076bf17b1f9b7 (diff) | |
| download | crawl-ref-01fe8d9fc1ecb9ecdfe81ab0547d56c25a320382.tar.gz crawl-ref-01fe8d9fc1ecb9ecdfe81ab0547d56c25a320382.zip | |
Forward-port 0.5 r10272 to trunk (except that Dissolution actually gets
the Slime God as its god), and add a few minor cleanups.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10273 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 109d4c60a7..4d4569a51d 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -628,16 +628,12 @@ bool mons_is_icy(int mc) || mc == MONS_ICE_STATUE); } -// Monsters consider as "slime" for Jiyva. +// Monsters considered as "slime" for Jiyva. bool mons_is_slime(const monsters *mon) { - if (mons_genus(mon->type) == MONS_JELLY - || mons_genus(mon->type) == MONS_GIANT_EYEBALL - || mons_genus(mon->type) == MONS_GIANT_ORANGE_BRAIN) - { - return (true); - } - return (false); + return (mons_genus(mon->type) == MONS_JELLY + || mons_genus(mon->type) == MONS_GIANT_EYEBALL + || mons_genus(mon->type) == MONS_GIANT_ORANGE_BRAIN); } bool mons_eats_items(const monsters *mon) |