diff options
| author | Lukas Pioch <lukas@zgow.de> | 2015-05-23 13:56:08 +0200 |
|---|---|---|
| committer | Lukas Pioch <lukas@zgow.de> | 2015-05-23 16:28:37 +0200 |
| commit | e30b2ed487b4a676eff98fcd6118e0837de204e3 (patch) | |
| tree | f258bae1dce1ca418a14ae0d30f1bbd6740f0437 /src/Generating | |
| parent | Merge pull request #2108 from mc-server/tgh-boolean (diff) | |
| download | cuberite-e30b2ed487b4a676eff98fcd6118e0837de204e3.tar cuberite-e30b2ed487b4a676eff98fcd6118e0837de204e3.tar.gz cuberite-e30b2ed487b4a676eff98fcd6118e0837de204e3.tar.bz2 cuberite-e30b2ed487b4a676eff98fcd6118e0837de204e3.tar.lz cuberite-e30b2ed487b4a676eff98fcd6118e0837de204e3.tar.xz cuberite-e30b2ed487b4a676eff98fcd6118e0837de204e3.tar.zst cuberite-e30b2ed487b4a676eff98fcd6118e0837de204e3.zip | |
Diffstat (limited to '')
| -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 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(); } |