Mapgens: Rename m_emerge to prevent name collisions

[minetest.git] / src / mapgen_v6.h

diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h
index e6d2cdc544bfc0ace08dc2ea77f9fadebf9be7bd..445888242b7efccc39efbfa8259171b1396621f5 100644 (file)
--- 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;