diff options
| author | tycho <work.tycho@gmail.com> | 2015-05-23 16:33:52 +0200 |
|---|---|---|
| committer | tycho <work.tycho@gmail.com> | 2015-05-23 16:33:52 +0200 |
| commit | 81c0116cf1c0b06e24f9f69e219c3f1e302d81e2 (patch) | |
| tree | 8df120fde19c9c27f5a8681a7952aa9e802bc800 /src/Generating | |
| parent | Merge branch 'master' into PreventNewWarnings (diff) | |
| parent | Merge pull request #2117 from Seadragon91/clang_errors (diff) | |
| download | cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar.gz cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar.bz2 cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar.lz cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar.xz cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar.zst cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.zip | |
Diffstat (limited to 'src/Generating')
| -rw-r--r-- | src/Generating/TwoHeights.cpp | 2 | ||||
| -rw-r--r-- | src/Generating/VillageGen.cpp | 4 |
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 8f0bc13ef..c0f1d4c8f 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(); } |