Fixed bogus Abyss escape messages (milestones).

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1112 c06c8d41-db1a-0410-9941-cceddc491573

3 files changed, 17 insertions, 10 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 6f5d1ddccc..d293ea9066 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -984,14 +984,6 @@ static void go_downstairs()
         return;
     }
 
-#ifdef DGL_MILESTONES
-    // Not entirely accurate - the player could die before reaching the Abyss.
-    if (grd[you.x_pos][you.y_pos] == DNGN_ENTER_ABYSS)
-        mark_milestone("abyss.enter", "entered the Abyss!");
-    else if (grd[you.x_pos][you.y_pos] == DNGN_EXIT_ABYSS)
-        mark_milestone("abyss.exit", "escaped from the Abyss!");
-#endif
-
     tag_followers();  // only those beside us right now can follow
     start_delay( DELAY_DESCENDING_STAIRS,
                  1 + (you.burden_state > BS_UNENCUMBERED),
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index cc31223a32..85f6fec71c 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -138,9 +138,11 @@ void banished(int gate_type, const std::string &who)
 {
 #ifdef DGL_MILESTONES
     if (gate_type == DNGN_ENTER_ABYSS)
-        mark_milestone("abyss.enter", who_banished(who));
+        mark_milestone("abyss.enter",
+                       "is cast into the Abyss!" + who_banished(who));
     else if (gate_type == DNGN_EXIT_ABYSS)
-        mark_milestone("abyss.exit", who_banished(who));
+        mark_milestone("abyss.exit",
+                       "escaped from the Abyss!" + who_banished(who));
 #endif
 
     if (gate_type == DNGN_ENTER_ABYSS)
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 67d20c4a0e..1369f7ed76 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -43,6 +43,7 @@
 #include "fight.h"
 #include "files.h"
 #include "food.h"
+#include "hiscores.h"
 #include "it_use2.h"
 #include "items.h"
 #include "itemname.h"
@@ -783,6 +784,18 @@ void down_stairs( bool remove_stairs, int old_level, int force_stair )
         return;
     }
 
+#ifdef DGL_MILESTONES
+    if (!force_stair)
+    {
+        // Not entirely accurate - the player could die before
+        // reaching the Abyss.
+        if (grd[you.x_pos][you.y_pos] == DNGN_ENTER_ABYSS)
+            mark_milestone("abyss.enter", "entered the Abyss!");
+        else if (grd[you.x_pos][you.y_pos] == DNGN_EXIT_ABYSS)
+            mark_milestone("abyss.exit", "escaped from the Abyss!");
+    }
+#endif
+
     if (stair_find == DNGN_ENTER_ZOT)
     {
         int num_runes = 0;