diff options
author | Adam Borowski <kilobyte@angband.pl> | 2013-01-31 01:21:00 +0100 |
---|---|---|
committer | Adam Borowski <kilobyte@angband.pl> | 2013-01-31 01:21:00 +0100 |
commit | a2b2d32b14579315ebeeef49ceb0e048300e1600 (patch) | |
tree | 622fc90075deca7dde8e11c56299e544c08dfec0 /crawl-ref/source/dgn-proclayouts.cc | |
parent | c6316cfe6df7584556a39b05e300271fded3e30a (diff) | |
download | crawl-ref-a2b2d32b14579315ebeeef49ceb0e048300e1600.tar.gz crawl-ref-a2b2d32b14579315ebeeef49ceb0e048300e1600.zip |
Mark functions prefixes with _ as actually static.
... which reveals that some are unused.
Diffstat (limited to 'crawl-ref/source/dgn-proclayouts.cc')
-rw-r--r-- | crawl-ref/source/dgn-proclayouts.cc | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/crawl-ref/source/dgn-proclayouts.cc b/crawl-ref/source/dgn-proclayouts.cc index 893a3b21eb..99758965f4 100644 --- a/crawl-ref/source/dgn-proclayouts.cc +++ b/crawl-ref/source/dgn-proclayouts.cc @@ -13,7 +13,7 @@ #include "mpr.h" -dungeon_feature_type _pick_pseudorandom_wall(uint64_t val) +static dungeon_feature_type _pick_pseudorandom_wall(uint64_t val) { static dungeon_feature_type features[] = { DNGN_STONE_WALL, @@ -29,23 +29,6 @@ dungeon_feature_type _pick_pseudorandom_wall(uint64_t val) return features[val%9]; } -dungeon_feature_type _pick_pseudorandom_feature(uint64_t val) -{ - if (!(val%5)) - return _pick_pseudorandom_wall(val/5); - dungeon_feature_type features[] = { - DNGN_STONE_WALL, - DNGN_STONE_WALL, - DNGN_ROCK_WALL, - DNGN_GREEN_CRYSTAL_WALL, - DNGN_METAL_WALL, - DNGN_SHALLOW_WATER, - DNGN_SHALLOW_WATER, - DNGN_DEEP_WATER, - }; - return features[(val/5)%9]; -} - ProceduralSample ColumnLayout::operator()(const coord_def &p, const uint32_t offset) const { @@ -77,17 +60,11 @@ DiamondLayout::operator()(const coord_def &p, const uint32_t offset) const } -uint32_t _get_changepoint(const worley::noise_datum &n, const double scale) +static uint32_t _get_changepoint(const worley::noise_datum &n, const double scale) { return max(1, (int) floor((n.distance[1] - n.distance[0]) * scale) - 5); } -ProceduralSample _maybe_set_changepoint(const ProceduralSample &s, - const uint32_t cp) -{ - return ProceduralSample(s.coord(), s.feat(), min(s.changepoint(), cp)); -} - ProceduralSample WorleyLayout::operator()(const coord_def &p, const uint32_t offset) const { |