diff options
| author | Shmuale Mark <shm.mark@gmail.com> | 2014-08-03 11:58:23 -0400 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-08-03 14:16:52 -0400 |
| commit | 7f77ec55743fce0d895242aab00b26976c8e9d3c (patch) | |
| tree | 2e4fa068a11847bf54adeefffc1f32bc52d41d31 /crawl-ref/source/branch.cc | |
| parent | d1e2701b5e277586b071030a45d86318c23e590d (diff) | |
| download | crawl-ref-7f77ec55743fce0d895242aab00b26976c8e9d3c.tar.gz crawl-ref-7f77ec55743fce0d895242aab00b26976c8e9d3c.zip | |
Properly hide conflicting branches on ctrl-O.
Also cleans up some old Forest code, which might make ^O look a bit
weird on imported saves; probably not a big problem.
Diffstat (limited to 'crawl-ref/source/branch.cc')
| -rw-r--r-- | crawl-ref/source/branch.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc index 61bde7c82f..39cd628f6a 100644 --- a/crawl-ref/source/branch.cc +++ b/crawl-ref/source/branch.cc @@ -120,9 +120,8 @@ bool is_hell_subbranch(branch_type branch) bool is_random_subbranch(branch_type branch) { - return (parent_branch(branch) == BRANCH_LAIR - && branch != BRANCH_SLIME) - || branch == BRANCH_CRYPT; + return parent_branch(branch) == BRANCH_LAIR + && branch != BRANCH_SLIME; } bool is_connected_branch(const Branch *branch) |