34 files changed, 196 insertions, 196 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
diff --git a/src/Generating/Caves.cpp b/src/Generating/Caves.cpp
index 6fc371958..3e4bb6edd 100644
--- a/src/Generating/Caves.cpp
+++ b/src/Generating/Caves.cpp
@@ -143,8 +143,8 @@ protected:
 	/// Returns a radius based on the location provided.
 	int GetRadius(cNoise & a_Noise, int a_OriginX, int a_OriginY, int a_OriginZ);
 
-	// cGridStructGen::cStructure overrides:
-	virtual void DrawIntoChunk(cChunkDesc & a_ChunkDesc) override;
+	// cGridStructGen::cStructure /*override*/s:
+	virtual void DrawIntoChunk(cChunkDesc & a_ChunkDesc) /*override*/;
 } ;
 
 
diff --git a/src/Generating/Caves.h b/src/Generating/Caves.h
index 0e17acf9e..4783a6ff9 100644
--- a/src/Generating/Caves.h
+++ b/src/Generating/Caves.h
@@ -29,8 +29,8 @@ protected:
 
 	int m_Seed;
 	
-	// cFinishGen override:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
+	// cFinishGen /*override*/:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
 } ;
 
 
@@ -55,8 +55,8 @@ protected:
 	int    m_Seed;
 	float  m_Threshold;
 	
-	// cFinishGen override:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
+	// cFinishGen /*override*/:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
 } ;
 
 
@@ -85,8 +85,8 @@ protected:
 	int          m_MaxOffset;  // maximum offset of the cave nest origin from the grid cell the nest belongs to
 	int          m_Grid;  // average spacing of the nests
 
-	// cGridStructGen override:
-	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
+	// cGridStructGen /*override*/:
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) /*override*/;
 } ;
 
 
diff --git a/src/Generating/ChunkGenerator.h b/src/Generating/ChunkGenerator.h
index 88d71f3f9..8c5d47b79 100644
--- a/src/Generating/ChunkGenerator.h
+++ b/src/Generating/ChunkGenerator.h
@@ -71,7 +71,7 @@ public:
 		virtual ~cPluginInterface() {}
 		
 		/** Called when the chunk is about to be generated.
-		The generator may be partly or fully overriden by the implementation
+		The generator may be partly or fully /*override*/n by the implementation
 		*/
 		virtual void CallHookChunkGenerating(cChunkDesc & a_ChunkDesc) = 0;
 		
@@ -151,8 +151,8 @@ private:
 	cChunkSink * m_ChunkSink;
 	
 
-	// cIsThread override:
-	virtual void Execute(void) override;
+	// cIsThread /*override*/:
+	virtual void Execute(void) /*override*/;
 
 	void DoGenerate(int a_ChunkX, int a_ChunkY, int a_ChunkZ);
 };
diff --git a/src/Generating/CompoGen.h b/src/Generating/CompoGen.h
index 096b0fb5a..b2de70d5b 100644
--- a/src/Generating/CompoGen.h
+++ b/src/Generating/CompoGen.h
@@ -37,9 +37,9 @@ protected:
 	BLOCKTYPE m_BlockType;
 	bool      m_IsBedrocked;
 	
-	// cTerrainCompositionGen overrides:
-	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) override;
-	virtual void InitializeCompoGen(cIniFile & a_IniFile) override;
+	// cTerrainCompositionGen /*override*/s:
+	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) /*override*/;
+	virtual void InitializeCompoGen(cIniFile & a_IniFile) /*override*/;
 } ;
 
 
@@ -54,8 +54,8 @@ public:
 	
 protected:
 	
-	// cTerrainCompositionGen overrides:
-	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) override;
+	// cTerrainCompositionGen /*override*/s:
+	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) /*override*/;
 } ;
 
 
@@ -80,9 +80,9 @@ protected:
 	BLOCKTYPE m_BlockBeachBottom;
 	BLOCKTYPE m_BlockSea;
 	
-	// cTerrainCompositionGen overrides:
-	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) override;
-	virtual void InitializeCompoGen(cIniFile & a_IniFile) override;
+	// cTerrainCompositionGen /*override*/s:
+	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) /*override*/;
+	virtual void InitializeCompoGen(cIniFile & a_IniFile) /*override*/;
 } ;
 
 
@@ -104,9 +104,9 @@ protected:
 	cNoise m_Noise;
 	int    m_SeaLevel;
 	
-	// cTerrainCompositionGen overrides:
-	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) override;
-	virtual void InitializeCompoGen(cIniFile & a_IniFile) override;
+	// cTerrainCompositionGen /*override*/s:
+	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) /*override*/;
+	virtual void InitializeCompoGen(cIniFile & a_IniFile) /*override*/;
 	
 	void FillColumnGrass    (int a_RelX, int a_RelZ, int a_Height, cChunkDef::BlockTypes & a_BlockTypes);
 	void FillColumnClay     (int a_RelX, int a_RelZ, int a_Height, cChunkDef::BlockTypes & a_BlockTypes);
