diff options
| author | Shmuale Mark <shm.mark@gmail.com> | 2014-03-02 00:17:07 -0500 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-03-03 16:31:09 -0500 |
| commit | be29d668379c021951a873db687e5881d4bde602 (patch) | |
| tree | c614e8a1f39622ca0c6760bf34cb3c26fabd7637 /crawl-ref/source/branch.cc | |
| parent | 1a3bbcab46e501c0aca98b69347b8dab13da39da (diff) | |
| download | crawl-ref-be29d668379c021951a873db687e5881d4bde602.tar.gz crawl-ref-be29d668379c021951a873db687e5881d4bde602.zip | |
Purge some references to Forest.
In particular, ctrl-O should no longer mention the branch.
Diffstat (limited to 'crawl-ref/source/branch.cc')
| -rw-r--r-- | crawl-ref/source/branch.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc index 86866fc815..ff9b56658d 100644 --- a/crawl-ref/source/branch.cc +++ b/crawl-ref/source/branch.cc @@ -40,8 +40,7 @@ bool is_random_subbranch(branch_type branch) { return (parent_branch(branch) == BRANCH_LAIR && branch != BRANCH_SLIME) - || branch == BRANCH_CRYPT - || branch == BRANCH_FOREST; + || branch == BRANCH_CRYPT; } bool is_connected_branch(branch_type branch) @@ -77,7 +76,8 @@ branch_type get_branch_at(const coord_def& pos) bool branch_is_unfinished(branch_type branch) { #if TAG_MAJOR_VERSION == 34 - if (branch == BRANCH_DWARF) + if (branch == BRANCH_DWARF + || branch == BRANCH_FOREST) return true; #endif return false; |