From 6db727c60c01264dc9a9c209c5b335da8f53cd64 Mon Sep 17 00:00:00 2001 From: Samuel Barney Date: Thu, 21 Aug 2014 13:37:41 -0600 Subject: Temporarily commented out override directives. --- src/Generating/StructGen.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/Generating/StructGen.h') diff --git a/src/Generating/StructGen.h b/src/Generating/StructGen.h index 55d5bc1c7..8bbf71f00 100644 --- a/src/Generating/StructGen.h +++ b/src/Generating/StructGen.h @@ -64,8 +64,8 @@ protected: const cChunkDef::BiomeMap & a_Biomes ); - // cFinishGen override: - virtual void GenFinish(cChunkDesc & a_ChunkDesc) override; + // cFinishGen /*override*/: + virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/; } ; @@ -100,8 +100,8 @@ protected: OreList m_OreList; // A list of possible ores. BLOCKTYPE m_ToReplace; - // cFinishGen override: - virtual void GenFinish(cChunkDesc & a_ChunkDesc) override; + // cFinishGen /*override*/: + virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/; void GenerateOre(int a_ChunkX, int a_ChunkZ, BLOCKTYPE a_OreType, int a_MaxHeight, int a_NumNests, int a_NestSize, cChunkDef::BlockTypes & a_BlockTypes, int a_Seq); } ; @@ -130,8 +130,8 @@ protected: cTerrainHeightGen & m_HeiGen; int m_Probability; ///< Chance, 0 .. 100, of a chunk having the lake - // cFinishGen override: - virtual void GenFinish(cChunkDesc & a_ChunkDesc) override; + // cFinishGen /*override*/: + virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/; /// Creates a lake image for the specified chunk into a_Lake void CreateLakeImage(int a_ChunkX, int a_ChunkZ, cBlockArea & a_Lake); @@ -152,8 +152,8 @@ protected: cNoise m_Noise1; cNoise m_Noise2; - // cFinishGen override: - virtual void GenFinish(cChunkDesc & a_ChunkDesc) override; + // cFinishGen /*override*/: + virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/; bool HasWantedBiome(cChunkDesc & a_ChunkDesc) const; } ; @@ -174,8 +174,8 @@ protected: cNoise m_NoiseZ; cNoise m_NoiseH; - // cFinishGen override: - virtual void GenFinish(cChunkDesc & a_ChunkDesc) override; + // cFinishGen /*override*/: + virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/; } ; -- cgit v1.2.3