summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/l_dgnlvl.cc
diff options
context:
space:
mode:
authorSteve Melenchuk <smelenchuk@gmail.com>2013-05-25 19:17:43 -0600
committerSteve Melenchuk <smelenchuk@gmail.com>2013-05-26 20:56:16 -0600
commit65f519f29f21b78d568cbf1bfbd574a461031efb (patch)
treea8be07c0e4ca0989b575a148cf175f9ebd277e7c /crawl-ref/source/l_dgnlvl.cc
parent2e5ab92c51b25f0536971a6c7c6f9ffbe784adee (diff)
downloadcrawl-ref-65f519f29f21b78d568cbf1bfbd574a461031efb.tar.gz
crawl-ref-65f519f29f21b78d568cbf1bfbd574a461031efb.zip
Alternate Forest with Crypt.
Forest's entrance depth and absolute depth are now the same as Crypt's. This also adds functionality to move Tomb's entrance to Forest if Crypt isn't placed in the game, so Tomb always exists (at present).
Diffstat (limited to 'crawl-ref/source/l_dgnlvl.cc')
-rw-r--r--crawl-ref/source/l_dgnlvl.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/l_dgnlvl.cc b/crawl-ref/source/l_dgnlvl.cc
index f403db1f87..841acb1906 100644
--- a/crawl-ref/source/l_dgnlvl.cc
+++ b/crawl-ref/source/l_dgnlvl.cc
@@ -30,7 +30,7 @@ BRANCHFN(has_uniques, boolean, br.has_uniques)
BRANCHFN(parent_branch, string,
br.parent_branch == NUM_BRANCHES
? ""
- : branches[br.parent_branch].abbrevname)
+ : branches[parent_branch(br.id)].abbrevname)
LUAFN(dgn_br_depth)
{
@@ -57,7 +57,7 @@ LUAFN(dgn_br_exists)
luaL_argerror(ls, 1, "No such branch");
}
- if (branches[brn].parent_branch == NUM_BRANCHES || startdepth[brn] != -1)
+ if (parent_branch(brn) == NUM_BRANCHES || startdepth[brn] != -1)
exists = true;
PLUARET(boolean, exists);
@@ -83,7 +83,7 @@ LUAFN(dgn_br_entrance)
luaL_argerror(ls, 1, "No such branch");
}
- _push_level_id(ls, level_id(branches[brn].parent_branch,
+ _push_level_id(ls, level_id(parent_branch(brn),
startdepth[brn]));
return 1;
}