From cb7da901383e2da6397444cb0acc93235b132d2b Mon Sep 17 00:00:00 2001 From: paramat Date: Sat, 14 Nov 2015 09:18:01 +0000 Subject: Mgfractal: Revert unnecessary duplication of parameters --- src/mapgen_fractal.h | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) (limited to 'src/mapgen_fractal.h') diff --git a/src/mapgen_fractal.h b/src/mapgen_fractal.h index 1b6683f1f..5800ae20d 100644 --- a/src/mapgen_fractal.h +++ b/src/mapgen_fractal.h @@ -37,16 +37,11 @@ struct MapgenFractalParams : public MapgenSpecificParams { u32 spflags; u16 formula; + u16 iterations; + v3f scale; + v3f offset; + float slice_w; - u16 m_iterations; - v3f m_scale; - v3f m_offset; - float m_slice_w; - - u16 j_iterations; - v3f j_scale; - v3f j_offset; - float j_slice_w; float julia_x; float julia_y; float julia_z; @@ -79,16 +74,11 @@ public: v3s16 full_node_max; u16 formula; + u16 iterations; + v3f scale; + v3f offset; + float slice_w; - u16 m_iterations; - v3f m_scale; - v3f m_offset; - float m_slice_w; - - u16 j_iterations; - v3f j_scale; - v3f j_offset; - float j_slice_w; float julia_x; float julia_y; float julia_z; -- cgit v1.2.3