diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-30 04:52:33 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-30 04:52:33 +0000 |
| commit | 38ebcee4627305ea124f2802fc9498e1acb97764 (patch) | |
| tree | 160c889b466700e411b10c0d152984b1bb7706d2 /crawl-ref/source/food.cc | |
| parent | 96a64a6214f7c68b0aa6b94836e77cdf6984d728 (diff) | |
| download | crawl-ref-38ebcee4627305ea124f2802fc9498e1acb97764.tar.gz crawl-ref-38ebcee4627305ea124f2802fc9498e1acb97764.zip | |
Added two new options, rest_wait_both and chunks_autopickup, both defaulting
to false. If rest_wait_both is true then resting will only stop when both
HP and MP are both fully restored, not when only one or the other is restored.
If chunks_autopickup is true then flesh chunks generated from butchering
will automatically be picked up (respecting the other autopickup settings).
My implementation of rest_wait_both has a few side effects. I got rid
of check_hp() and check_mp() from the runrest class, since player AI
interruption code seems to be able to take care of that. I also added
a rather kuldgey block_interruptions() so that the activity interrupts
code could use mpr() without going into infinite recursion because of
AI_MESSAGE interrutps.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5337 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/food.cc')
| -rw-r--r-- | crawl-ref/source/food.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc index ab16de1dc8..00cbf52926 100644 --- a/crawl-ref/source/food.cc +++ b/crawl-ref/source/food.cc @@ -160,6 +160,9 @@ void weapon_switch( int targ ) // special checks: staves of power, etc if (targ != -1) wield_effects( targ, false ); + + if (Options.chunks_autopickup) + autopickup(); } // look for a butchering implement. If fallback is true, |