@@ -135,9 +135,9 @@ protected:
 	
 	int m_Threshold;
 	
-	// cTerrainCompositionGen overrides:
-	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) override;
-	virtual void InitializeCompoGen(cIniFile & a_IniFile) override;
+	// cTerrainCompositionGen /*override*/s:
+	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) /*override*/;
+	virtual void InitializeCompoGen(cIniFile & a_IniFile) /*override*/;
 } ;
 
 
@@ -152,9 +152,9 @@ public:
 	cCompoGenCache(cTerrainCompositionGen & a_Underlying, int a_CacheSize);  // Doesn't take ownership of a_Underlying
 	~cCompoGenCache();
 	
-	// cTerrainCompositionGen override:
-	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) override;
-	virtual void InitializeCompoGen(cIniFile & a_IniFile) override;
+	// cTerrainCompositionGen /*override*/:
+	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) /*override*/;
+	virtual void InitializeCompoGen(cIniFile & a_IniFile) /*override*/;
 	
 protected:
 
diff --git a/src/Generating/ComposableGenerator.h b/src/Generating/ComposableGenerator.h
index 6b7627d2e..8cd209059 100644
--- a/src/Generating/ComposableGenerator.h
+++ b/src/Generating/ComposableGenerator.h
@@ -146,9 +146,9 @@ public:
 	cComposableGenerator(cChunkGenerator & a_ChunkGenerator);
 	virtual ~cComposableGenerator();
 	
-	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:
 	// The generation composition:
diff --git a/src/Generating/DistortedHeightmap.h b/src/Generating/DistortedHeightmap.h
index e6b3c9d3f..8ae272012 100644
--- a/src/Generating/DistortedHeightmap.h
+++ b/src/Generating/DistortedHeightmap.h
@@ -126,11 +126,11 @@ protected:
 	const sBlockInfo * ChooseOceanFloorPattern(int a_RelX, int a_RelZ);
 	
 	
-	// cTerrainHeightGen overrides:
-	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override;
-	virtual void InitializeHeightGen(cIniFile & a_IniFile) override;
+	// cTerrainHeightGen /*override*/s:
+	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) /*override*/;
+	virtual void InitializeHeightGen(cIniFile & a_IniFile) /*override*/;
 
-	// cTerrainCompositionGen overrides:
-	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) override;
-	virtual void InitializeCompoGen(cIniFile & a_IniFile) override;
+	// cTerrainCompositionGen /*override*/s:
+	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) /*override*/;
+	virtual void InitializeCompoGen(cIniFile & a_IniFile) /*override*/;
 } ;
diff --git a/src/Generating/EndGen.h b/src/Generating/EndGen.h
index 322061810..5bcedbde3 100644
--- a/src/Generating/EndGen.h
+++ b/src/Generating/EndGen.h
@@ -59,10 +59,10 @@ protected:
 	/// Returns true if the chunk is outside of the island's dimensions
 	bool IsChunkOutsideRange(int a_ChunkX, int a_ChunkZ);
 		
-	// cTerrainHeightGen overrides:
-	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override;
+	// cTerrainHeightGen /*override*/s:
+	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) /*override*/;
 
-	// cTerrainCompositionGen overrides:
-	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) override;
-	virtual void InitializeCompoGen(cIniFile & a_IniFile) override;
+	// cTerrainCompositionGen /*override*/s:
+	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) /*override*/;
+	virtual void InitializeCompoGen(cIniFile & a_IniFile) /*override*/;
 } ;
diff --git a/src/Generating/FinishGen.h b/src/Generating/FinishGen.h
index 4a08d70c8..314f9e1f0 100644
--- a/src/Generating/FinishGen.h
+++ b/src/Generating/FinishGen.h
@@ -27,8 +27,8 @@ class cFinishGenSnow :
 	public cFinishGen
 {
 protected:
-	// cFinishGen override:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
+	// cFinishGen /*override*/:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
 } ;
 
 
@@ -39,8 +39,8 @@ class cFinishGenIce :
 	public cFinishGen
 {
 protected:
-	// cFinishGen override:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
+	// cFinishGen /*override*/:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
 } ;
 
 
@@ -62,7 +62,7 @@ protected:
 	int    m_Seed;
 
 	void TryPlaceClump(cChunkDesc & a_ChunkDesc, int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_Block);
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
 } ;
 
 
@@ -79,8 +79,8 @@ protected:
 	cNoise m_Noise;
 	int m_Seed;
 
