From 8d3a68f343777c438b9caf9f646e913d4b66e046 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Fri, 14 Nov 2014 02:58:56 -0500
Subject: Fix warnings and other misc. minor changes

---
 src/mapgen_v6.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mapgen_v6.h')

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 @@ public:
 	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);
 	
-- 
cgit v1.2.3