Updated level-design.txt.

Moved map markers to mapmark.cc.

Added support for timer markers that remove a feature after a certain timeout.
Need to hook up messaging to Lua.

Added bazaars (need more bazaar layouts).

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

1 files changed, 2 insertions, 45 deletions

diff --git a/crawl-ref/source/dungeon.h b/crawl-ref/source/dungeon.h
index 457705e4b3..cd637213f2 100644
--- a/crawl-ref/source/dungeon.h
+++ b/crawl-ref/source/dungeon.h
@@ -43,7 +43,8 @@ enum map_mask_type
     MMT_NO_ITEM    = 0x02,    // Random items should not be placed here.
     MMT_NO_MONS    = 0x04,    // Random monsters should not be placed here.
     MMT_NO_POOL    = 0x08,    // Pool fixup should not be applied here.
-    MMT_NO_DOOR    = 0x10     // No secret-doorisation.
+    MMT_NO_DOOR    = 0x10,    // No secret-doorisation.
+    MMT_OPAQUE     = 0x20     // Vault may impede connectivity.
 };
 
 class dgn_region;
@@ -120,50 +121,6 @@ bool unforbidden(const coord_def &c, unsigned mask);
 coord_def dgn_find_nearby_stair(int stair_to_find, bool find_closest);
 
 //////////////////////////////////////////////////////////////////////////
-// Map markers
-
-class map_marker
-{
-public:
-    map_marker(map_marker_type type, const coord_def &pos);
-    virtual ~map_marker();
-
-    map_marker_type get_type() const { return type; }
-
-    virtual void write(tagHeader &) const;
-    virtual void read(tagHeader &);
-    virtual map_marker *clone() const = 0;
-    virtual std::string describe() const = 0;
-    
-    static map_marker *read_marker(tagHeader&);
-
-public:
-    coord_def pos;
-
-protected:
-    map_marker_type type;
-
-    typedef map_marker *(*marker_reader)(tagHeader &, map_marker_type);
-    static marker_reader readers[NUM_MAP_MARKER_TYPES];
-};
-
-class map_feature_marker : public map_marker
-{
-public:
-    map_feature_marker(const coord_def &pos = coord_def(0, 0),
-                       dungeon_feature_type feat = DNGN_UNSEEN);
-    map_feature_marker(const map_feature_marker &other);
-    void write(tagHeader &) const;
-    void read(tagHeader &);
-    map_marker *clone() const;
-    std::string describe() const;
-    static map_marker *read(tagHeader &, map_marker_type);
-    
-public:
-    dungeon_feature_type feat;
-};
-
-//////////////////////////////////////////////////////////////////////////
 template <typename fgrd, typename bound_check>
 class flood_find : public travel_pathfind
 {