summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/branch.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2011-10-26 15:38:12 +0200
committerAdam Borowski <kilobyte@angband.pl>2011-11-04 18:49:50 +0100
commitc53ce012953407a81fb0701d83c62303b76028cd (patch)
tree503f253f4874149efce41f5d83c363d9301e06b4 /crawl-ref/source/branch.cc
parent2cd481306a71b61f815186642d2afb80c1d4114a (diff)
downloadcrawl-ref-c53ce012953407a81fb0701d83c62303b76028cd.tar.gz
crawl-ref-c53ce012953407a81fb0701d83c62303b76028cd.zip
Remove the ability to dynamically set branch flags.
The tutorial uses it, but for encompass vaults that's not needed.
Diffstat (limited to 'crawl-ref/source/branch.cc')
-rw-r--r--crawl-ref/source/branch.cc53
1 files changed, 0 insertions, 53 deletions
diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc
index ed2add82eb..3ef88405bf 100644
--- a/crawl-ref/source/branch.cc
+++ b/crawl-ref/source/branch.cc
@@ -113,59 +113,6 @@ old_level_area_type str_to_old_level_area_type(const std::string &s)
}
#endif
-bool set_branch_flags(uint32_t flags, bool silent, branch_type branch)
-{
- if (branch == NUM_BRANCHES)
- branch = you.where_are_you;
-
- bool could_control = allow_control_teleport(true);
-
- uint32_t old_flags = branches[branch].branch_flags;
- branches[branch].branch_flags |= flags;
-
- bool can_control = allow_control_teleport(true);
-
- if (branch == you.where_are_you
- && could_control && !can_control && !silent)
- {
- mpr("You sense the appearance of a powerful magical force "
- "which warps space.", MSGCH_WARN);
- }
-
- return (old_flags != branches[branch].branch_flags);
-}
-
-bool unset_branch_flags(uint32_t flags, bool silent, branch_type branch)
-{
- if (branch == NUM_BRANCHES)
- branch = you.where_are_you;
-
- const bool could_control = allow_control_teleport(true);
-
- uint32_t old_flags = branches[branch].branch_flags;
- branches[branch].branch_flags &= ~flags;
-
- const bool can_control = allow_control_teleport(true);
-
- if (branch == you.where_are_you
- && !could_control && can_control && !silent)
- {
- // Isn't really a "recovery", but I couldn't think of where
- // else to send it.
- mpr("Space seems to straighten in your vicinity.", MSGCH_RECOVERY);
- }
-
- return (old_flags != branches[branch].branch_flags);
-}
-
-uint32_t get_branch_flags(branch_type branch)
-{
- if (branch == NUM_BRANCHES)
- branch = you.where_are_you;
-
- return branches[branch].branch_flags;
-}
-
branch_type get_branch_at(const coord_def& pos)
{
return level_id::current().get_next_level_id(pos).branch;