summaryrefslogtreecommitdiff
path: root/src/mapgen_fractal.h
diff options
context:
space:
mode:
authorparamat <mat.gregory@virginmedia.com>2015-11-14 09:18:01 +0000
committerparamat <mat.gregory@virginmedia.com>2015-11-15 08:13:36 +0000
commitcb7da901383e2da6397444cb0acc93235b132d2b (patch)
tree837a4ab1f963f69fc88726897bf823e56223556a /src/mapgen_fractal.h
parentbdfb761dd06261e71f96b731ad423338a9c01008 (diff)
downloadminetest-cb7da901383e2da6397444cb0acc93235b132d2b.tar.gz
minetest-cb7da901383e2da6397444cb0acc93235b132d2b.tar.bz2
minetest-cb7da901383e2da6397444cb0acc93235b132d2b.zip
Mgfractal: Revert unnecessary duplication of parameters
Diffstat (limited to 'src/mapgen_fractal.h')
-rw-r--r--src/mapgen_fractal.h26
1 files changed, 8 insertions, 18 deletions
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;