First merge of Crawl 4.1.2 features into Stone Soup:

* Enhancer staves boost spell power only, not success rates
* Chain lightning is in at level 8, replaces orb of electrocution in
Annihilations.
* Spell levels changed: borgnor's (5), shadow creatures (6), silence
(5), simulacrum (6), Controlled Blink (8). I haven't rearranged
spellbooks in spell level order yet.
* Sif Muna appreciates spell skill training, not mere spellcasting (untested)
* Detect creatures is inaccurate, map is cleared before DC acts.
* The Shining One no longer cuts up rough about his Daevas dying.
* Rods are weaker. More on this below.
* Shields are mildly better in combat and ranged-attack-blocking, and
get a fuller range of brands. Needs more work.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@16 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 7 insertions, 2 deletions

diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index f9c3d2d3d7..6d8347f8dc 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -400,7 +400,7 @@ static bool is_travel_ok(int x, int y, bool ignore_hostile)
         //                 the information we're giving the player for free.
         // Navigate around plants and fungi. Yet another tasty hack.
         if (player_monster_visible(&menv[mon]) && 
-                mons_flag( menv[mon].type, M_NO_EXP_GAIN ))
+                mons_class_flag( menv[mon].type, M_NO_EXP_GAIN ))
         {
             extern short point_distance[GXM][GYM];
 
@@ -447,7 +447,7 @@ static bool is_safe(int x, int y)
         }
 
         // Stop before wasting energy on plants and fungi.
-        if (mons_flag( menv[mon].type, M_NO_EXP_GAIN ))
+        if (mons_class_flag( menv[mon].type, M_NO_EXP_GAIN ))
             return false;
 
         // If this is any *other* monster, it'll be visible and
@@ -736,6 +736,11 @@ void stop_running(void)
     you.running = 0;
 }
 
+bool is_resting( void )
+{
+    return (you.running > 0 && !you.run_x && !you.run_y);
+}
+
 void start_running(void)
 {
     userdef_run_startrunning_hook();