From b20294604c5a64a39b3c5f4491b653e4cf2a3c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matti=20H=C3=A4nninen?= <matti@mjhanninen.com>
Date: Wed, 5 Aug 2015 01:24:59 +0300
Subject: Fix old style casts and implicit conversions

---
 src/Generating/ComposableGenerator.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'src/Generating/ComposableGenerator.cpp')

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
 			)));
 		}
-- 
cgit v1.2.3