diff options
| author | Matti Hänninen <matti@mjhanninen.com> | 2015-08-05 00:24:59 +0200 |
|---|---|---|
| committer | Matti Hänninen <matti@mjhanninen.com> | 2015-08-12 15:51:38 +0200 |
| commit | b20294604c5a64a39b3c5f4491b653e4cf2a3c20 (patch) | |
| tree | ab1b84a09987f8ebe9d1e8450f36375c0f9bc5db /src/Generating/ComposableGenerator.cpp | |
| parent | Merge pull request #2425 from cuberite/APIDumpNameChange (diff) | |
| download | cuberite-b20294604c5a64a39b3c5f4491b653e4cf2a3c20.tar cuberite-b20294604c5a64a39b3c5f4491b653e4cf2a3c20.tar.gz cuberite-b20294604c5a64a39b3c5f4491b653e4cf2a3c20.tar.bz2 cuberite-b20294604c5a64a39b3c5f4491b653e4cf2a3c20.tar.lz cuberite-b20294604c5a64a39b3c5f4491b653e4cf2a3c20.tar.xz cuberite-b20294604c5a64a39b3c5f4491b653e4cf2a3c20.tar.zst cuberite-b20294604c5a64a39b3c5f4491b653e4cf2a3c20.zip | |
Diffstat (limited to 'src/Generating/ComposableGenerator.cpp')
| -rw-r--r-- | src/Generating/ComposableGenerator.cpp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/Generating/ComposableGenerator.cpp b/src/Generating/ComposableGenerator.cpp index 4eee8b707..eb1d0e1ee 100644 --- a/src/Generating/ComposableGenerator.cpp +++ b/src/Generating/ComposableGenerator.cpp @@ -336,7 +336,7 @@ void cComposableGenerator::InitFinishGens(cIniFile & a_IniFile) } else if (NoCaseCompare(*itr, "DualRidgeCaves") == 0) { - float Threshold = (float)a_IniFile.GetValueSetF("Generator", "DualRidgeCavesThreshold", 0.3); + float Threshold = static_cast<float>(a_IniFile.GetValueSetF("Generator", "DualRidgeCavesThreshold", 0.3)); m_FinishGens.push_back(cFinishGenPtr(new cStructGenDualRidgeCaves(Seed, Threshold))); } else if (NoCaseCompare(*itr, "DungeonRooms") == 0) @@ -569,12 +569,18 @@ void cComposableGenerator::InitFinishGens(cIniFile & a_IniFile) double MinCeilingHeightCenter = a_IniFile.GetValueSetF("Generator", "RoughRavinesMinCeilingHeightCenter", 36); m_FinishGens.push_back(cFinishGenPtr(new cRoughRavines( Seed, MaxSize, MinSize, - (float)MaxCenterWidth, (float)MinCenterWidth, - (float)MaxRoughness, (float)MinRoughness, - (float)MaxFloorHeightEdge, (float)MinFloorHeightEdge, - (float)MaxFloorHeightCenter, (float)MinFloorHeightCenter, - (float)MaxCeilingHeightEdge, (float)MinCeilingHeightEdge, - (float)MaxCeilingHeightCenter, (float)MinCeilingHeightCenter, + static_cast<float>(MaxCenterWidth), + static_cast<float>(MinCenterWidth), + static_cast<float>(MaxRoughness), + static_cast<float>(MinRoughness), + static_cast<float>(MaxFloorHeightEdge), + static_cast<float>(MinFloorHeightEdge), + static_cast<float>(MaxFloorHeightCenter), + static_cast<float>(MinFloorHeightCenter), + static_cast<float>(MaxCeilingHeightEdge), + static_cast<float>(MinCeilingHeightEdge), + static_cast<float>(MaxCeilingHeightCenter), + static_cast<float>(MinCeilingHeightCenter), GridSize, MaxOffset ))); } |