Mapgen V5: Fix use of uninitialized value in ctor

diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp
index 95cfeeef5afce01b2ba1da1693b1501d9dac5e28..33186678b1bb0c9a0816583fb0fb63136cb2bb2e 100644 (file)
--- 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 22a836d64afe6deef5af297e4e331783699c5346..9f25a940adc543ab6f6face13d7174a1401ceb1a 100644 (file)
--- 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);