summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-09-07 23:37:38 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-09-07 23:37:38 +0000
commit37750174d01d5f928b84f5fcbd1ab668af5f8079 (patch)
tree2b4b0d38bf6e71e57f131d23bd76c959c209e971 /crawl-ref
parent5ced5e944825372a1668f25ecf363bada5c59c8c (diff)
downloadcrawl-ref-37750174d01d5f928b84f5fcbd1ab668af5f8079.tar.gz
crawl-ref-37750174d01d5f928b84f5fcbd1ab668af5f8079.zip
Add minor cosmetic fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10637 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/monstuff.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 87204667d5..aa48da6b7f 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -7517,7 +7517,7 @@ static void _handle_monster_move(monsters *monster)
if (!mons_neutral(monster) && !monster->has_ench(ENCH_CHARM)
|| (you.religion == GOD_JIYVA && mons_is_slime(monster))
&& (!mons_friendly(monster)
- || you.friendly_pickup > FRIENDLY_PICKUP_NONE))
+ || you.friendly_pickup != FRIENDLY_PICKUP_NONE))
{
if (_handle_pickup(monster))
{
@@ -7836,7 +7836,7 @@ static bool _is_item_jelly_edible(const item_def &item)
return (true);
}
-// XXX: This function assumes that only jellies can eat items.
+// XXX: This function assumes that only jellies eat items.
static bool _monster_eat_item(monsters *monster, bool monster_nearby)
{
if (!mons_eats_items(monster))
@@ -7981,6 +7981,8 @@ static bool _monster_eat_item(monsters *monster, bool monster_nearby)
return (eaten > 0);
}
+// XXX: This function assumes that only undead (which can heal from
+// eating) eat corpses.
static bool _monster_eat_corpse(monsters *monster, bool monster_nearby)
{
if (!mons_eats_corpses(monster))