-	// cFinishGen override:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
+	// cFinishGen /*override*/:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
 
 	int GetBiomeDensity(EMCSBiome a_Biome)
 	{
@@ -130,8 +130,8 @@ protected:
 	/// Tries to place sugarcane at the coords specified, returns true if successful
 	bool TryAddSugarcane(cChunkDesc & a_ChunkDesc, int a_RelX, int a_RelY, int a_RelZ);
 	
-	// cFinishGen override:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
+	// cFinishGen /*override*/:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
 } ;
 
 
@@ -207,8 +207,8 @@ protected:
 	}
 
 	
-	// cFinishGen override:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
+	// cFinishGen /*override*/:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
 } ;
 
 
@@ -228,8 +228,8 @@ public:
 protected:
 	int m_Level;
 	
-	// cFinishGen override:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
+	// cFinishGen /*override*/:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
 } ;
 
 
@@ -265,8 +265,8 @@ protected:
 		BLOCKTYPE a_StationaryFluid
 	);
 
-	// cFinishGen override:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
+	// cFinishGen /*override*/:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
 } ;
 
 
@@ -286,8 +286,8 @@ protected:
 	BLOCKTYPE      m_Fluid;
 	int            m_Chance;  ///< Chance, [0..100], that a spring will be generated in a chunk
 
-	// cFinishGen override:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
+	// cFinishGen /*override*/:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
 
 	/// Tries to place a spring at the specified coords, checks neighbors. Returns true if successful
 	bool TryPlaceSpring(cChunkDesc & a_ChunkDesc, int x, int y, int z);
diff --git a/src/Generating/GridStructGen.cpp b/src/Generating/GridStructGen.cpp
index 7090f14b1..f8ea94900 100644
--- a/src/Generating/GridStructGen.cpp
+++ b/src/Generating/GridStructGen.cpp
@@ -27,7 +27,7 @@ public:
 	}
 	
 protected:
-	virtual void DrawIntoChunk(cChunkDesc & a_ChunkDesc) override
+	virtual void DrawIntoChunk(cChunkDesc & a_ChunkDesc) /*override*/
 	{
 		// Do nothing
 	}
diff --git a/src/Generating/GridStructGen.h b/src/Generating/GridStructGen.h
index 03131fce9..04ae2db98 100644
--- a/src/Generating/GridStructGen.h
+++ b/src/Generating/GridStructGen.h
@@ -27,7 +27,7 @@ Each structure thus contains the coords of its grid center (m_GridX, m_GridZ) an
 which it's built (m_OriginX, m_OriginZ).
 
 This class provides a cache for the structures generated for successive chunks and manages that cache. It
-also provides the cFinishGen override that uses the cache to actually generate the structure into chunk data.
+also provides the cFinishGen /*override*/ that uses the cache to actually generate the structure into chunk data.
 
 After generating each chunk the cache is checked for size, each item in the cache has a cost associated with
 it and the cache is trimmed (from its least-recently-used end) so that the sum of the cost in the cache is
@@ -39,7 +39,7 @@ a structure at the specific grid cell.
 
 The descendant must use a specific cStructure descendant to provide the actual structure that gets generated.
 The structure must provide the DrawIntoChunk() function that generates the structure into the chunk data, and
-can override the GetCacheCost() function that returns the cost of that structure in the cache.
+can /*override*/ the GetCacheCost() function that returns the cost of that structure in the cache.
 */
 class cGridStructGen :
 	public cFinishGen
@@ -131,10 +131,10 @@ protected:
 	around their gridpoint intersects the chunk. */
 	void GetStructuresForChunk(int a_ChunkX, int a_ChunkZ, cStructurePtrs & a_Structures);
 
-	// cFinishGen overrides:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
+	// cFinishGen /*override*/s:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
 	
-	// Functions for the descendants to override:
+	// Functions for the descendants to /*override*/:
 	/** Create a new structure at the specified gridpoint */
 	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) = 0;
 } ;
diff --git a/src/Generating/HeiGen.h b/src/Generating/HeiGen.h
index 5c106c7d9..35c8fd1b1 100644
--- a/src/Generating/HeiGen.h
+++ b/src/Generating/HeiGen.h
@@ -31,9 +31,9 @@ protected:
 
 	int m_Height;
 
-	// cTerrainHeightGen overrides:
-	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override;
-	virtual void InitializeHeightGen(cIniFile & a_IniFile) override;
+	// cTerrainHeightGen /*override*/s:
+	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) /*override*/;
+	virtual void InitializeHeightGen(cIniFile & a_IniFile) /*override*/;
 } ;
 
 
@@ -48,9 +48,9 @@ public:
 	cHeiGenCache(cTerrainHeightGen & a_HeiGenToCache, int a_CacheSize);  // Doesn't take ownership of a_HeiGenToCache
 	~cHeiGenCache();
 	
