aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mapgen_v5.cpp4
-rw-r--r--src/mapgen_v5.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp
index 95cfeeef5..33186678b 100644
--- a/src/mapgen_v5.cpp
+++ b/src/mapgen_v5.cpp
@@ -47,10 +47,10 @@ FlagDesc flagdesc_mapgen_v5[] = {
};
-MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge_)
+MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge)
: Mapgen(mapgenid, params, emerge)
{
- this->emerge = emerge_;
+ this->emerge = emerge;
this->bmgr = emerge->biomemgr;
// amount of elements to skip for the next index
diff --git a/src/mapgen_v5.h b/src/mapgen_v5.h
index 22a836d64..9f25a940a 100644
--- a/src/mapgen_v5.h
+++ b/src/mapgen_v5.h
@@ -89,7 +89,7 @@ public:
content_t c_stair_cobble;
content_t c_stair_sandstone;
- MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge_);
+ MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge);
~MapgenV5();
virtual void makeChunk(BlockMakeData *data);