LuaVoxelManip: Add option to allocate blank data

[oweals/minetest.git] / src / mg_biome.h

diff --git a/src/mg_biome.h b/src/mg_biome.h
index 9180069df89bd2d67b34e068f8cd33537db0792b..870c1196113acc64eafd8149e338e891d89cadf9 100644 (file)
--- a/src/mg_biome.h
+++ b/src/mg_biome.h
@@ -21,7 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MG_BIOME_HEADER
 
 #include "mapgen.h"
-#include "noise.h"
+
+struct NoiseParams;
 
 enum BiomeType
 {
@@ -32,11 +33,7 @@ enum BiomeType
        BIOME_TYPE_FLAT
 };
 
-extern NoiseParams nparams_biome_def_heat;
-extern NoiseParams nparams_biome_def_humidity;
-
-
-class Biome : public GenElement {
+class Biome : public GenElement, public NodeResolver {
 public:
        u32 flags;
 
@@ -54,6 +51,8 @@ public:
        s16 height_max;
        float heat_point;
        float humidity_point;
+
+       virtual void resolveNodeNames(NodeResolveInfo *nri);
 };
 
 class BiomeManager : public GenElementManager {
@@ -61,9 +60,6 @@ public:
        static const char *ELEMENT_TITLE;
        static const size_t ELEMENT_LIMIT = 0x100;
 
-       NoiseParams *np_heat;
-       NoiseParams *np_humidity;
-
        BiomeManager(IGameDef *gamedef);
        ~BiomeManager();
 
@@ -77,9 +73,6 @@ public:
        void calcBiomes(s16 sx, s16 sy, float *heat_map, float *humidity_map,
                s16 *height_map, u8 *biomeid_map);
        Biome *getBiome(float heat, float humidity, s16 y);
-
-private:
-       NodeResolver *m_resolver;
 };
 
 #endif