-	// cTerrainHeightGen overrides:
-	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override;
-	virtual void InitializeHeightGen(cIniFile & a_IniFile) override;
+	// cTerrainHeightGen /*override*/s:
+	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) /*override*/;
+	virtual void InitializeHeightGen(cIniFile & a_IniFile) /*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);
@@ -97,9 +97,9 @@ protected:
 	
 	float GetNoise(float x, float y);
 
-	// cTerrainHeightGen overrides:
-	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override;
-	virtual void InitializeHeightGen(cIniFile & a_IniFile) override;
+	// cTerrainHeightGen /*override*/s:
+	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) /*override*/;
+	virtual void InitializeHeightGen(cIniFile & a_IniFile) /*override*/;
 } ;
 
 
@@ -118,9 +118,9 @@ protected:
 	cRidgedMultiNoise m_Noise;
 	cPerlinNoise m_Perlin;
 	
-	// cTerrainHeightGen overrides:
-	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override;
-	virtual void InitializeHeightGen(cIniFile & a_IniFile) override;
+	// cTerrainHeightGen /*override*/s:
+	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) /*override*/;
+	virtual void InitializeHeightGen(cIniFile & a_IniFile) /*override*/;
 } ;
 
 
@@ -154,9 +154,9 @@ protected:
 	} ;
 	static const sGenParam m_GenParam[256];
 	
-	// cTerrainHeightGen overrides:
-	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override;
-	virtual void InitializeHeightGen(cIniFile & a_IniFile) override;
+	// cTerrainHeightGen /*override*/s:
+	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) /*override*/;
+	virtual void InitializeHeightGen(cIniFile & a_IniFile) /*override*/;
 	
 	NOISE_DATATYPE GetHeightAt(int a_RelX, int a_RelZ, int a_ChunkX, int a_ChunkZ, const BiomeNeighbors & a_BiomeNeighbors);
 } ;
diff --git a/src/Generating/MineShafts.cpp b/src/Generating/MineShafts.cpp
index 0532aff39..d70233248 100644
--- a/src/Generating/MineShafts.cpp
+++ b/src/Generating/MineShafts.cpp
@@ -95,9 +95,9 @@ class cMineShaftDirtRoom :
 public:
 	cMineShaftDirtRoom(cStructGenMineShafts::cMineShaftSystem & a_Parent, cNoise & a_Noise);
 
-	// cMineShaft overrides:
-	virtual void AppendBranches(int a_RecursionLevel, cNoise & a_Noise) override;
-	virtual void ProcessChunk(cChunkDesc & a_ChunkDesc) override;
+	// cMineShaft /*override*/s:
+	virtual void AppendBranches(int a_RecursionLevel, cNoise & a_Noise) /*override*/;
+	virtual void ProcessChunk(cChunkDesc & a_ChunkDesc) /*override*/;
 } ;
 
 
@@ -136,9 +136,9 @@ protected:
 		cNoise & a_Noise
 	);
 
-	// cMineShaft overrides:
-	virtual void AppendBranches(int a_RecursionLevel, cNoise & a_Noise) override;
-	virtual void ProcessChunk(cChunkDesc & a_ChunkDesc) override;
+	// cMineShaft /*override*/s:
+	virtual void AppendBranches(int a_RecursionLevel, cNoise & a_Noise) /*override*/;
+	virtual void ProcessChunk(cChunkDesc & a_ChunkDesc) /*override*/;
 
 	/// Places a chest, if the corridor has one
 	void PlaceChest(cChunkDesc & a_ChunkDesc);
@@ -176,9 +176,9 @@ public:
 protected:
 	cMineShaftCrossing(cStructGenMineShafts::cMineShaftSystem & a_ParentSystem, const cCuboid & a_BoundingBox);
 
-	// cMineShaft overrides:
-	virtual void AppendBranches(int a_RecursionLevel, cNoise & a_Noise) override;
-	virtual void ProcessChunk(cChunkDesc & a_ChunkDesc) override;
+	// cMineShaft /*override*/s:
+	virtual void AppendBranches(int a_RecursionLevel, cNoise & a_Noise) /*override*/;
+	virtual void ProcessChunk(cChunkDesc & a_ChunkDesc) /*override*/;
 } ;
 
 
@@ -219,9 +219,9 @@ protected:
 		eSlope a_Slope
 	);
 
-	// cMineShaft overrides:
-	virtual void AppendBranches(int a_RecursionLevel, cNoise & a_Noise) override;
-	virtual void ProcessChunk(cChunkDesc & a_ChunkDesc) override;
+	// cMineShaft /*override*/s:
+	virtual void AppendBranches(int a_RecursionLevel, cNoise & a_Noise) /*override*/;
+	virtual void ProcessChunk(cChunkDesc & a_ChunkDesc) /*override*/;
 } ;
 
 
@@ -267,7 +267,7 @@ public:
 	/** Returns true if none of the objects in m_MineShafts intersect with the specified bounding box and the bounding box is valid */
 	bool CanAppend(const cCuboid & a_BoundingBox);
 
