diff options
author | kwolekr <kwolekr@minetest.net> | 2014-12-12 02:38:39 -0500 |
---|---|---|
committer | kwolekr <kwolekr@minetest.net> | 2014-12-12 02:38:39 -0500 |
commit | 00fc0babe0c6c5464fa9ffbc5a257b1e2aa93111 (patch) | |
tree | 59c9d80b4fc2262b051bb3b73b10006dcdac61dc /src/mapgen_v7.h | |
parent | 2b8180a417465845759096670f498bf71cd39403 (diff) | |
download | minetest-00fc0babe0c6c5464fa9ffbc5a257b1e2aa93111.tar.gz minetest-00fc0babe0c6c5464fa9ffbc5a257b1e2aa93111.tar.bz2 minetest-00fc0babe0c6c5464fa9ffbc5a257b1e2aa93111.zip |
Mapgens: Rename m_emerge to prevent name collisions
Diffstat (limited to 'src/mapgen_v7.h')
-rw-r--r-- | src/mapgen_v7.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; |