summaryrefslogtreecommitdiffstats
path: root/src/Generating
diff options
context:
space:
mode:
authorworktycho <work.tycho@gmail.com>2015-05-23 16:31:49 +0200
committerworktycho <work.tycho@gmail.com>2015-05-23 16:31:49 +0200
commit7e0dc0f9bc4c555c67a3dfe48669916259c16b5a (patch)
treeaaa204d290f99d1b6f251055f046e8e86c795bfd /src/Generating
parentMerge pull request #2116 from mc-server/CMakeCacheOptions (diff)
parentFixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher. (diff)
downloadcuberite-7e0dc0f9bc4c555c67a3dfe48669916259c16b5a.tar
cuberite-7e0dc0f9bc4c555c67a3dfe48669916259c16b5a.tar.gz
cuberite-7e0dc0f9bc4c555c67a3dfe48669916259c16b5a.tar.bz2
cuberite-7e0dc0f9bc4c555c67a3dfe48669916259c16b5a.tar.lz
cuberite-7e0dc0f9bc4c555c67a3dfe48669916259c16b5a.tar.xz
cuberite-7e0dc0f9bc4c555c67a3dfe48669916259c16b5a.tar.zst
cuberite-7e0dc0f9bc4c555c67a3dfe48669916259c16b5a.zip
Diffstat (limited to '')
-rw-r--r--src/Generating/TwoHeights.cpp2
-rw-r--r--src/Generating/VillageGen.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Generating/TwoHeights.cpp b/src/Generating/TwoHeights.cpp
index e75c301de..06c474458 100644
--- a/src/Generating/TwoHeights.cpp
+++ b/src/Generating/TwoHeights.cpp
@@ -69,7 +69,7 @@ public:
}
- virtual void InitializeShapeGen(cIniFile & a_IniFile)
+ virtual void InitializeShapeGen(cIniFile & a_IniFile) override
{
m_FrequencyX = static_cast<NOISE_DATATYPE>(a_IniFile.GetValueSetF("Generator", "TwoHeightsFrequencyX", 40));
m_FrequencyY = static_cast<NOISE_DATATYPE>(a_IniFile.GetValueSetF("Generator", "TwoHeightsFrequencyY", 40));
diff --git a/src/Generating/VillageGen.cpp b/src/Generating/VillageGen.cpp
index a3f8caa46..27146e757 100644
--- a/src/Generating/VillageGen.cpp
+++ b/src/Generating/VillageGen.cpp
@@ -259,13 +259,13 @@ protected:
// cPiecePool overrides:
- virtual cPieces GetPiecesWithConnector(int a_ConnectorType)
+ virtual cPieces GetPiecesWithConnector(int a_ConnectorType) override
{
return m_Prefabs.GetPiecesWithConnector(a_ConnectorType);
}
- virtual cPieces GetStartingPieces(void)
+ virtual cPieces GetStartingPieces(void) override
{
return m_Prefabs.GetStartingPieces();
}