Portal vault and labyrinth exits will return to the point on the dungeon level where the entrance was.

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

1 files changed, 16 insertions, 2 deletions

diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc
index 6405cf33a3..b5e79d0872 100644
--- a/crawl-ref/source/it_use3.cc
+++ b/crawl-ref/source/it_use3.cc
@@ -364,8 +364,22 @@ static bool evoke_horn_of_geryon()
                     {
                         map_feature_marker *featm =
                             dynamic_cast<map_feature_marker*>(marker);
-                        grd[count_x][count_y] = featm->feat;
-                        env.markers.remove(marker);
+                        // [ds] Ensure we're activating the correct feature
+                        // markers. Feature markers are also used for other
+                        // things, notably to indicate the return point from
+                        // a labyrinth or portal vault.
+                        switch (featm->feat)
+                        {
+                        case DNGN_ENTER_COCYTUS:
+                        case DNGN_ENTER_DIS:
+                        case DNGN_ENTER_GEHENNA:
+                        case DNGN_ENTER_TARTARUS:
+                            grd[count_x][count_y] = featm->feat;
+                            env.markers.remove(marker);
+                            break;
+                        default:
+                            break;
+                        }
                     }
                 }
             }