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_v7.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mapgen_v7.h')

diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index 1af88ddf5..5c037cf44 100644
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -52,7 +52,7 @@ struct MapgenV7Params : public MapgenSpecificParams {
 
 class MapgenV7 : public Mapgen {
 public:
-	EmergeManager *emerge;
+	EmergeManager *m_emerge;
 	BiomeManager *bmgr;
 
 	int ystride;
-- 
cgit v1.2.3