diff options
| author | reaverb <reaverb.Crawl@gmail.com> | 2014-06-10 13:47:28 -0400 |
|---|---|---|
| committer | reaverb <reaverb.Crawl@gmail.com> | 2014-06-10 13:47:28 -0400 |
| commit | 2cecdf434401f754e5e8ac3cb8a587116bb51302 (patch) | |
| tree | 590132bde39d1ad18b295e80cbf2730fc0e22347 /crawl-ref/source/dgn-layouts.cc | |
| parent | 7e81480cda18144ff185f5248639a072b654deff (diff) | |
| download | crawl-ref-2cecdf434401f754e5e8ac3cb8a587116bb51302.tar.gz crawl-ref-2cecdf434401f754e5e8ac3cb8a587116bb51302.zip | |
Revert "Make random_choose_weighted() end on -1 weight"
This reverts commit 7e81480cda18144ff185f5248639a072b654deff.
Turns out I missed some calls to random_choose_weighted(), this change
might not even be worth doing.
Diffstat (limited to 'crawl-ref/source/dgn-layouts.cc')
| -rw-r--r-- | crawl-ref/source/dgn-layouts.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/dgn-layouts.cc b/crawl-ref/source/dgn-layouts.cc index 9bde1d22cc..f5bfe00924 100644 --- a/crawl-ref/source/dgn-layouts.cc +++ b/crawl-ref/source/dgn-layouts.cc @@ -173,7 +173,7 @@ void dgn_build_chaotic_city_level(dungeon_feature_type force_wall) 24, 3000, 16, 5000, 8, 2000, - 1, 1000, -1); + 1, 1000, 0); if (force_wall != NUM_FEATURES) drawing = force_wall; @@ -181,7 +181,7 @@ void dgn_build_chaotic_city_level(dungeon_feature_type force_wall) { drawing = random_choose_weighted(10, DNGN_ROCK_WALL, 5, DNGN_STONE_WALL, - 3, DNGN_METAL_WALL, -1); + 3, DNGN_METAL_WALL, 0); } dgn_replace_area(10, 10, (GXM - 10), (GYM - 10), DNGN_ROCK_WALL, @@ -210,7 +210,7 @@ void dgn_build_chaotic_city_level(dungeon_feature_type force_wall) { drawing = random_choose_weighted(261, DNGN_ROCK_WALL, 116, DNGN_STONE_WALL, - 40, DNGN_METAL_WALL, -1); + 40, DNGN_METAL_WALL, 0); } if (one_chance_in(3)) @@ -663,7 +663,7 @@ static void _box_room(int bx1, int bx2, int by1, int by2, new_doors = random_choose_weighted(54, 2, 23, 1, - 23, 3, -1); + 23, 3, 0); // Small rooms don't have as many doors. if ((bx2-bx1)*(by2-by1) < 36 && new_doors > 1) |