-	// cGridStructGen::cStructure overrides:
+	// cGridStructGen::cStructure /*override*/s:
 	virtual void DrawIntoChunk(cChunkDesc & a_Chunk);
 } ;
 
diff --git a/src/Generating/MineShafts.h b/src/Generating/MineShafts.h
index 2850db571..610dbab87 100644
--- a/src/Generating/MineShafts.h
+++ b/src/Generating/MineShafts.h
@@ -42,8 +42,8 @@ protected:
 	int    m_ProbLevelCrossing;   ///< Probability level of a branch object being the crossing, minus Corridor
 	int    m_ProbLevelStaircase;  ///< Probability level of a branch object being the staircase, minus Crossing
 	
-	// cGridStructGen overrides:
-	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
+	// cGridStructGen /*override*/s:
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) /*override*/;
 } ;
 
 
diff --git a/src/Generating/NetherFortGen.h b/src/Generating/NetherFortGen.h
index 9b31aa0e2..965f50059 100644
--- a/src/Generating/NetherFortGen.h
+++ b/src/Generating/NetherFortGen.h
@@ -36,8 +36,8 @@ protected:
 	static cPrefabPiecePool m_PiecePool;
 	
 
-	// cGridStructGen overrides:
-	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
+	// cGridStructGen /*override*/s:
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) /*override*/;
 } ;
 
 
diff --git a/src/Generating/Noise3DGenerator.h b/src/Generating/Noise3DGenerator.h
index 42f61a854..e06d1587f 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 overrides:
-	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override;
+	// cTerrainHeightGen /*override*/s:
+	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) /*override*/;
 
-	// cTerrainCompositionGen overrides:
-	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) override;
+	// cTerrainCompositionGen /*override*/s:
+	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) /*override*/;
 } ;
 
 
diff --git a/src/Generating/POCPieceGenerator.cpp b/src/Generating/POCPieceGenerator.cpp
index 6e7e74d7a..cfd8ed9bd 100644
--- a/src/Generating/POCPieceGenerator.cpp
+++ b/src/Generating/POCPieceGenerator.cpp
@@ -105,23 +105,23 @@ protected:
 	int m_Height;
 	cConnectors m_Connectors;
 	
-	// cPiece overrides:
-	virtual cConnectors GetConnectors(void) const override
+	// cPiece /*override*/s:
+	virtual cConnectors GetConnectors(void) const /*override*/
 	{
 		return m_Connectors;
 	}
 	
-	virtual Vector3i GetSize(void) const override
+	virtual Vector3i GetSize(void) const /*override*/
 	{
 		return Vector3i(m_SizeXZ, m_Height, m_SizeXZ);
 	}
 	
-	virtual cCuboid GetHitBox(void) const override
+	virtual cCuboid GetHitBox(void) const /*override*/
 	{
 		return cCuboid(0, 0, 0, m_SizeXZ - 1, m_Height - 1, m_SizeXZ - 1);
 	}
 	
-	virtual bool CanRotateCCW(int a_NumRotations) const override
+	virtual bool CanRotateCCW(int a_NumRotations) const /*override*/
 	{
 		return true;
 	}
diff --git a/src/Generating/POCPieceGenerator.h b/src/Generating/POCPieceGenerator.h
index de3114ce0..b353d2e16 100644
--- a/src/Generating/POCPieceGenerator.h
+++ b/src/Generating/POCPieceGenerator.h
@@ -38,14 +38,14 @@ protected:
 	cCuboid m_Bounds;
 
 
-	// cFinishGen overrides:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
+	// cFinishGen /*override*/s:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
 	
-	// cPiecePool overrides:
-	virtual cPieces GetPiecesWithConnector(int a_ConnectorType) override;
-	virtual cPieces GetStartingPieces(void) override;
-	virtual void PiecePlaced(const cPiece & a_Piece) override;
-	virtual void Reset(void) override;
+	// cPiecePool /*override*/s:
+	virtual cPieces GetPiecesWithConnector(int a_ConnectorType) /*override*/;
+	virtual cPieces GetStartingPieces(void) /*override*/;
+	virtual void PiecePlaced(const cPiece & a_Piece) /*override*/;
+	virtual void Reset(void) /*override*/;
 } ;
 
 
diff --git a/src/Generating/PieceGenerator.cpp b/src/Generating/PieceGenerator.cpp
index ae4b6e36c..54c71cf70 100644
--- a/src/Generating/PieceGenerator.cpp
+++ b/src/Generating/PieceGenerator.cpp
@@ -73,7 +73,7 @@ protected:
 		{
 		}
 		
