summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2014-12-07 01:19:42 -0500
committerkwolekr <kwolekr@minetest.net>2014-12-07 01:19:42 -0500
commit2f134ce24fa3c9e32f0bbe063adc8114d70091de (patch)
treed9c5113233cc536d29267e8ee2dd6bdc545362b8 /src
parent390c0cd69185b3be7f6f49d7f8fe53f901edf5aa (diff)
downloadminetest-2f134ce24fa3c9e32f0bbe063adc8114d70091de.tar.gz
minetest-2f134ce24fa3c9e32f0bbe063adc8114d70091de.tar.bz2
minetest-2f134ce24fa3c9e32f0bbe063adc8114d70091de.zip
Mapgen V5: Fix use of uninitialized value in ctor
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);