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

1 files changed, 0 insertions, 19 deletions

diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index 3b5a0f36ba..8eb88c5bff 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -3831,25 +3831,6 @@ void runrest::clear()
     _reset_zigzag_info();
 }
 
-void runrest::check_hp()
-{
-    if (is_rest() && you.hp == you.hp_max && you.hp > hp)
-    {
-        mpr("HP restored.");
-        stop();
-    }
-}
-
-void runrest::check_mp()
-{
-    if (is_rest() && you.magic_points == you.max_magic_points
-        && you.magic_points > mp)
-    {
-        mpr("Magic restored.");
-        stop();
-    }
-}
-
 /////////////////////////////////////////////////////////////////////////////
 // explore_discoveries