-		virtual cConnectors GetConnectors(void) const override
+		virtual cConnectors GetConnectors(void) const /*override*/
 		{
 			// Each piece has 4 connectors, one of each type, plus one extra, at the center of its walls:
 			cConnectors res;
@@ -84,17 +84,17 @@ protected:
 			return res;
 		}
 		
-		virtual Vector3i GetSize(void) const override
+		virtual Vector3i GetSize(void) const /*override*/
 		{
 			return Vector3i(m_Size, 5, m_Size);
 		}
 		
-		virtual cCuboid GetHitBox(void) const override
+		virtual cCuboid GetHitBox(void) const /*override*/
 		{
 			return cCuboid(0, 0, 0, m_Size - 1, 4, m_Size - 1);
 		}
 		
-		virtual bool CanRotateCCW(int a_NumCCWRotations) const override
+		virtual bool CanRotateCCW(int a_NumCCWRotations) const /*override*/
 		{
 			return true;
 		}
@@ -102,26 +102,26 @@ protected:
 	
 	cPieces m_Pieces;
 	
-	virtual cPieces GetPiecesWithConnector(int a_ConnectorType) override
+	virtual cPieces GetPiecesWithConnector(int a_ConnectorType) /*override*/
 	{
 		// Each piece contains each connector
 		return m_Pieces;
 	}
 	
 	
-	virtual cPieces GetStartingPieces(void) override
+	virtual cPieces GetStartingPieces(void) /*override*/
 	{
 		return m_Pieces;
 	}
 	
 	
-	virtual void PiecePlaced(const cPiece & a_Piece) override
+	virtual void PiecePlaced(const cPiece & a_Piece) /*override*/
 	{
 		UNUSED(a_Piece);
 	}
 	
 	
-	virtual void Reset(void) override
+	virtual void Reset(void) /*override*/
 	{
 	}
 	
diff --git a/src/Generating/Prefab.h b/src/Generating/Prefab.h
index eb905e78e..11e27bd6b 100644
--- a/src/Generating/Prefab.h
+++ b/src/Generating/Prefab.h
@@ -183,11 +183,11 @@ protected:
 	bool m_MoveToGround;
 	
 	
-	// cPiece overrides:
-	virtual cConnectors GetConnectors(void) const override;
-	virtual Vector3i GetSize(void) const override;
-	virtual cCuboid GetHitBox(void) const override;
-	virtual bool CanRotateCCW(int a_NumRotations) const override;
+	// cPiece /*override*/s:
+	virtual cConnectors GetConnectors(void) const /*override*/;
+	virtual Vector3i GetSize(void) const /*override*/;
+	virtual cCuboid GetHitBox(void) const /*override*/;
+	virtual bool CanRotateCCW(int a_NumRotations) const /*override*/;
 	
 	/** Based on the m_AllowedRotations, adds rotated cBlockAreas to the m_BlockArea array.
 	To be called only from this class's constructor! */
diff --git a/src/Generating/PrefabPiecePool.h b/src/Generating/PrefabPiecePool.h
index b9c1f0483..df5db3cd2 100644
--- a/src/Generating/PrefabPiecePool.h
+++ b/src/Generating/PrefabPiecePool.h
@@ -71,13 +71,13 @@ protected:
 	/** Adds the prefab to the m_PiecesByConnector map for all its connectors. */
 	void AddToPerConnectorMap(cPrefab * a_Prefab);
 	
-	// cPiecePool overrides:
-	virtual cPieces GetPiecesWithConnector(int a_ConnectorType) override;
-	virtual cPieces GetStartingPieces(void) override;
-	virtual int GetPieceWeight(const cPlacedPiece & a_PlacedPiece, const cPiece::cConnector & a_ExistingConnector, const cPiece & a_NewPiece) override;
-	virtual int GetStartingPieceWeight(const cPiece & a_NewPiece) override;
-	virtual void PiecePlaced(const cPiece & a_Piece) override;
-	virtual void Reset(void) override;
+	// cPiecePool /*override*/s:
+	virtual cPieces GetPiecesWithConnector(int a_ConnectorType) /*override*/;
+	virtual cPieces GetStartingPieces(void) /*override*/;
+	virtual int GetPieceWeight(const cPlacedPiece & a_PlacedPiece, const cPiece::cConnector & a_ExistingConnector, const cPiece & a_NewPiece) /*override*/;
+	virtual int GetStartingPieceWeight(const cPiece & a_NewPiece) /*override*/;
+	virtual void PiecePlaced(const cPiece & a_Piece) /*override*/;
+	virtual void Reset(void) /*override*/;
 } ;
 
 
diff --git a/src/Generating/RainbowRoadsGen.cpp b/src/Generating/RainbowRoadsGen.cpp
index c3c07cdec..2422bd33e 100644
--- a/src/Generating/RainbowRoadsGen.cpp
+++ b/src/Generating/RainbowRoadsGen.cpp
@@ -71,8 +71,8 @@ protected:
 	cPlacedPieces m_Pieces;
 	
 	
