summaryrefslogtreecommitdiff
path: root/src/map_settings_manager.cpp
diff options
context:
space:
mode:
authorLoïc Blot <loic.blot@unix-experience.fr>2019-03-25 16:42:53 +0100
committerLoïc Blot <nerzhul@users.noreply.github.com>2019-03-31 20:49:39 +0200
commitb55fc3d773e2049d99a01ea2aa4e37774e81410b (patch)
tree13215d9ff90bca74542984e7f7726b70bca69829 /src/map_settings_manager.cpp
parentb3716a03a6d47058b50acfc71c861ecfea5f80ad (diff)
downloadminetest-b55fc3d773e2049d99a01ea2aa4e37774e81410b.tar.gz
minetest-b55fc3d773e2049d99a01ea2aa4e37774e81410b.tar.bz2
minetest-b55fc3d773e2049d99a01ea2aa4e37774e81410b.zip
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
Diffstat (limited to 'src/map_settings_manager.cpp')
-rw-r--r--src/map_settings_manager.cpp4
1 files changed, 2 insertions, 2 deletions
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;