X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmapgen_v6.h;h=eecfb1fe6d91bd477f49a59004478ebd29b4abf1;hb=8d3a68f343777c438b9caf9f646e913d4b66e046;hp=1fac37fb677645f89387f19d8bdba73bfb8cc7c4;hpb=5b8855e83c0d1cc7aef21492e7fe862b7d06917e;p=dragonfireclient.git

diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h
index 1fac37fb6..eecfb1fe6 100644
--- a/src/mapgen_v6.h
+++ b/src/mapgen_v6.h
@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 extern FlagDesc flagdesc_mapgen_v6[];
 
 
-enum BiomeType
+enum BiomeV6Type
 {
 	BT_NORMAL,
 	BT_DESERT
@@ -132,8 +132,8 @@ class MapgenV6 : public Mapgen {
 	virtual float getMudAmount(int index);
 	bool getHaveBeach(v2s16 p);
 	bool getHaveBeach(int index);
-	BiomeType getBiome(v2s16 p);
-	BiomeType getBiome(int index, v2s16 p);
+	BiomeV6Type getBiome(v2s16 p);
+	BiomeV6Type getBiome(int index, v2s16 p);
 	
 	u32 get_blockseed(u64 seed, v3s16 p);