diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-11-03 13:01:25 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-11-03 13:01:25 +0100 |
| commit | 7047b33b2768a838b2cea28f8738936c08f1d406 (patch) | |
| tree | 27a0d4712509390031464a0d05d8eacdd53d2096 /crawl-ref/source/branch.cc | |
| parent | e06bfaaf8641758a91ec5978d28a55b4697be788 (diff) | |
| download | crawl-ref-7047b33b2768a838b2cea28f8738936c08f1d406.tar.gz crawl-ref-7047b33b2768a838b2cea28f8738936c08f1d406.zip | |
Shorten branch enums.
Seriously, even preparing this commit gave me a pain in the triangle between
the thumb and index finger's bases and the wrist.
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 cd553120e0..b34b753051 100644 --- a/crawl-ref/source/branch.cc +++ b/crawl-ref/source/branch.cc @@ -35,13 +35,13 @@ bool is_hell_subbranch(branch_type branch) { return (branch >= BRANCH_FIRST_HELL && branch <= BRANCH_LAST_HELL - && branch != BRANCH_VESTIBULE_OF_HELL); + && branch != BRANCH_VESTIBULE); } bool is_random_subbranch(branch_type branch) { return (parent_branch(branch) == BRANCH_LAIR - && branch != BRANCH_SLIME_PITS) + && branch != BRANCH_SLIME) || branch == BRANCH_CRYPT || branch == BRANCH_FOREST; } @@ -79,7 +79,7 @@ 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 || branch == BRANCH_DWARVEN_HALL) + if (branch == BRANCH_UNUSED || branch == BRANCH_DWARF) return true; #endif return false; |