Exclude vertical mapblock borders when setting light

[minetest.git] / src / mapgen_v7.h

diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index 1af88ddf5b0a67b2996dd4d43f3fe214d5560327..b297770d5a375cef9dbea5a2fd56a94fa17f1a5f 100644 (file)
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -52,14 +52,13 @@ struct MapgenV7Params : public MapgenSpecificParams {
 
 class MapgenV7 : public Mapgen {
 public:
-       EmergeManager *emerge;
+       EmergeManager *m_emerge;
        BiomeManager *bmgr;
 
        int ystride;
        int zstride;
        u32 spflags;
 
-       u32 blockseed;
        v3s16 node_min;
        v3s16 node_max;
        v3s16 full_node_min;
@@ -108,7 +107,7 @@ class MapgenV7 : public Mapgen {
 
        virtual int generateTerrain();
        int generateBaseTerrain();
-       void generateMountainTerrain();
+       int generateMountainTerrain(int ymax);
        void generateRidgeTerrain();
 
        void generateBiomes();
@@ -120,11 +119,13 @@ class MapgenV7 : public Mapgen {
 };
 
 struct MapgenFactoryV7 : public MapgenFactory {
-       Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge) {
+       Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
+       {
                return new MapgenV7(mgid, params, emerge);
        };
 
-       MapgenSpecificParams *createMapgenParams() {
+       MapgenSpecificParams *createMapgenParams()
+       {
                return new MapgenV7Params();
        };
 };