From 5062b99cb0d252d9e377ff4560f7ecc9e66fd558 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sat, 6 Dec 2014 04:18:04 -0500 Subject: Rewrite generate notification mechanism Add support for notify-on-decoration Clean up mapgen constructors Clean up mapgen.cpp code style somewhat Remove trailing whitespace from some files --- src/mapgen_v6.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/mapgen_v6.h') diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h index eecfb1fe6..e6d2cdc54 100644 --- a/src/mapgen_v6.h +++ b/src/mapgen_v6.h @@ -55,10 +55,10 @@ struct MapgenV6Params : public MapgenSpecificParams { NoiseParams np_humidity; NoiseParams np_trees; NoiseParams np_apple_trees; - + MapgenV6Params(); ~MapgenV6Params() {} - + void readParams(Settings *settings); void writeParams(Settings *settings); }; @@ -68,7 +68,6 @@ public: EmergeManager *emerge; int ystride; - u32 flags; u32 spflags; u32 blockseed; @@ -111,7 +110,7 @@ public: MapgenV6(int mapgenid, MapgenParams *params, EmergeManager *emerge); ~MapgenV6(); - + void makeChunk(BlockMakeData *data); int getGroundLevelAtPoint(v2s16 p); @@ -124,7 +123,7 @@ public: s16 find_stone_level(v2s16 p2d); bool block_is_underground(u64 seed, v3s16 blockpos); s16 find_ground_level_from_noise(u64 seed, v2s16 p2d, s16 precision); - + float getHumidity(v2s16 p); float getTreeAmount(v2s16 p); bool getHaveAppleTree(v2s16 p); @@ -134,9 +133,9 @@ public: bool getHaveBeach(int index); BiomeV6Type getBiome(v2s16 p); BiomeV6Type getBiome(int index, v2s16 p); - + u32 get_blockseed(u64 seed, v3s16 p); - + virtual void calculateNoise(); int generateGround(); void addMud(); @@ -152,7 +151,7 @@ struct MapgenFactoryV6 : public MapgenFactory { Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge) { return new MapgenV6(mgid, params, emerge); }; - + MapgenSpecificParams *createMapgenParams() { return new MapgenV6Params(); }; -- cgit v1.2.3