diff options
author | Samuel Barney <samjbarney@gmail.com> | 2014-08-21 21:37:41 +0200 |
---|---|---|
committer | Samuel Barney <samjbarney@gmail.com> | 2014-08-21 21:37:41 +0200 |
commit | 6db727c60c01264dc9a9c209c5b335da8f53cd64 (patch) | |
tree | 1ec865e37c74c571de0bc7249d1b5f17dd8f5a1c /src/Generating/BioGen.h | |
parent | commented out unused functions (diff) | |
download | cuberite-6db727c60c01264dc9a9c209c5b335da8f53cd64.tar cuberite-6db727c60c01264dc9a9c209c5b335da8f53cd64.tar.gz cuberite-6db727c60c01264dc9a9c209c5b335da8f53cd64.tar.bz2 cuberite-6db727c60c01264dc9a9c209c5b335da8f53cd64.tar.lz cuberite-6db727c60c01264dc9a9c209c5b335da8f53cd64.tar.xz cuberite-6db727c60c01264dc9a9c209c5b335da8f53cd64.tar.zst cuberite-6db727c60c01264dc9a9c209c5b335da8f53cd64.zip |
Diffstat (limited to 'src/Generating/BioGen.h')
-rw-r--r-- | src/Generating/BioGen.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/Generating/BioGen.h b/src/Generating/BioGen.h index 227ec97d7..5f9c7ebc0 100644 --- a/src/Generating/BioGen.h +++ b/src/Generating/BioGen.h @@ -32,9 +32,9 @@ protected: EMCSBiome m_Biome; - // cBiomeGen overrides: - virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override; - virtual void InitializeBiomeGen(cIniFile & a_IniFile) override; + // cBiomeGen /*override*/s: + virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) /*override*/; + virtual void InitializeBiomeGen(cIniFile & a_IniFile) /*override*/; } ; @@ -72,8 +72,8 @@ protected: int m_NumMisses; int m_TotalChain; // Number of cache items walked to get to a hit (only added for hits) - virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override; - virtual void InitializeBiomeGen(cIniFile & a_IniFile) override; + virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) /*override*/; + virtual void InitializeBiomeGen(cIniFile & a_IniFile) /*override*/; } ; @@ -108,9 +108,9 @@ class cBioGenCheckerboard : protected: int m_BiomeSize; - // cBiomeGen overrides: - virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override; - virtual void InitializeBiomeGen(cIniFile & a_IniFile) override; + // cBiomeGen /*override*/s: + virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) /*override*/; + virtual void InitializeBiomeGen(cIniFile & a_IniFile) /*override*/; } ; @@ -131,9 +131,9 @@ public: protected: cVoronoiMap m_Voronoi; - // cBiomeGen overrides: - virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override; - virtual void InitializeBiomeGen(cIniFile & a_IniFile) override; + // cBiomeGen /*override*/s: + virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) /*override*/; + virtual void InitializeBiomeGen(cIniFile & a_IniFile) /*override*/; EMCSBiome VoronoiBiome(int a_BlockX, int a_BlockZ); } ; @@ -165,9 +165,9 @@ protected: /// Size of the Voronoi cells, also used for distortion amplitude int m_CellSize; - // cBiomeGen overrides: - virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override; - virtual void InitializeBiomeGen(cIniFile & a_IniFile) override; + // cBiomeGen /*override*/s: + virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) /*override*/; + virtual void InitializeBiomeGen(cIniFile & a_IniFile) /*override*/; /// Distorts the coords using a Perlin-like noise void Distort(int a_BlockX, int a_BlockZ, int & a_DistortedX, int & a_DistortedZ); @@ -204,9 +204,9 @@ protected: typedef int IntMap[17 * 17]; // x + 17 * z, expected trimmed into [0..255] range typedef double DblMap[17 * 17]; // x + 17 * z, expected trimmed into [0..1] range - // cBiomeGen overrides: - virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override; - virtual void InitializeBiomeGen(cIniFile & a_IniFile) override; + // cBiomeGen /*override*/s: + virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) /*override*/; + virtual void InitializeBiomeGen(cIniFile & a_IniFile) /*override*/; /** Step 1: Decides between ocean, land and mushroom, using a DistVoronoi with special conditions and post-processing for mushroom islands Sets biomes to biOcean, -1 (i.e. land), biMushroomIsland or biMushroomShore @@ -269,9 +269,9 @@ protected: cNoise m_Noise6; - // cBiomeGen overrides: - virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override; - virtual void InitializeBiomeGen(cIniFile & a_IniFile) override; + // cBiomeGen /*override*/s: + virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) /*override*/; + virtual void InitializeBiomeGen(cIniFile & a_IniFile) /*override*/; /// Selects biome from the specified biome group, based on the specified index. /// Note that both params may overflow |