diff options
| author | Mattes D <github@xoft.cz> | 2015-11-11 10:32:42 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-12-01 10:35:07 +0100 |
| commit | b8fbba5eb92cda32b13d65f3704adf778da82f38 (patch) | |
| tree | 0c6e8f47ae152e5ffade6f0a7457505101764753 /src/Generating/HeiGen.h | |
| parent | Merge pull request #2696 from Gargaj/breeding (diff) | |
| download | cuberite-b8fbba5eb92cda32b13d65f3704adf778da82f38.tar cuberite-b8fbba5eb92cda32b13d65f3704adf778da82f38.tar.gz cuberite-b8fbba5eb92cda32b13d65f3704adf778da82f38.tar.bz2 cuberite-b8fbba5eb92cda32b13d65f3704adf778da82f38.tar.lz cuberite-b8fbba5eb92cda32b13d65f3704adf778da82f38.tar.xz cuberite-b8fbba5eb92cda32b13d65f3704adf778da82f38.tar.zst cuberite-b8fbba5eb92cda32b13d65f3704adf778da82f38.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Generating/HeiGen.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/Generating/HeiGen.h b/src/Generating/HeiGen.h index 0dc9c814b..e3b951b44 100644 --- a/src/Generating/HeiGen.h +++ b/src/Generating/HeiGen.h @@ -33,6 +33,7 @@ public: // cTerrainHeightGen overrides: virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override; + virtual HEIGHTTYPE GetHeightAt(int a_BlockX, int a_BlockZ) override; /** Retrieves height at the specified point in the cache, returns true if found, false if not found */ bool GetHeightAt(int a_ChunkX, int a_ChunkZ, int a_RelX, int a_RelZ, HEIGHTTYPE & a_Height); @@ -72,6 +73,7 @@ public: // cTerrainHeightGen overrides: virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override; + virtual HEIGHTTYPE GetHeightAt(int a_BlockX, int a_BlockZ) override; /** Retrieves height at the specified point in the cache, returns true if found, false if not found */ bool GetHeightAt(int a_ChunkX, int a_ChunkZ, int a_RelX, int a_RelZ, HEIGHTTYPE & a_Height); @@ -164,6 +166,8 @@ protected: class cHeiGenBiomal : public cTerrainHeightGen { + typedef cTerrainHeightGen Super; + public: cHeiGenBiomal(int a_Seed, cBiomeGenPtr a_BiomeGen) : m_Noise(a_Seed), @@ -173,6 +177,10 @@ public: // cTerrainHeightGen overrides: virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override; + virtual HEIGHTTYPE GetHeightAt(int a_BlockX, int a_BlockZ) override // Need to provide this override due to clang's overzealous detection of overloaded virtuals + { + return Super::GetHeightAt(a_BlockX, a_BlockZ); + } virtual void InitializeHeightGen(cIniFile & a_IniFile) override; protected: |