summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/food.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-29 09:01:15 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-29 09:01:15 +0000
commitf3b925a6152cdacf270bb15495af010ade192e04 (patch)
tree89405ac60369020fad60aeea02ebbb8243dabb19 /crawl-ref/source/food.cc
parente0e9575453aa994b55c1f466fbf3b2cce2c118be (diff)
downloadcrawl-ref-f3b925a6152cdacf270bb15495af010ade192e04.tar.gz
crawl-ref-f3b925a6152cdacf270bb15495af010ade192e04.zip
Carnivore food colouring was ignoring poison setting. [2134776]
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7065 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/food.cc')
-rw-r--r--crawl-ref/source/food.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index 9962c1ffd2..6e663e92f2 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -2044,6 +2044,9 @@ bool is_preferred_food(const item_def &food)
if (food.base_type != OBJ_FOOD)
return (false);
+
+ if (is_poisonous(food))
+ return (false);
// Honeycombs are tasty for everyone.
if (food.sub_type == FOOD_HONEYCOMB || food.sub_type == FOOD_ROYAL_JELLY)