diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-16 12:19:25 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-16 12:19:25 +0000 |
| commit | c27f68c47819e15d09279df9146bccfb1ff56aae (patch) | |
| tree | 673ca05af2382df4034845e4fe95846e61382e0a /crawl-ref/source/food.cc | |
| parent | 18266441fdeec28e0eba1818726a2c41b2376aa4 (diff) | |
| download | crawl-ref-c27f68c47819e15d09279df9146bccfb1ff56aae.tar.gz crawl-ref-c27f68c47819e15d09279df9146bccfb1ff56aae.zip | |
A few message tweaks for delayed butchering.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5076 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/food.cc')
| -rw-r--r-- | crawl-ref/source/food.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc index 83fb8b507b..4ec471b7a6 100644 --- a/crawl-ref/source/food.cc +++ b/crawl-ref/source/food.cc @@ -460,8 +460,10 @@ bool butchery(int which_corpse) // Shall we butcher this corpse? snprintf(info, INFO_SIZE, "%s %s?", - can_bottle_blood_from_corpse(mitm[o].plus) ? "Bottle" - : "Butcher", + (!can_bottle_blood_from_corpse(mitm[o].plus) + || you.duration[DUR_PRAYER] + && god_likes_butchery(you.religion)) ? "Butcher" + : "Bottle", mitm[o].name(DESC_NOCAP_A).c_str()); const int result = yesnoquit(info, true, 'N', true, false, @@ -489,8 +491,12 @@ bool butchery(int which_corpse) if (result == 2) // (a)ll { - if (can_bottle_blood_from_corpse(mitm[o].plus)) + if (can_bottle_blood_from_corpse(mitm[o].plus) + && (!you.duration[DUR_PRAYER] + || !god_likes_butchery(you.religion))) + { bottle_all = true; + } else butcher_all = true; } |