Merged trunk (1453:1457] to 0.2 branch (animate dead, corpse rot fixes, message

suppression init.txt examples).

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

3 files changed, 10 insertions, 21 deletions

diff --git a/crawl-ref/init.txt b/crawl-ref/init.txt
index ab0e8842ec..57ea5ef27d 100644
--- a/crawl-ref/init.txt
+++ b/crawl-ref/init.txt
@@ -177,6 +177,14 @@ menu_colour = white:Reached XP level
 # Message colours
 message_colour = lightcyan:LOW MAGIC WARNING
 
+# These lines will suppress extra feedback messages from travel/shift-running.
+
+# message_colour = mute:warning:comes into view
+# message_colour = mute:You start (searching|resting)
+# message_colour = mute:Done searching
+# message_colour = mute:(HP|Magic) restored
+# message_colour = mute:warning:Not with.*(in view|monsters around)
+
 ##### 4-j	Firing Commands #######################
 #
 # fire_items_start = a
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index a8a070ee2a..2b67321f17 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -1905,21 +1905,8 @@ bool i_feel_safe(bool announce)
         if (mons.size() == 1)
         {
             const monsters *m = mons[0];
-            switch (random2(3))
-            {
-            case 0:
-                mprf(MSGCH_WARN, "Not with %s in view!",
-                     ptr_monam(m, DESC_NOCAP_A));
-                break;
-            case 1:
-                mprf(MSGCH_WARN, "There's %s right there!",
-                     ptr_monam(m, DESC_NOCAP_A));
-                break;
-            case 2:
-                mprf(MSGCH_WARN, "Wait, there's %s in sight!",
-                     ptr_monam(m, DESC_NOCAP_A));
-                break;
-            }
+            mprf(MSGCH_WARN, "Not with %s in view!",
+                 ptr_monam(m, DESC_NOCAP_A));
         }
         else if (mons.size() > 1)
         {
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index 6e38997f69..addc7d28f6 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -237,9 +237,6 @@ int corpse_rot(int power)
 
     for (adx = minx; adx != maxx; adx += xinc)
     {
-        if (adx == 7 || adx == -7)
-            return 0;
-
         for (ady = miny; ady != maxy; ady += yinc)
         {
             if (see_grid(adx, ady))
@@ -322,9 +319,6 @@ int animate_dead( int power, int corps_beh, int corps_hit, int actual )
 
     for (adx = minx; adx != maxx; adx += xinc)
     {
-        if ((adx == 7) || (adx == -7))
-            return 0;
-
         for (ady = miny; ady != maxy; ady += yinc)
         {
             if (see_grid(adx, ady))