diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-09-05 16:56:31 +0200 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-09-05 16:56:31 +0200 |
| commit | 28f66efe307150558f4ad2546e058370a828be3e (patch) | |
| tree | 2ef088aa2d1a8ae85007b34b463d5044847bf006 /src/Generating/Noise3DGenerator.h | |
| parent | Merge branch 'master' into ComponentRewrite (diff) | |
| download | cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.gz cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.bz2 cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.lz cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.xz cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.zst cuberite-28f66efe307150558f4ad2546e058370a828be3e.zip | |
Diffstat (limited to 'src/Generating/Noise3DGenerator.h')
| -rw-r--r-- | src/Generating/Noise3DGenerator.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Generating/Noise3DGenerator.h b/src/Generating/Noise3DGenerator.h index e06d1587f..42f61a854 100644 --- a/src/Generating/Noise3DGenerator.h +++ b/src/Generating/Noise3DGenerator.h @@ -24,9 +24,9 @@ public: cNoise3DGenerator(cChunkGenerator & a_ChunkGenerator); virtual ~cNoise3DGenerator(); - virtual void Initialize(cIniFile & a_IniFile) /*override*/; - virtual void GenerateBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) /*override*/; - virtual void DoGenerate(int a_ChunkX, int a_ChunkZ, cChunkDesc & a_ChunkDesc) /*override*/; + virtual void Initialize(cIniFile & a_IniFile) override; + virtual void GenerateBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override; + virtual void DoGenerate(int a_ChunkX, int a_ChunkZ, cChunkDesc & a_ChunkDesc) override; protected: // Linear interpolation step sizes, must be divisors of cChunkDef::Width and cChunkDef::Height, respectively: @@ -94,11 +94,11 @@ protected: /// Generates the 3D noise array used for terrain generation, unless the LastChunk coords are equal to coords given void GenerateNoiseArrayIfNeeded(int a_ChunkX, int a_ChunkZ); - // cTerrainHeightGen /*override*/s: - virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) /*override*/; + // cTerrainHeightGen overrides: + virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override; - // cTerrainCompositionGen /*override*/s: - virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) /*override*/; + // cTerrainCompositionGen overrides: + virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) override; } ; |