diff options
| author | Neil Moore <neil@s-z.org> | 2013-11-06 21:24:10 -0500 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2013-11-06 21:38:25 -0500 |
| commit | 259fcac8a0cba227ee4dc49cf5a7d5d2718cdc9c (patch) | |
| tree | a92f4c494ef30fc2cc698df0b26e30d5a8f85955 /crawl-ref/source/branch.cc | |
| parent | 26f33bf2d36d86c138730e65a6f77e502f1c31ae (diff) | |
| download | crawl-ref-259fcac8a0cba227ee4dc49cf5a7d5d2718cdc9c.tar.gz crawl-ref-259fcac8a0cba227ee4dc49cf5a7d5d2718cdc9c.zip | |
Restore "Branch not generated this game" prompt.
We needed to check whether its *default* parent was Lair, not whether
its parent was Lair in this game.
Diffstat (limited to 'crawl-ref/source/branch.cc')
| -rw-r--r-- | crawl-ref/source/branch.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc index 17b179ecfa..1c49ba31d7 100644 --- a/crawl-ref/source/branch.cc +++ b/crawl-ref/source/branch.cc @@ -38,7 +38,7 @@ bool is_hell_subbranch(branch_type branch) bool is_random_subbranch(branch_type branch) { - return (parent_branch(branch) == BRANCH_LAIR + return (branches[branch].parent_branch == BRANCH_LAIR && branch != BRANCH_SLIME) || branch == BRANCH_CRYPT || branch == BRANCH_FOREST; |