summaryrefslogtreecommitdiff
path: root/src/mg_biome.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mg_biome.h')
-rw-r--r--src/mg_biome.h27
1 files changed, 8 insertions, 19 deletions
diff --git a/src/mg_biome.h b/src/mg_biome.h
index 9c653a768..d6130ee3a 100644
--- a/src/mg_biome.h
+++ b/src/mg_biome.h
@@ -23,31 +23,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "mapgen.h"
#include "noise.h"
-//#include <string>
-//#include "nodedef.h"
-//#include "gamedef.h"
-//#include "mapnode.h"
-
-enum BiomeTerrainType
+enum BiomeType
{
- BIOME_TERRAIN_NORMAL,
- BIOME_TERRAIN_LIQUID,
- BIOME_TERRAIN_NETHER,
- BIOME_TERRAIN_AETHER,
- BIOME_TERRAIN_FLAT
+ BIOME_TYPE_NORMAL,
+ BIOME_TYPE_LIQUID,
+ BIOME_TYPE_NETHER,
+ BIOME_TYPE_AETHER,
+ BIOME_TYPE_FLAT
};
extern NoiseParams nparams_biome_def_heat;
extern NoiseParams nparams_biome_def_humidity;
-struct BiomeNoiseInput {
- v2s16 mapsize;
- float *heat_map;
- float *humidity_map;
- s16 *height_map;
-};
-
class Biome : public GenElement {
public:
u32 flags;
@@ -83,7 +71,8 @@ public:
return new Biome;
}
- void calcBiomes(BiomeNoiseInput *input, u8 *biomeid_map);
+ 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);
};