From b55fc3d773e2049d99a01ea2aa4e37774e81410b Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Mon, 25 Mar 2019 16:42:53 +0100 Subject: mapgen: drop mapgen id from child mapgens. This id must be owned by the child mapgen and never be set to a misc value by a developer Also use nullptr in some places --- src/mapgen/mapgen_v6.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mapgen/mapgen_v6.cpp') diff --git a/src/mapgen/mapgen_v6.cpp b/src/mapgen/mapgen_v6.cpp index fdfebe575..2b73c2975 100644 --- a/src/mapgen/mapgen_v6.cpp +++ b/src/mapgen/mapgen_v6.cpp @@ -55,8 +55,8 @@ FlagDesc flagdesc_mapgen_v6[] = { ///////////////////////////////////////////////////////////////////////////// -MapgenV6::MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge) - : Mapgen(mapgenid, params, emerge) +MapgenV6::MapgenV6(MapgenV6Params *params, EmergeManager *emerge) + : Mapgen(MAPGEN_V6, params, emerge) { m_emerge = emerge; ystride = csize.X; //////fix this -- cgit v1.2.3