summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/branch.h
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2011-10-15 13:52:24 +0200
committerAdam Borowski <kilobyte@angband.pl>2011-11-04 18:49:49 +0100
commitc346361417241d0e4d7531ed65a1ca5b4f497139 (patch)
tree8c76c3b32dac858b2a36df7d032ff50e49545384 /crawl-ref/source/branch.h
parentf4a9aed257bbdd264fb1ef43e7b29b3cc599cd65 (diff)
downloadcrawl-ref-c346361417241d0e4d7531ed65a1ca5b4f497139.tar.gz
crawl-ref-c346361417241d0e4d7531ed65a1ca5b4f497139.zip
Get rid of level_type, unify BRANCH_*, LEVEL_* and portal vaults.
Diffstat (limited to 'crawl-ref/source/branch.h')
-rw-r--r--crawl-ref/source/branch.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/branch.h b/crawl-ref/source/branch.h
index 71086739ad..204d8d4982 100644
--- a/crawl-ref/source/branch.h
+++ b/crawl-ref/source/branch.h
@@ -56,6 +56,8 @@ Branch& your_branch();
bool at_branch_bottom();
bool is_hell_subbranch(branch_type branch);
bool is_random_lair_subbranch(branch_type branch);
+bool is_connected_branch(branch_type branch);
+bool is_connected_branch(level_id place);
level_id branch_entry_level(branch_type branch);
level_id current_level_parent();
@@ -63,9 +65,7 @@ branch_type str_to_branch(const std::string &branch,
branch_type err = NUM_BRANCHES);
int current_level_ambient_noise();
-
-const char *level_area_type_name(int level_type);
-level_area_type str_to_level_area_type(const std::string &s);
+bool branch_has_monsters(branch_type branch);
bool set_branch_flags(uint32_t flags, bool silent = false,
branch_type branch = NUM_BRANCHES);
@@ -75,4 +75,5 @@ uint32_t get_branch_flags(branch_type branch = NUM_BRANCHES);
branch_type get_branch_at(const coord_def& pos);
bool branch_is_unfinished(branch_type branch);
+bool is_portal_vault(branch_type branch); // AXE ME!
#endif