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, 4 insertions, 4 deletions

diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h
index 830abc75e4..ccf8d5c8bb 100644
--- a/crawl-ref/source/externs.h
+++ b/crawl-ref/source/externs.h
@@ -489,10 +489,6 @@ public:
     // Returns true if you were running and are now no longer running.
     bool check_stop_running();
 
-    // Check if we've reached the HP/MP stop-rest condition
-    void check_hp();
-    void check_mp();
-
 private:
     void set_run_check(int index, int compass_dir);
     bool run_grids_changed() const;
@@ -1640,6 +1636,7 @@ public:
     bool        easy_unequip;    // allow auto-removing of armour / jewellery
     bool        easy_butcher;    // autoswap to butchering tool
     bool        always_confirm_butcher; // even if only one corpse
+    bool        chunks_autopickup; // Autopickup chunks after butchering
     bool        list_rotten;     // list slots for rotting corpses/chunks
     bool        default_target;  // start targeting on a real target
     bool        autopickup_no_burden;   // don't autopickup if it changes burden
@@ -1815,6 +1812,9 @@ public:
     // If the player prefers to merge kill records, this option can do that.
     int         kill_map[KC_NCATEGORIES];
 
+    bool        rest_wait_both; // Stop resting only when both HP and MP are
+                                // fully restored.
+
 #ifdef WIZARD
     // Parameters for fight simulations.
     long        fsim_rounds;