Replace std::list by std::vector into ServerMap::listAllLoadableBlocks ServerMap...

[minetest.git] / src / mg_biome.h

diff --git a/src/mg_biome.h b/src/mg_biome.h
index 04567267f81e3a97aa924d7cf47ab8279b6f4f3e..3577960a9890494b2aebb164f0094ee076f18b6c 100644 (file)
--- a/src/mg_biome.h
+++ b/src/mg_biome.h
@@ -33,24 +33,31 @@ enum BiomeType
        BIOME_TYPE_FLAT
 };
 
-class Biome : public GenElement {
+class Biome : public GenElement, public NodeResolver {
 public:
        u32 flags;
 
        content_t c_top;
        content_t c_filler;
+       content_t c_shore_top;
+       content_t c_shore_filler;
+       content_t c_underwater;
        content_t c_stone;
+       content_t c_water_top;
        content_t c_water;
        content_t c_dust;
-       content_t c_dust_water;
 
        s16 depth_top;
        s16 depth_filler;
+       s16 height_shore;
+       s16 depth_water_top;
 
-       s16 height_min;
-       s16 height_max;
+       s16 y_min;
+       s16 y_max;
        float heat_point;
        float humidity_point;
+
+       virtual void resolveNodeNames(NodeResolveInfo *nri);
 };
 
 class BiomeManager : public GenElementManager {
@@ -71,9 +78,6 @@ class BiomeManager : public GenElementManager {
        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