From 00fc0babe0c6c5464fa9ffbc5a257b1e2aa93111 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Fri, 12 Dec 2014 02:38:39 -0500
Subject: Mapgens: Rename m_emerge to prevent name collisions

---
 src/mapgen_v6.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mapgen_v6.h')

diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h
index e6d2cdc54..445888242 100644
--- a/src/mapgen_v6.h
+++ b/src/mapgen_v6.h
@@ -65,7 +65,7 @@ struct MapgenV6Params : public MapgenSpecificParams {
 
 class MapgenV6 : public Mapgen {
 public:
-	EmergeManager *emerge;
+	EmergeManager *m_emerge;
 
 	int ystride;
 	u32 spflags;
-- 
cgit v1.2.3