-	// cGridStructGen::cStructure overrides:
-	virtual void DrawIntoChunk(cChunkDesc & a_Chunk) override
+	// cGridStructGen::cStructure /*override*/s:
+	virtual void DrawIntoChunk(cChunkDesc & a_Chunk) /*override*/
 	{
 		for (cPlacedPieces::iterator itr = m_Pieces.begin(), end = m_Pieces.end(); itr != end; ++itr)
 		{
diff --git a/src/Generating/RainbowRoadsGen.h b/src/Generating/RainbowRoadsGen.h
index 5813e1d14..e08e7bf97 100644
--- a/src/Generating/RainbowRoadsGen.h
+++ b/src/Generating/RainbowRoadsGen.h
@@ -38,8 +38,8 @@ protected:
 	int m_MaxSize;
 
 
-	// cGridStructGen overrides:
-	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
+	// cGridStructGen /*override*/s:
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) /*override*/;
 } ;
 
 
diff --git a/src/Generating/Ravines.cpp b/src/Generating/Ravines.cpp
index 70b9d0b62..5402c2ced 100644
--- a/src/Generating/Ravines.cpp
+++ b/src/Generating/Ravines.cpp
@@ -69,8 +69,8 @@ public:
 	#endif  // _DEBUG
 
 protected:
-	// cGridStructGen::cStructure overrides:
-	virtual void DrawIntoChunk(cChunkDesc & a_ChunkDesc) override;
+	// cGridStructGen::cStructure /*override*/s:
+	virtual void DrawIntoChunk(cChunkDesc & a_ChunkDesc) /*override*/;
 } ;
 
 
diff --git a/src/Generating/Ravines.h b/src/Generating/Ravines.h
index 3e41c5ce6..ab94c28a0 100644
--- a/src/Generating/Ravines.h
+++ b/src/Generating/Ravines.h
@@ -31,8 +31,8 @@ protected:
 	int    m_Size;  // Max size, in blocks, of the ravines generated
 	
 
-	// cGridStructGen overrides:
-	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
+	// cGridStructGen /*override*/s:
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) /*override*/;
 } ;
 
 
diff --git a/src/Generating/RoughRavines.cpp b/src/Generating/RoughRavines.cpp
index 2ee3704b3..1953e1a23 100644
--- a/src/Generating/RoughRavines.cpp
+++ b/src/Generating/RoughRavines.cpp
@@ -152,7 +152,7 @@ protected:
 	}
 	
 	
-	virtual void DrawIntoChunk(cChunkDesc & a_ChunkDesc) override
+	virtual void DrawIntoChunk(cChunkDesc & a_ChunkDesc) /*override*/
 	{
 		int BlockStartX = a_ChunkDesc.GetChunkX() * cChunkDef::Width;
 		int BlockStartZ = a_ChunkDesc.GetChunkZ() * cChunkDef::Width;
diff --git a/src/Generating/RoughRavines.h b/src/Generating/RoughRavines.h
index 4c905b641..12c132d86 100644
--- a/src/Generating/RoughRavines.h
+++ b/src/Generating/RoughRavines.h
@@ -77,8 +77,8 @@ protected:
 	/** Minimum ceiling height at the ravine's center */
 	float m_MinCeilingHeightCenter;
 
-	// cGridStructGen overrides:
-	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
+	// cGridStructGen /*override*/s:
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) /*override*/;
 };
 
 
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*/;
 } ;
 
 
diff --git a/src/Generating/TestRailsGen.cpp b/src/Generating/TestRailsGen.cpp
index 66ab8b33f..2d8f7d675 100644
--- a/src/Generating/TestRailsGen.cpp
+++ b/src/Generating/TestRailsGen.cpp
@@ -71,8 +71,8 @@ protected:
 	cPlacedPieces m_Pieces;
 	
 	
-	// cGridStructGen::cStructure overrides:
-	virtual void DrawIntoChunk(cChunkDesc & a_Chunk) override
+	// cGridStructGen::cStructure /*override*/s:
+	virtual void DrawIntoChunk(cChunkDesc & a_Chunk) /*override*/
 	{
 		for (cPlacedPieces::iterator itr = m_Pieces.begin(), end = m_Pieces.end(); itr != end; ++itr)
 		{
diff --git a/src/Generating/TestRailsGen.h b/src/Generating/TestRailsGen.h
index 5b0ce95f4..c7f4316ac 100644
--- a/src/Generating/TestRailsGen.h
+++ b/src/Generating/TestRailsGen.h
@@ -38,8 +38,8 @@ protected:
 	int m_MaxSize;
 
 
-	// cGridStructGen overrides:
-	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
+	// cGridStructGen /*override*/s:
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) /*override*/;
 } ;
 
 
