summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/food.cc
diff options
context:
space:
mode:
authorShmuale Mark <shm.mark@gmail.com>2014-04-02 16:30:54 -0400
committerShmuale Mark <shm.mark@gmail.com>2014-04-02 16:30:54 -0400
commit424acf8c8f1569aecc3c12367fb992d958dfd895 (patch)
tree5843a22370140f2e7702b127390c73fbf5872300 /crawl-ref/source/food.cc
parent132c9f3235cc843867e59c1ffea9a862ad6fbe04 (diff)
downloadcrawl-ref-424acf8c8f1569aecc3c12367fb992d958dfd895.tar.gz
crawl-ref-424acf8c8f1569aecc3c12367fb992d958dfd895.zip
Allow ghouls to use easy_eat.
While the motivation for not allowing auto_eat makes sense, there's no reason to force them to use an extra 'e' to eat a chunk.
Diffstat (limited to 'crawl-ref/source/food.cc')
-rw-r--r--crawl-ref/source/food.cc14
1 files changed, 5 insertions, 9 deletions
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index 25eaa78a65..a44440f33e 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -1472,14 +1472,7 @@ int prompt_eat_chunks(bool only_auto)
chunks.push_back(item);
}
- // Exempt undead from auto-eating since:
- // * Mummies don't eat.
- // * Vampire feeding takes a lot more time than eating a chunk
- // and may have unintended consequences.
- // * Ghouls may want to wait until chunks become rotten
- // or until they have some hp rot to heal.
- const bool easy_eat = (Options.easy_eat_chunks || only_auto)
- && !you.is_undead;
+ const bool easy_eat = Options.easy_eat_chunks || only_auto;
if (found_valid)
{
@@ -1492,7 +1485,10 @@ int prompt_eat_chunks(bool only_auto)
const bool bad = is_bad_food(*item);
- if (easy_eat && !bad && i_feel_safe())
+ // Allow undead to use easy_eat, but not auto_eat, since the player
+ // might not want to drink blood as a vampire and might want to save
+ // chunks as a ghoul.
+ if (easy_eat && !bad && i_feel_safe() && !(only_auto && you.is_undead))
{
// If this chunk is safe to eat, just do so without prompting.
autoeat = true;