Bazaar updates (David).

Mark bazaar entry points using feature markers so the player enters at the
right place even if the bazaar uses stone arches as decorative elements.

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

1 files changed, 13 insertions, 0 deletions

diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 471d802e6e..d40049a76c 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -1422,7 +1422,13 @@ static void fixup_bazaar_stairs()
                 if (grid_stair_direction(feat) == CMD_GO_DOWNSTAIRS)
                     grd[x][y] = DNGN_EXIT_PORTAL_VAULT;
                 else
+                {
                     grd[x][y] = DNGN_STONE_ARCH;
+                    env_add_marker(
+                        new map_feature_marker(
+                            coord_def(x, y),
+                            DNGN_STONE_ARCH));
+                }
             }
         }
     }
@@ -6914,6 +6920,13 @@ coord_def dgn_find_nearby_stair(dungeon_feature_type stair_to_find,
             return (pos);
     }
 
+    if (stair_to_find == DNGN_STONE_ARCH)
+    {
+        const coord_def pos(dgn_find_feature_marker(stair_to_find));
+        if (in_bounds(pos) && grd(pos) == stair_to_find)
+            return (pos);
+    }
+
     if (stair_to_find == DNGN_ENTER_LABYRINTH)
     {
         const coord_def pos(dgn_find_labyrinth_entry_point());