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_carpathian.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/mapgen/mapgen_carpathian.cpp') diff --git a/src/mapgen/mapgen_carpathian.cpp b/src/mapgen/mapgen_carpathian.cpp index f7daef708..3a69fb5b8 100644 --- a/src/mapgen/mapgen_carpathian.cpp +++ b/src/mapgen/mapgen_carpathian.cpp @@ -50,9 +50,8 @@ FlagDesc flagdesc_mapgen_carpathian[] = { /////////////////////////////////////////////////////////////////////////////// -MapgenCarpathian::MapgenCarpathian( - int mapgenid, MapgenCarpathianParams *params, EmergeManager *emerge) - : MapgenBasic(mapgenid, params, emerge) +MapgenCarpathian::MapgenCarpathian(MapgenCarpathianParams *params, EmergeManager *emerge) + : MapgenBasic(MAPGEN_CARPATHIAN, params, emerge) { base_level = params->base_level; -- cgit v1.2.3