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/map_settings_manager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/map_settings_manager.cpp') diff --git a/src/map_settings_manager.cpp b/src/map_settings_manager.cpp index 16e7d8230..a0ff1c754 100644 --- a/src/map_settings_manager.cpp +++ b/src/map_settings_manager.cpp @@ -174,8 +174,8 @@ MapgenParams *MapSettingsManager::makeMapgenParams() // Create our MapgenParams MapgenParams *params = Mapgen::createMapgenParams(mgtype); - if (params == NULL) - return NULL; + if (!params) + return nullptr; params->mgtype = mgtype; -- cgit v1.2.3