diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-02-24 05:34:35 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-02-24 05:34:35 +0100 |
| commit | 65306b0f297ae9ce4a5b2a52f055a2f2482dbad2 (patch) | |
| tree | 376bb1bec86026fdc5317a0299ade45d788f8ef7 /crawl-ref/source/branch.cc | |
| parent | b957c737d34260acddc671a3c7bbe9cb810665c0 (diff) | |
| parent | e8f008ab92473c7cc7a26b7a8504733b7c80a407 (diff) | |
| download | crawl-ref-65306b0f297ae9ce4a5b2a52f055a2f2482dbad2.tar.gz crawl-ref-65306b0f297ae9ce4a5b2a52f055a2f2482dbad2.zip | |
Merge branch 'master' into mon-pick
Sorry for merge commits, but rerere is pretty limited.
Diffstat (limited to 'crawl-ref/source/branch.cc')
| -rw-r--r-- | crawl-ref/source/branch.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc index 575e060356..bf0ee8471a 100644 --- a/crawl-ref/source/branch.cc +++ b/crawl-ref/source/branch.cc @@ -75,5 +75,9 @@ branch_type get_branch_at(const coord_def& pos) bool branch_is_unfinished(branch_type branch) { +#if TAG_MAJOR_VERSION == 34 + if (branch == BRANCH_UNUSED) + return true; +#endif return branch == BRANCH_FOREST || branch == BRANCH_DWARVEN_HALL; } |