From 4faaadc8d50d6ab7a19d22bd5a760c4b8321a51f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Blot?= Date: Sun, 18 Jun 2017 19:55:15 +0200 Subject: Cpp11 patchset 11: continue working on constructor style migration (#6004) --- src/mg_ore.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/mg_ore.h') diff --git a/src/mg_ore.h b/src/mg_ore.h index 77025e1bb..4b052e07a 100644 --- a/src/mg_ore.h +++ b/src/mg_ore.h @@ -62,13 +62,13 @@ public: s16 y_min; s16 y_max; u8 ore_param2; // to set node-specific attributes - u32 flags; // attributes for this ore + u32 flags = 0; // attributes for this ore float nthresh; // threshold for noise at which an ore is placed NoiseParams np; // noise for distribution of clusters (NULL for uniform scattering) - Noise *noise; + Noise *noise = nullptr; std::unordered_set biomes; - Ore(); + Ore() {}; virtual ~Ore(); virtual void resolveNodeNames(); @@ -104,8 +104,8 @@ public: NoiseParams np_puff_top; NoiseParams np_puff_bottom; - Noise *noise_puff_top; - Noise *noise_puff_bottom; + Noise *noise_puff_top = nullptr; + Noise *noise_puff_bottom = nullptr; OrePuff(); virtual ~OrePuff(); @@ -127,7 +127,7 @@ public: static const bool NEEDS_NOISE = true; float random_factor; - Noise *noise2; + Noise *noise2 = nullptr; OreVein(); virtual ~OreVein(); @@ -160,7 +160,7 @@ public: case ORE_VEIN: return new OreVein; default: - return NULL; + return nullptr; } } -- cgit v1.2.3