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/ng-init.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/ng-init.cc')
| -rw-r--r-- | crawl-ref/source/ng-init.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/ng-init.cc b/crawl-ref/source/ng-init.cc index 6660769a44..3adc7f6a69 100644 --- a/crawl-ref/source/ng-init.cc +++ b/crawl-ref/source/ng-init.cc @@ -53,7 +53,7 @@ static uint8_t _random_potion_description() // Determine starting depths of branches. void initialise_branch_depths() { - root_branch = BRANCH_MAIN_DUNGEON; + root_branch = BRANCH_DUNGEON; for (int br = 0; br < NUM_BRANCHES; ++br) brentry[br].clear(); @@ -61,15 +61,15 @@ void initialise_branch_depths() if (crawl_state.game_is_sprint()) { brdepth.init(-1); - brdepth[BRANCH_MAIN_DUNGEON] = 1; + brdepth[BRANCH_DUNGEON] = 1; return; } if (crawl_state.game_is_zotdef()) { - root_branch = BRANCH_HALL_OF_ZOT; + root_branch = BRANCH_ZOT; brdepth.init(-1); - brdepth[BRANCH_HALL_OF_ZOT] = 1; + brdepth[BRANCH_ZOT] = 1; brdepth[BRANCH_BAZAAR] = 1; return; } @@ -90,7 +90,7 @@ void initialise_branch_depths() branch_type disabled_branch[] = { random_choose(BRANCH_SWAMP, BRANCH_SHOALS, -1), - random_choose(BRANCH_SNAKE_PIT, BRANCH_SPIDER_NEST, -1), + random_choose(BRANCH_SNAKE, BRANCH_SPIDER, -1), random_choose(BRANCH_CRYPT, BRANCH_FOREST, -1), }; if (Version::ReleaseType != VER_ALPHA) @@ -136,7 +136,7 @@ void initialise_temples() { ////////////////////////////////////////// // First determine main temple map to use. - level_id ecumenical(BRANCH_ECUMENICAL_TEMPLE, 1); + level_id ecumenical(BRANCH_TEMPLE, 1); map_def *main_temple = NULL; for (int i = 0; i < 10; i++) @@ -237,7 +237,7 @@ void initialise_temples() map != maps.end(); map++) { // XXX: this should handle level depth better - chance += (*map)->weight(level_id(BRANCH_MAIN_DUNGEON, + chance += (*map)->weight(level_id(BRANCH_DUNGEON, MAX_OVERFLOW_LEVEL)); } overflow_weights[i] = chance; @@ -287,7 +287,7 @@ multi_overflow: for (mapref_vector::iterator map = maps.begin(); map != maps.end(); map++) { - chance += (*map)->weight(level_id(BRANCH_MAIN_DUNGEON, + chance += (*map)->weight(level_id(BRANCH_DUNGEON, MAX_OVERFLOW_LEVEL)); } if (!x_chance_in_y(chance, overflow_weights[num] + chance)) |