diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-02-19 18:54:42 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-02-19 18:54:42 +0000 |
commit | a191a19ff4afeae3cbc76f120463152c5ebfc2ea (patch) | |
tree | b6cb038b12e26ba5b1b3f69867ef1701ae60d533 /crawl-ref/source/mapdef.h | |
parent | e9b1a504be1d94eab7a724ba5935aaf48fe9e4cb (diff) | |
download | crawl-ref-a191a19ff4afeae3cbc76f120463152c5ebfc2ea.tar.gz crawl-ref-a191a19ff4afeae3cbc76f120463152c5ebfc2ea.zip |
Updated entry vaults (David).
Level compiler is stricter with MAP sections.
Block SHUFFLE: now uses / as a separator to avoid confusion.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@955 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mapdef.h')
-rw-r--r-- | crawl-ref/source/mapdef.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/crawl-ref/source/mapdef.h b/crawl-ref/source/mapdef.h index 184bac4938..b02c08a86a 100644 --- a/crawl-ref/source/mapdef.h +++ b/crawl-ref/source/mapdef.h @@ -75,7 +75,6 @@ private: void resolve_shuffle(const std::string &shuffle); void resolve(std::string &s, const std::string &fill); void check_borders(); - std::string clean(std::string s); std::string shuffle(std::string s); std::string block_shuffle(const std::string &s); @@ -224,7 +223,7 @@ public: void resolve(); void fixup(); - void add_shuffle(const std::string &s); + std::string add_shuffle(const std::string &s); bool can_dock(map_section_type) const; coord_def dock_pos(map_section_type) const; @@ -234,6 +233,11 @@ public: bool is_minivault() const; bool has_tag(const std::string &tag) const; + +private: + std::string check_shuffle(std::string &s); + std::string check_block_shuffle(const std::string &s); + std::string clean_shuffle(std::string s); }; class monster_chance |