Fix crash on attaching player to entity

[minetest.git] / src / mapgen_v7.h

diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index 1af88ddf5b0a67b2996dd4d43f3fe214d5560327..3a6bc0801c86238a9bb7cab7d4ff08bcafb6b350 100644 (file)
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -1,6 +1,7 @@
 /*
 Minetest
-Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2010-2015 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2010-2015 paramat, Matt Gregory
 
 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
@@ -31,8 +32,9 @@ class BiomeManager;
 extern FlagDesc flagdesc_mapgen_v7[];
 
 
-struct MapgenV7Params : public MapgenSpecificParams {
+struct MapgenV7Params : public MapgenParams {
        u32 spflags;
+       float cave_width;
        NoiseParams np_terrain_base;
        NoiseParams np_terrain_alt;
        NoiseParams np_terrain_persist;
@@ -42,91 +44,42 @@ struct MapgenV7Params : public MapgenSpecificParams {
        NoiseParams np_ridge_uwater;
        NoiseParams np_mountain;
        NoiseParams np_ridge;
+       NoiseParams np_cave1;
+       NoiseParams np_cave2;
 
        MapgenV7Params();
        ~MapgenV7Params() {}
 
-       void readParams(Settings *settings);
-       void writeParams(Settings *settings);
+       void readParams(const Settings *settings);
+       void writeParams(Settings *settings) const;
 };
 
-class MapgenV7 : public Mapgen {
+class MapgenV7 : public MapgenBasic {
 public:
-       EmergeManager *emerge;
-       BiomeManager *bmgr;
+       MapgenV7(int mapgenid, MapgenV7Params *params, EmergeManager *emerge);
+       ~MapgenV7();
 
-       int ystride;
-       int zstride;
-       u32 spflags;
+       virtual MapgenType getType() const { return MAPGEN_V7; }
 
-       u32 blockseed;
-       v3s16 node_min;
-       v3s16 node_max;
-       v3s16 full_node_min;
-       v3s16 full_node_max;
+       virtual void makeChunk(BlockMakeData *data);
+       int getSpawnLevelAtPoint(v2s16 p);
 
-       s16 *ridge_heightmap;
+       float baseTerrainLevelAtPoint(s16 x, s16 z);
+       float baseTerrainLevelFromMap(int index);
+       bool getMountainTerrainAtPoint(s16 x, s16 y, s16 z);
+       bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, s16 y);
+       int generateTerrain();
+       void generateRidgeTerrain();
 
+private:
        Noise *noise_terrain_base;
        Noise *noise_terrain_alt;
        Noise *noise_terrain_persist;
        Noise *noise_height_select;
-       Noise *noise_filler_depth;
        Noise *noise_mount_height;
        Noise *noise_ridge_uwater;
        Noise *noise_mountain;
        Noise *noise_ridge;
-
-       Noise *noise_heat;
-       Noise *noise_humidity;
-
-       content_t c_stone;
-       content_t c_dirt;
-       content_t c_dirt_with_grass;
-       content_t c_sand;
-       content_t c_water_source;
-       content_t c_lava_source;
-       content_t c_ice;
-       content_t c_gravel;
-       content_t c_cobble;
-       content_t c_desert_sand;
-       content_t c_desert_stone;
-
-       MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge);
-       ~MapgenV7();
-
-       virtual void makeChunk(BlockMakeData *data);
-       int getGroundLevelAtPoint(v2s16 p);
-       Biome *getBiomeAtPoint(v3s16 p);
-
-       float baseTerrainLevelAtPoint(int x, int z);
-       float baseTerrainLevelFromMap(int index);
-       bool getMountainTerrainAtPoint(int x, int y, int z);
-       bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, int y);
-
-       void calculateNoise();
-
-       virtual int generateTerrain();
-       int generateBaseTerrain();
-       void generateMountainTerrain();
-       void generateRidgeTerrain();
-
-       void generateBiomes();
-       void dustTopNodes();
-
-       //void addTopNodes();
-
-       void generateCaves(int max_stone_y);
-};
-
-struct MapgenFactoryV7 : public MapgenFactory {
-       Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge) {
-               return new MapgenV7(mgid, params, emerge);
-       };
-
-       MapgenSpecificParams *createMapgenParams() {
-               return new MapgenV7Params();
-       };
 };
 
 #endif