diff options
| author | Tiger Wang <ziwei.tiger@outlook.com> | 2021-03-08 17:39:43 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@outlook.com> | 2021-03-18 00:44:42 +0100 |
| commit | 5ca3a7c2e76bc91356aaa1c6bc3d12bb2a3c6e9c (patch) | |
| tree | ea5f79ad71456dcbf4f658a61cc259ac4e6e7d79 /src/Generating/VerticalStrategy.cpp | |
| parent | Add heraldry names to banner pattern API docs (diff) | |
| download | cuberite-5ca3a7c2e76bc91356aaa1c6bc3d12bb2a3c6e9c.tar cuberite-5ca3a7c2e76bc91356aaa1c6bc3d12bb2a3c6e9c.tar.gz cuberite-5ca3a7c2e76bc91356aaa1c6bc3d12bb2a3c6e9c.tar.bz2 cuberite-5ca3a7c2e76bc91356aaa1c6bc3d12bb2a3c6e9c.tar.lz cuberite-5ca3a7c2e76bc91356aaa1c6bc3d12bb2a3c6e9c.tar.xz cuberite-5ca3a7c2e76bc91356aaa1c6bc3d12bb2a3c6e9c.tar.zst cuberite-5ca3a7c2e76bc91356aaa1c6bc3d12bb2a3c6e9c.zip | |
Diffstat (limited to 'src/Generating/VerticalStrategy.cpp')
| -rw-r--r-- | src/Generating/VerticalStrategy.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/Generating/VerticalStrategy.cpp b/src/Generating/VerticalStrategy.cpp index 0651958f9..9fd11865b 100644 --- a/src/Generating/VerticalStrategy.cpp +++ b/src/Generating/VerticalStrategy.cpp @@ -162,7 +162,7 @@ public: } - virtual void AssignGens(int a_Seed, cBiomeGenPtr & a_BiomeGen, cTerrainHeightGenPtr & a_TerrainHeightGen, int a_SeaLevel) override + virtual void AssignGens(int a_Seed, cBiomeGen & a_BiomeGen, cTerrainHeightGen & a_TerrainHeightGen, int a_SeaLevel) override { m_Seed = a_Seed + SEED_OFFSET; } @@ -209,10 +209,10 @@ public: } - virtual void AssignGens(int a_Seed, cBiomeGenPtr & a_BiomeGen, cTerrainHeightGenPtr & a_HeightGen, int a_SeaLevel) override + virtual void AssignGens(int a_Seed, cBiomeGen & a_BiomeGen, cTerrainHeightGen & a_HeightGen, int a_SeaLevel) override { m_Seed = a_Seed + SEED_OFFSET; - m_HeightGen = a_HeightGen; + m_HeightGen = &a_HeightGen; } protected: @@ -220,7 +220,7 @@ protected: int m_Seed; /** Height generator from which the top of the terrain is read. */ - cTerrainHeightGenPtr m_HeightGen; + cTerrainHeightGen * m_HeightGen; /** Minimum relative height at which the prefab is placed. */ int m_MinRelHeight; @@ -265,10 +265,10 @@ public: } - virtual void AssignGens(int a_Seed, cBiomeGenPtr & a_BiomeGen, cTerrainHeightGenPtr & a_HeightGen, int a_SeaLevel) override + virtual void AssignGens(int a_Seed, cBiomeGen & a_BiomeGen, cTerrainHeightGen & a_HeightGen, int a_SeaLevel) override { m_Seed = a_Seed + SEED_OFFSET; - m_HeightGen = a_HeightGen; + m_HeightGen = &a_HeightGen; m_SeaLevel = a_SeaLevel; } @@ -277,7 +277,7 @@ protected: int m_Seed; /** Height generator from which the top of the terrain is read. */ - cTerrainHeightGenPtr m_HeightGen; + cTerrainHeightGen * m_HeightGen; /** The sea level used by the world. */ int m_SeaLevel; @@ -342,7 +342,3 @@ cPiece::cVerticalStrategyPtr CreateVerticalStrategyFromString(const AString & a_ return Strategy; } - - - - |