GenericCAO: Fix light position for non-players, remove deprecated initialisation...

[dragonfireclient.git] / src / mg_ore.h

diff --git a/src/mg_ore.h b/src/mg_ore.h
index e95fdd330dedeaaf0ee006f1cdea8dfba407197b..253b115a217b216229745c432e63918f08e79676 100644 (file)
--- a/src/mg_ore.h
+++ b/src/mg_ore.h
@@ -1,6 +1,7 @@
 /*
 Minetest
-Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2014-2016 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2015-2017 paramat
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -17,10 +18,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MG_ORE_HEADER
-#define MG_ORE_HEADER
+#pragma once
 
-#include "util/cpp11_container.h"
+#include <unordered_set>
 #include "objdef.h"
 #include "noise.h"
 #include "nodedef.h"
@@ -31,14 +31,11 @@ class MMVManip;
 
 /////////////////// Ore generation flags
 
-#define OREFLAG_ABSHEIGHT     0x01
+#define OREFLAG_ABSHEIGHT     0x01 // Non-functional but kept to not break flags
 #define OREFLAG_PUFF_CLIFFS   0x02
 #define OREFLAG_PUFF_ADDITIVE 0x04
 #define OREFLAG_USE_NOISE     0x08
 
-#define ORE_RANGE_ACTUAL 1
-#define ORE_RANGE_MIRROR 2
-
 enum OreType {
        ORE_SCATTER,
        ORE_SHEET,
@@ -61,18 +58,19 @@ class Ore : public ObjDef, public NodeResolver {
        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;
-       UNORDERED_SET<u8> biomes;
+       Noise *noise = nullptr;
+       std::unordered_set<u8> biomes;
 
-       Ore();
+       Ore() = default;;
        virtual ~Ore();
 
        virtual void resolveNodeNames();
 
-       size_t placeOre(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
+       size_t placeOre(Mapgen *mg, u32 blockseed,
+               v3s16 nmin, v3s16 nmax, s16 ore_zero_level);
        virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
                v3s16 nmin, v3s16 nmax, u8 *biomemap) = 0;
 };
@@ -103,10 +101,10 @@ class OrePuff : public Ore {
 
        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();
+       OrePuff() = default;
        virtual ~OrePuff();
 
        virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
@@ -126,9 +124,9 @@ class OreVein : public Ore {
        static const bool NEEDS_NOISE = true;
 
        float random_factor;
-       Noise *noise2;
+       Noise *noise2 = nullptr;
 
-       OreVein();
+       OreVein() = default;
        virtual ~OreVein();
 
        virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
@@ -138,7 +136,7 @@ class OreVein : public Ore {
 class OreManager : public ObjDefManager {
 public:
        OreManager(IGameDef *gamedef);
-       virtual ~OreManager() {}
+       virtual ~OreManager() = default;
 
        const char *getObjectTitle() const
        {
@@ -159,13 +157,12 @@ class OreManager : public ObjDefManager {
                case ORE_VEIN:
                        return new OreVein;
                default:
-                       return NULL;
+                       return nullptr;
                }
        }
 
        void clear();
 
-       size_t placeAllOres(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
+       size_t placeAllOres(Mapgen *mg, u32 blockseed,
+               v3s16 nmin, v3s16 nmax, s16 ore_zero_level = 0);
 };
-
-#endif