From ba15c98e4d5d7f4bc515e351d6af1a084d46092e Mon Sep 17 00:00:00 2001 From: paramat Date: Sun, 5 Jul 2015 00:56:31 +0100 Subject: Mgv7: Auto-set lowest mountain generation level Lowest level of base terrain determines mountain generation in mapchunk Change some positional function arguments from int to s16 --- src/mapgen_v7.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/mapgen_v7.h') diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h index 6fa1a0f1c..c0cfa8c77 100644 --- a/src/mapgen_v7.h +++ b/src/mapgen_v7.h @@ -22,8 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapgen.h" -#define MOUNTAIN_BASE -112 - /////////////////// Mapgen V7 flags #define MGV7_MOUNTAINS 0x01 #define MGV7_RIDGES 0x02 @@ -107,16 +105,16 @@ public: int getGroundLevelAtPoint(v2s16 p); Biome *getBiomeAtPoint(v3s16 p); - float baseTerrainLevelAtPoint(int x, int z); + float baseTerrainLevelAtPoint(s16 x, s16 z); float baseTerrainLevelFromMap(int index); - bool getMountainTerrainAtPoint(int x, int y, int z); - bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, int y); + bool getMountainTerrainAtPoint(s16 x, s16 y, s16 z); + bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, s16 y); void calculateNoise(); virtual int generateTerrain(); - int generateBaseTerrain(); - int generateMountainTerrain(int ymax); + void generateBaseTerrain(s16 *stone_surface_min_y, s16 *stone_surface_max_y); + int generateMountainTerrain(s16 ymax); void generateRidgeTerrain(); MgStoneType generateBiomes(float *heat_map, float *humidity_map); @@ -124,7 +122,7 @@ public: //void addTopNodes(); - void generateCaves(int max_stone_y); + void generateCaves(s16 max_stone_y); }; struct MapgenFactoryV7 : public MapgenFactory { -- cgit v1.2.3