mirror of
https://github.com/luanti-org/luanti.git
synced 2025-12-18 04:55:20 +01:00
Allow mapgen chunk size to be non-cubic (#16429)
This commit is contained in:
@@ -125,10 +125,20 @@ MapgenParams *MapSettingsManager::makeMapgenParams()
|
||||
if (mapgen_params)
|
||||
return mapgen_params;
|
||||
|
||||
MapgenParams *params = makeMapgenParamsCopy();
|
||||
if (!params)
|
||||
return nullptr;
|
||||
mapgen_params = params;
|
||||
return params;
|
||||
}
|
||||
|
||||
MapgenParams *MapSettingsManager::makeMapgenParamsCopy() const
|
||||
{
|
||||
// Note: can't return mapgen_params here, because we want a copy.
|
||||
|
||||
assert(m_map_settings);
|
||||
assert(m_defaults);
|
||||
|
||||
// Now, get the mapgen type so we can create the appropriate MapgenParams
|
||||
std::string mg_name;
|
||||
MapgenType mgtype = getMapSetting("mg_name", &mg_name) ?
|
||||
Mapgen::getMapgenType(mg_name) : MAPGEN_DEFAULT;
|
||||
@@ -151,8 +161,5 @@ MapgenParams *MapSettingsManager::makeMapgenParams()
|
||||
params->MapgenParams::readParams(m_map_settings.get());
|
||||
params->readParams(m_map_settings.get());
|
||||
|
||||
// Hold onto our params
|
||||
mapgen_params = params;
|
||||
|
||||
return params;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user