Merge banishment delay fix (r2778) from trunk.

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

2 files changed, 2 insertions, 26 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 18eeb1a398..9829e8cc47 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1003,8 +1003,7 @@ static void input()
 
     fire_monster_alerts();
 
-    if (Options.tut_just_triggered)
-        Options.tut_just_triggered = false;
+    Options.tut_just_triggered = false;
 
     if ( i_feel_safe() )
     {
@@ -2429,6 +2428,7 @@ static void world_reacts()
     {
         handle_time(200 + (you.time_taken - you.synch_time));
         you.synch_time = 200;
+        check_banished();
     }
     else
     {
@@ -2459,29 +2459,6 @@ static void world_reacts()
         }
     }
 
-    //jmf: added silence messages
-    // [jpeg] Commenting out until we add other sources of Silence
-    // than the player casting the spell (messages handled elsewhere)
-/*
-    bool its_quiet = silenced(you.x_pos, you.y_pos);
-
-    if (you.attribute[ATTR_WAS_SILENCED] != its_quiet)
-    {
-        if (its_quiet)
-        {
-            if (!one_chance_in(30))
-                mpr("You are enveloped in profound silence.", MSGCH_WARN);
-            else
-                mpr("The dungeon seems quiet ... too quiet!", MSGCH_WARN);
-        }
-        else
-        {
-            mpr("Your hearing returns.", MSGCH_RECOVERY);
-        }
-
-        you.attribute[ATTR_WAS_SILENCED] = its_quiet;
-    }
-*/
     viewwindow(true, false);
 
     if (you.duration[DUR_PARALYSIS] > 0 && any_messages())
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index ffe9a1883a..cf7a338448 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -1945,7 +1945,6 @@ static bool send_abyss(const char *cause)
 {
     if (you.level_type != LEVEL_ABYSS)
     {
-        mpr("You are cast into the Abyss!");
         you.banish(cause? cause : "");
         return (true);
     }