client.cpp: modernize code

[minetest.git] / src / mg_ore.cpp

diff --git a/src/mg_ore.cpp b/src/mg_ore.cpp
index 6275de313490a774ae5fa01bb49cc01d1efd2a31..36100f762ac80183542bb0544d28205398566139 100644 (file)
--- a/src/mg_ore.cpp
+++ b/src/mg_ore.cpp
@@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 
 FlagDesc flagdesc_ore[] = {
-       {"absheight",                 OREFLAG_ABSHEIGHT},
+       {"absheight",                 OREFLAG_ABSHEIGHT}, // Non-functional
        {"puff_cliffs",               OREFLAG_PUFF_CLIFFS},
        {"puff_additive_composition", OREFLAG_PUFF_ADDITIVE},
        {NULL,                        0}
@@ -43,7 +43,8 @@ OreManager::OreManager(IGameDef *gamedef) :
 }
 
 
-size_t OreManager::placeAllOres(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
+size_t OreManager::placeAllOres(Mapgen *mg, u32 blockseed,
+       v3s16 nmin, v3s16 nmax, s16 ore_zero_level)
 {
        size_t nplaced = 0;
 
@@ -52,7 +53,7 @@ size_t OreManager::placeAllOres(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nma
                if (!ore)
                        continue;
 
-               nplaced += ore->placeOre(mg, blockseed, nmin, nmax);
+               nplaced += ore->placeOre(mg, blockseed, nmin, nmax, ore_zero_level);
                blockseed++;
        }
 
@@ -72,14 +73,6 @@ void OreManager::clear()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-
-Ore::Ore()
-{
-       flags = 0;
-       noise = NULL;
-}
-
-
 Ore::~Ore()
 {
        delete noise;
@@ -93,24 +86,23 @@ void Ore::resolveNodeNames()
 }
 
 
-size_t Ore::placeOre(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
+size_t Ore::placeOre(Mapgen *mg, u32 blockseed,
+       v3s16 nmin, v3s16 nmax, s16 ore_zero_level)
 {
-       int in_range = 0;
+       // Ore y_min / y_max is displaced by ore_zero_level or remains unchanged.
+       // Any ore with a limit at +-MAX_MAP_GENERATION_LIMIT is considered to have
+       // that limit at +-infinity, so we do not alter that limit.
+       s32 y_min_disp = (y_min <= -MAX_MAP_GENERATION_LIMIT) ?
+               -MAX_MAP_GENERATION_LIMIT : y_min + ore_zero_level;
+
+       s32 y_max_disp = (y_max >= MAX_MAP_GENERATION_LIMIT) ?
+               MAX_MAP_GENERATION_LIMIT : y_max + ore_zero_level;
 
-       in_range |= (nmin.Y <= y_max && nmax.Y >= y_min);
-       if (flags & OREFLAG_ABSHEIGHT)
-               in_range |= (nmin.Y >= -y_max && nmax.Y <= -y_min) << 1;
-       if (!in_range)
+       if (nmin.Y > y_max_disp || nmax.Y < y_min_disp)
                return 0;
 
-       int actual_ymin, actual_ymax;
-       if (in_range & ORE_RANGE_MIRROR) {
-               actual_ymin = MYMAX(nmin.Y, -y_max);
-               actual_ymax = MYMIN(nmax.Y, -y_min);
-       } else {
-               actual_ymin = MYMAX(nmin.Y, y_min);
-               actual_ymax = MYMIN(nmax.Y, y_max);
-       }
+       int actual_ymin = MYMAX(nmin.Y, y_min_disp);
+       int actual_ymax = MYMIN(nmax.Y, y_max_disp);
        if (clust_size >= actual_ymax - actual_ymin + 1)
                return 0;
 
@@ -232,8 +224,6 @@ void OreSheet::generate(MMVManip *vm, int mapseed, u32 blockseed,
 OrePuff::OrePuff() :
        Ore()
 {
-       noise_puff_top    = NULL;
-       noise_puff_bottom = NULL;
 }
 
 
@@ -385,7 +375,6 @@ void OreBlob::generate(MMVManip *vm, int mapseed, u32 blockseed,
 OreVein::OreVein() :
        Ore()
 {
-       noise2 = NULL;
 }