From 5ca3a7c2e76bc91356aaa1c6bc3d12bb2a3c6e9c Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Mon, 8 Mar 2021 16:39:43 +0000 Subject: shared_ptr -> unique_ptr in generators --- src/Generating/VerticalStrategy.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'src/Generating/VerticalStrategy.cpp') 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; } - - - - -- cgit v1.2.3