diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2012-03-26 23:51:31 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2012-03-26 23:56:36 +0200 |
| commit | 2c8c99fec4aab48970d75030ece87dda40260e78 (patch) | |
| tree | ed687319685e936cb25b8fa046c01209c36c7525 /crawl-ref/source/branch.cc | |
| parent | 01c2aa8463804cdd4ff8818b78c1deb890a78efb (diff) | |
| parent | 537a8dfbb6582c8269e3239b63a5d2ea03eb77a3 (diff) | |
| download | crawl-ref-2c8c99fec4aab48970d75030ece87dda40260e78.tar.gz crawl-ref-2c8c99fec4aab48970d75030ece87dda40260e78.zip | |
Merge branch 'master' into portal_branches
This includes fixes for 64834896234968 places in master that add new uses of
LEVEL_FOO and so on.
Diffstat (limited to 'crawl-ref/source/branch.cc')
| -rw-r--r-- | crawl-ref/source/branch.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc index 7cac78d88b..fb63aa8fd7 100644 --- a/crawl-ref/source/branch.cc +++ b/crawl-ref/source/branch.cc @@ -94,8 +94,8 @@ branch_type get_branch_at(const coord_def& pos) bool branch_is_unfinished(branch_type branch) { - return branch == BRANCH_SPIDER_NEST || branch == BRANCH_FOREST - || branch == BRANCH_DWARVEN_HALL || branch == BRANCH_HIVE; + return branch == BRANCH_FOREST || branch == BRANCH_DWARVEN_HALL + || branch == BRANCH_HIVE; } bool is_portal_vault(branch_type branch) |