diff options
| author | HaoTNN <haotnn@gmail.com> | 2015-05-23 23:06:37 +0200 |
|---|---|---|
| committer | HaoTNN <haotnn@gmail.com> | 2015-05-23 23:06:37 +0200 |
| commit | 2578afb2449ac27defb3ac9dcc3d140e980d0d1a (patch) | |
| tree | 4f8e0f52f39c1eb3189680b0395134d4b72a2228 /src/Generating | |
| parent | Merge remote-tracking branch 'upstream/master' (diff) | |
| parent | Merge pull request #2107 from mc-server/cow-waterspawn (diff) | |
| download | cuberite-2578afb2449ac27defb3ac9dcc3d140e980d0d1a.tar cuberite-2578afb2449ac27defb3ac9dcc3d140e980d0d1a.tar.gz cuberite-2578afb2449ac27defb3ac9dcc3d140e980d0d1a.tar.bz2 cuberite-2578afb2449ac27defb3ac9dcc3d140e980d0d1a.tar.lz cuberite-2578afb2449ac27defb3ac9dcc3d140e980d0d1a.tar.xz cuberite-2578afb2449ac27defb3ac9dcc3d140e980d0d1a.tar.zst cuberite-2578afb2449ac27defb3ac9dcc3d140e980d0d1a.zip | |
Diffstat (limited to 'src/Generating')
| -rw-r--r-- | src/Generating/FinishGen.cpp | 2 | ||||
| -rw-r--r-- | src/Generating/TwoHeights.cpp | 2 | ||||
| -rw-r--r-- | src/Generating/VillageGen.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp index 69ae59c18..e96d959f9 100644 --- a/src/Generating/FinishGen.cpp +++ b/src/Generating/FinishGen.cpp @@ -1259,7 +1259,7 @@ bool cFinishGenPassiveMobs::TrySpawnAnimals(cChunkDesc & a_ChunkDesc, int a_RelX } if ( (BlockUnderFeet != E_BLOCK_GRASS) && - ((AnimalToSpawn == mtSheep) || (AnimalToSpawn == mtChicken) || (AnimalToSpawn == mtPig)) + ((AnimalToSpawn == mtRabbit) || (AnimalToSpawn == mtCow) || (AnimalToSpawn == mtSheep) || (AnimalToSpawn == mtChicken) || (AnimalToSpawn == mtPig)) ) { return false; 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(); } |