Add remove_markers_and_listeners_at to safely remove Lua markers and dungeon listeners from a square.

1 files changed, 21 insertions, 0 deletions

diff --git a/crawl-ref/source/mapmark.cc b/crawl-ref/source/mapmark.cc
index bccec53e69..c1c390394e 100644
--- a/crawl-ref/source/mapmark.cc
+++ b/crawl-ref/source/mapmark.cc
@@ -941,3 +941,24 @@ std::vector<map_marker*> find_markers_by_prop(
     }
     return (markers);
 }
+
+///////////////////////////////////////////////////////////////////
+
+// Safely remove all markers and dungeon listeners at the given square.
+void remove_markers_and_listeners_at(coord_def p)
+{
+    // Look for Lua markers on this square that are listening for
+    // non-positional events, (such as bazaar portals listening for
+    // turncount changes) and detach them manually from the dungeon
+    // event dispatcher.
+    const std::vector<map_marker *> markers = env.markers.get_markers_at(p);
+    for (int i = 0, size = markers.size(); i < size; ++i)
+    {
+        if (markers[i]->get_type() == MAT_LUA_MARKER)
+            dungeon_events.remove_listener(
+                dynamic_cast<map_lua_marker*>(markers[i]));
+    }
+
+    env.markers.remove_markers_at(p);
+    dungeon_events.clear_listeners_at(p);
+}