summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/food.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-09 18:18:52 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-09 18:18:52 +0000
commit2ee0afe954a7c72856fd5f0f7d3080012638bb98 (patch)
treee74d1ada80812f82ebcd67c8928b9c9a3f2a0a81 /crawl-ref/source/food.cc
parent2ef8bb80a61c7b8aec6264babac49b04de264e96 (diff)
downloadcrawl-ref-2ee0afe954a7c72856fd5f0f7d3080012638bb98.tar.gz
crawl-ref-2ee0afe954a7c72856fd5f0f7d3080012638bb98.zip
Remove pickup.lua.
Make menu_colour_item_prefix also apply for autopickup_exceptions, so you can exclude, for example, all evil_eating at once. Fix Vampires "continuing draining" after having "stopped". git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5666 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/food.cc')
-rw-r--r--crawl-ref/source/food.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index aceb6acc94..621abf33bd 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -282,7 +282,8 @@ static bool _prepare_butchery(bool can_butcher, bool barehand_butcher,
}
you.turn_is_over = true;
- // switched to a good butchering tool
+
+ // Switched to a good butchering tool.
return (true);
}
@@ -1947,6 +1948,9 @@ bool is_preferred_food(const item_def &food)
if (you.species == SP_VAMPIRE)
return (is_blood_potion(food));
+ if (food.base_type == OBJ_POTIONS && food.sub_type == POT_PORRIDGE)
+ return (!player_mutation_level(MUT_CARNIVOROUS));
+
if (food.base_type != OBJ_FOOD)
return (false);