diff --git a/src/Generating/UnderwaterBaseGen.cpp b/src/Generating/UnderwaterBaseGen.cpp
index 9278ea546..729789b34 100644
--- a/src/Generating/UnderwaterBaseGen.cpp
+++ b/src/Generating/UnderwaterBaseGen.cpp
@@ -71,8 +71,8 @@ protected:
 	cPlacedPieces m_Pieces;
 	
 	
-	// cGridStructGen::cStructure overrides:
-	virtual void DrawIntoChunk(cChunkDesc & a_Chunk) override
+	// cGridStructGen::cStructure /*override*/s:
+	virtual void DrawIntoChunk(cChunkDesc & a_Chunk) /*override*/
 	{
 		for (cPlacedPieces::iterator itr = m_Pieces.begin(), end = m_Pieces.end(); itr != end; ++itr)
 		{
diff --git a/src/Generating/UnderwaterBaseGen.h b/src/Generating/UnderwaterBaseGen.h
index d6267b602..8b0874cd1 100644
--- a/src/Generating/UnderwaterBaseGen.h
+++ b/src/Generating/UnderwaterBaseGen.h
@@ -41,8 +41,8 @@ protected:
 	cBiomeGen & m_BiomeGen;
 
 
-	// cGridStructGen overrides:
-	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
+	// cGridStructGen /*override*/s:
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) /*override*/;
 } ;
 
 
diff --git a/src/Generating/VillageGen.cpp b/src/Generating/VillageGen.cpp
index a7f66b75e..f74b996a1 100644
--- a/src/Generating/VillageGen.cpp
+++ b/src/Generating/VillageGen.cpp
@@ -84,8 +84,8 @@ public:
 	}
 	
 	
-	// cPrefabPiecePool overrides:
-	virtual int GetPieceWeight(const cPlacedPiece & a_PlacedPiece, const cPiece::cConnector & a_ExistingConnector, const cPiece & a_NewPiece) override
+	// cPrefabPiecePool /*override*/s:
+	virtual int GetPieceWeight(const cPlacedPiece & a_PlacedPiece, const cPiece::cConnector & a_ExistingConnector, const cPiece & a_NewPiece) /*override*/
 	{
 		// Roads cannot branch T-wise (appending -2 connector to a +2 connector on a 1-high piece):
 		if ((a_ExistingConnector.m_Type == 2) && (a_PlacedPiece.GetDepth() > 0) && (a_PlacedPiece.GetPiece().GetSize().y == 1))
@@ -187,8 +187,8 @@ protected:
 	BLOCKTYPE m_WaterRoadBlock;
 	
 	
-	// cGridStructGen::cStructure overrides:
-	virtual void DrawIntoChunk(cChunkDesc & a_Chunk) override
+	// cGridStructGen::cStructure /*override*/s:
+	virtual void DrawIntoChunk(cChunkDesc & a_Chunk) /*override*/
 	{
 		// Iterate over all items
 		// Each intersecting prefab is placed on ground, then drawn
@@ -258,7 +258,7 @@ protected:
 	}
 	
 	
-	// cPiecePool overrides:
+	// cPiecePool /*override*/s:
 	virtual cPieces GetPiecesWithConnector(int a_ConnectorType)
 	{
 		return m_Prefabs.GetPiecesWithConnector(a_ConnectorType);
@@ -275,7 +275,7 @@ protected:
 		const cPlacedPiece & a_PlacedPiece,
 		const cPiece::cConnector & a_ExistingConnector,
 		const cPiece & a_NewPiece
-	) override
+	) /*override*/
 	{
 		// Check against the density:
 		if (a_ExistingConnector.m_Type == 1)
@@ -293,19 +293,19 @@ protected:
 	}
 	
 	
-	virtual int GetStartingPieceWeight(const cPiece & a_NewPiece) override
+	virtual int GetStartingPieceWeight(const cPiece & a_NewPiece) /*override*/
 	{
 		return m_Prefabs.GetStartingPieceWeight(a_NewPiece);
 	}
 	
 	
-	virtual void PiecePlaced(const cPiece & a_Piece) override
+	virtual void PiecePlaced(const cPiece & a_Piece) /*override*/
 	{
 		m_Prefabs.PiecePlaced(a_Piece);
 	}
 	
 	
-	virtual void Reset(void) override
+	virtual void Reset(void) /*override*/
 	{
 		m_Prefabs.Reset();
 	}
diff --git a/src/Generating/VillageGen.h b/src/Generating/VillageGen.h
index 694ea2358..ad316b66f 100644
--- a/src/Generating/VillageGen.h
+++ b/src/Generating/VillageGen.h
@@ -48,8 +48,8 @@ protected:
 	cTerrainHeightGen & m_HeightGen;
 
 
-	// cGridStructGen overrides:
-	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
+	// cGridStructGen /*override*/s:
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) /*override*/;
 } ;