From 9ee47e59995f858ec531b3ee467f131594e4ba1f Mon Sep 17 00:00:00 2001 From: Mattes D Date: Mon, 13 Apr 2020 18:38:06 +0200 Subject: Using Super. --- src/Generating/RoughRavines.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/Generating/RoughRavines.cpp') diff --git a/src/Generating/RoughRavines.cpp b/src/Generating/RoughRavines.cpp index a65f57268..fe425757f 100644 --- a/src/Generating/RoughRavines.cpp +++ b/src/Generating/RoughRavines.cpp @@ -15,20 +15,21 @@ //////////////////////////////////////////////////////////////////////////////// // cRoughRavine: -class cRoughRavine : +class cRoughRavine: public cGridStructGen::cStructure { - typedef cGridStructGen::cStructure super; + using Super = cGridStructGen::cStructure; public: + cRoughRavine( int a_Seed, size_t a_Size, float a_CenterWidth, float a_Roughness, float a_FloorHeightEdge1, float a_FloorHeightEdge2, float a_FloorHeightCenter, float a_CeilingHeightEdge1, float a_CeilingHeightEdge2, float a_CeilingHeightCenter, int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ - ) : - super(a_GridX, a_GridZ, a_OriginX, a_OriginZ), + ): + Super(a_GridX, a_GridZ, a_OriginX, a_OriginZ), m_Seed(a_Seed + 100), m_Noise(a_Seed + 100), m_Roughness(a_Roughness) @@ -72,7 +73,7 @@ protected: m_Bottom = a_Bottom; } }; - typedef std::vector sRavineDefPoints; + using sRavineDefPoints = std::vector; int m_Seed; @@ -231,7 +232,7 @@ cRoughRavines::cRoughRavines( float a_MaxCeilingHeightCenter, float a_MinCeilingHeightCenter, int a_GridSize, int a_MaxOffset ) : - super(a_Seed, a_GridSize, a_GridSize, a_MaxOffset, a_MaxOffset, a_MaxSize, a_MaxSize, 64), + Super(a_Seed, a_GridSize, a_GridSize, a_MaxOffset, a_MaxOffset, a_MaxSize, a_MaxSize, 64), m_MaxSize(a_MaxSize), m_MinSize(a_MinSize), m_MaxCenterWidth(a_MaxCenterWidth), -- cgit v1.2.3