diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-10-20 20:01:53 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-10-20 20:01:53 +0200 |
| commit | 2334c8dd9d6a295e3c445e548b5902c9f49ab532 (patch) | |
| tree | 914eb4019ea6ca8e1f3c92198b910c05f3a6ecbc /src/Generating/HeiGen.h | |
| parent | Migrated cSleep and cTimer to std::chrono (diff) | |
| parent | Merge pull request #1554 from SphinxC0re/master (diff) | |
| download | cuberite-2334c8dd9d6a295e3c445e548b5902c9f49ab532.tar cuberite-2334c8dd9d6a295e3c445e548b5902c9f49ab532.tar.gz cuberite-2334c8dd9d6a295e3c445e548b5902c9f49ab532.tar.bz2 cuberite-2334c8dd9d6a295e3c445e548b5902c9f49ab532.tar.lz cuberite-2334c8dd9d6a295e3c445e548b5902c9f49ab532.tar.xz cuberite-2334c8dd9d6a295e3c445e548b5902c9f49ab532.tar.zst cuberite-2334c8dd9d6a295e3c445e548b5902c9f49ab532.zip | |
Diffstat (limited to 'src/Generating/HeiGen.h')
| -rw-r--r-- | src/Generating/HeiGen.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/Generating/HeiGen.h b/src/Generating/HeiGen.h index 5c106c7d9..6ae5ba362 100644 --- a/src/Generating/HeiGen.h +++ b/src/Generating/HeiGen.h @@ -45,7 +45,7 @@ class cHeiGenCache : public cTerrainHeightGen { public: - cHeiGenCache(cTerrainHeightGen & a_HeiGenToCache, int a_CacheSize); // Doesn't take ownership of a_HeiGenToCache + cHeiGenCache(cTerrainHeightGenPtr a_HeiGenToCache, int a_CacheSize); ~cHeiGenCache(); // cTerrainHeightGen overrides: @@ -57,7 +57,7 @@ public: protected: - cTerrainHeightGen & m_HeiGenToCache; + cTerrainHeightGenPtr m_HeiGenToCache; struct sCacheData { @@ -115,7 +115,8 @@ public: protected: int m_Seed; - cRidgedMultiNoise m_Noise; + cRidgedMultiNoise m_MountainNoise; + cRidgedMultiNoise m_DitchNoise; cPerlinNoise m_Perlin; // cTerrainHeightGen overrides: @@ -131,7 +132,7 @@ class cHeiGenBiomal : public cTerrainHeightGen { public: - cHeiGenBiomal(int a_Seed, cBiomeGen & a_BiomeGen) : + cHeiGenBiomal(int a_Seed, cBiomeGenPtr a_BiomeGen) : m_Noise(a_Seed), m_BiomeGen(a_BiomeGen) { @@ -141,8 +142,8 @@ protected: typedef cChunkDef::BiomeMap BiomeNeighbors[3][3]; - cNoise m_Noise; - cBiomeGen & m_BiomeGen; + cNoise m_Noise; + cBiomeGenPtr m_BiomeGen; // Per-biome terrain generator parameters: struct sGenParam |